diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/icmp6.h | 8 | ||||
| -rw-r--r-- | sys/netinet/in_gif.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_encap.c | 3 | ||||
| -rw-r--r-- | sys/netinet/tcp_input.c | 2 | ||||
| -rw-r--r-- | sys/netinet/tcp_reass.c | 2 |
5 files changed, 15 insertions, 6 deletions
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index 7edf8e9..abef35c 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -312,7 +312,7 @@ struct nd_opt_route_info { /* route info */ u_int8_t nd_opt_rti_prefixlen; u_int8_t nd_opt_rti_flags; u_int32_t nd_opt_rti_lifetime; - /* followed by prefix */ + /* prefix follows */ } __attribute__((__packed__)); /* @@ -541,7 +541,11 @@ struct icmp6stat { u_quad_t icp6s_tooshort; /* packet < sizeof(struct icmp6_hdr) */ u_quad_t icp6s_checksum; /* bad checksum */ u_quad_t icp6s_badlen; /* calculated bound mismatch */ - u_quad_t icp6s_reflect; /* number of responses */ + /* + * number of responses: this member is inherited from netinet code, but + * for netinet6 code, it is already available in icp6s_outhist[]. + */ + u_quad_t icp6s_reflect; u_quad_t icp6s_inhist[256]; u_quad_t icp6s_nd_toomanyopt; /* too many ND options */ struct icmp6errstat icp6s_outerrhist; diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 4531a83..b7a1cec 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -111,7 +111,7 @@ in_gif_output(ifp, family, m, rt) tos = ip->ip_tos; break; } -#endif /*INET*/ +#endif /* INET */ #ifdef INET6 case AF_INET6: { @@ -126,7 +126,7 @@ in_gif_output(ifp, family, m, rt) tos = (ntohl(ip6->ip6_flow) >> 20) & 0xff; break; } -#endif /*INET6*/ +#endif /* INET6 */ default: #ifdef DEBUG printf("in_gif_output: warning: unknown family %d passed\n", @@ -189,7 +189,7 @@ in_gif_output(ifp, family, m, rt) /* if it constitutes infinite encapsulation, punt. */ if (sc->gif_ro.ro_rt->rt_ifp == ifp) { m_freem(m); - return ENETUNREACH; /*XXX*/ + return ENETUNREACH; /* XXX */ } #if 0 ifp->if_mtu = sc->gif_ro.ro_rt->rt_ifp->if_mtu diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c index cdeb7ab..e12f50a 100644 --- a/sys/netinet/ip_encap.c +++ b/sys/netinet/ip_encap.c @@ -40,7 +40,8 @@ * RFC2473 IPv6 generic packet tunnelling * RFC2529 6over4 tunnel * mobile-ip6 (uses RFC2473) - * 6to4 tunnel + * RFC3056 6to4 tunnel + * isatap tunnel * Here's a list of protocol that want protocol #4: * RFC1853 IPv4-in-IPv4 tunnelling * RFC2003 IPv4 encapsulation within IPv4 diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 5c60a14..c7533e6 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -497,6 +497,8 @@ tcp_input(m, off0) * Because ip6_savecontrol() is going to parse the mbuf to * search for data to be passed up to user-land, it wants mbuf * parameters to be unchanged. + * XXX: the call of ip6_savecontrol() has been obsoleted based on + * latest version of the advanced API (20020110). */ drop_hdrlen = off0 + off; diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 5c60a14..c7533e6 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -497,6 +497,8 @@ tcp_input(m, off0) * Because ip6_savecontrol() is going to parse the mbuf to * search for data to be passed up to user-land, it wants mbuf * parameters to be unchanged. + * XXX: the call of ip6_savecontrol() has been obsoleted based on + * latest version of the advanced API (20020110). */ drop_hdrlen = off0 + off; |
