Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comment fix, sync with kame.

This commit is contained in:
itojun 2000-03-03 17:42:14 +00:00
parent 8e89a8db7e
commit be78177ba2
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sys/netinet/ip6.h
View File

@ -1,4 +1,5 @@
/* $NetBSD: ip6.h,v 1.5 2000/02/24 09:55:24 itojun Exp $ */ /* $NetBSD: ip6.h,v 1.6 2000/03/03 17:42:14 itojun Exp $ */
/* $KAME: ip6.h,v 1.6 2000/02/26 12:53:07 jinmei Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -80,7 +81,7 @@ struct ip6_hdr {
u_int8_t ip6_un1_nxt; /* next header */ u_int8_t ip6_un1_nxt; /* next header */
u_int8_t ip6_un1_hlim; /* hop limit */ u_int8_t ip6_un1_hlim; /* hop limit */
} ip6_un1; } ip6_un1;
u_int8_t ip6_un2_vfc; /* 4 bits version, 4 bits class */ u_int8_t ip6_un2_vfc; /* 4 bits version, top 4 bits class */
} ip6_ctlun; } ip6_ctlun;
struct in6_addr ip6_src; /* source address */ struct in6_addr ip6_src; /* source address */
struct in6_addr ip6_dst; /* destination address */ struct in6_addr ip6_dst; /* destination address */
@ -261,25 +262,39 @@ do { \
do { \ do { \
struct mbuf *t; \ struct mbuf *t; \
int tmp; \ int tmp; \
t = m_pulldown((m), (off), (len), &tmp); \ ip6stat.ip6s_exthdrget++; \
if (t) { \ if ((m)->m_len >= (off) + (len)) \
if (t->m_len < tmp + (len)) \ (val) = (typ)(mtod((m), caddr_t) + (off)); \
panic("m_pulldown malfunction"); \ else { \
(val) = (typ)(mtod(t, caddr_t) + tmp); \ t = m_pulldown((m), (off), (len), &tmp); \
} else \ if (t) { \
(val) = (typ)NULL; \ if (t->m_len < tmp + (len)) \
panic("m_pulldown malfunction"); \
(val) = (typ)(mtod(t, caddr_t) + tmp); \
} else { \
(val) = (typ)NULL; \
(m) = NULL; \
} \
} \
} while (0) } while (0)
#define IP6_EXTHDR_GET0(val, typ, m, off, len) \ #define IP6_EXTHDR_GET0(val, typ, m, off, len) \
do { \ do { \
struct mbuf *t; \ struct mbuf *t; \
t = m_pulldown((m), (off), (len), NULL); \ ip6stat.ip6s_exthdrget0++; \
if (t) { \ if ((off) == 0) \
if (t->m_len < (len)) \ (val) = (typ)mtod(m, caddr_t); \
panic("m_pulldown malfunction"); \ else { \
(val) = (typ)mtod(t, caddr_t); \ t = m_pulldown((m), (off), (len), NULL); \
} else \ if (t) { \
(val) = (typ)NULL; \ if (t->m_len < (len)) \
panic("m_pulldown malfunction"); \
(val) = (typ)mtod(t, caddr_t); \
} else { \
(val) = (typ)NULL; \
(m) = NULL; \
} \
} \
} while (0) } while (0)
#endif /*_KERNEL*/ #endif /*_KERNEL*/