Date: Sat, 4 Jul 2009 15:36:39 GMT From: Ana Kukec <anchie@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 165595 for review Message-ID: <200907041536.n64Fadel088822@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=165595 Change 165595 by anchie@anchie_malimis on 2009/07/04 15:35:44 Editorial changes. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#15 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#13 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#4 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#13 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#15 (text+ko) ==== @@ -409,7 +409,6 @@ int icmp6len = m->m_pkthdr.len - *offp; int code, sum, noff; char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN]; - int in; int ip6len; ifp = m->m_pkthdr.rcvif; @@ -766,20 +765,18 @@ /* give up local */ /* Send incoming SeND-protected/ND packet to user space. */ - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(m, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else { + else { /* give up local */ nd6_rs_input(m, off, icmp6len); } m = NULL; goto freeit; } - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(n, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else + else nd6_rs_input(n, off, icmp6len); /* m stays. */ break; @@ -793,18 +790,16 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* Send incoming SeND-protected/ND packet to user space. */ - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(m, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else + else nd6_ra_input(m, off, icmp6len); m = NULL; goto freeit; } - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hoo(n, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else + else nd6_ra_input(n, off, icmp6len); /* m stays. */ break; @@ -818,20 +813,18 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* Send incoming SeND-protected/ND packet to user space. */ - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(m, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else { + else { /* give up local */ nd6_ns_input(m, off, icmp6len); } m = NULL; goto freeit; } - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(n, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else + else nd6_ns_input(n, off, icmp6len); /* m stays. */ break; @@ -845,10 +838,9 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* Send incoming SeND-protected/ND packet to user space. */ - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(m, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else { + else { /* give up local */ nd6_na_input(m, off, icmp6len); } @@ -871,20 +863,18 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* Send incoming SeND-protected/ND packet to user space. */ - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(m, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else { + else { /* give up local */ icmp6_redirect_input(m, off); } m = NULL; goto freeit; } - if (send_output_hook != NULL) { + if (send_output_hook != NULL) send_output_hook(n, ifp, SND_IN, ip6len); - return (IPPROTO_DONE); - } else + else icmp6_redirect_input(n, off); /* m stays. */ break; @@ -2791,7 +2781,8 @@ sizeof(*ip6), ntohs(ip6->ip6_plen)); if (send_output_hook != NULL) { - mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), M_NOWAIT); + mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), + M_NOWAIT); if (mtag == NULL) goto fail; *(unsigned short *)(mtag + 1) = nd_rd->nd_rd_type; ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#13 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#4 (text+ko) ==== @@ -565,7 +565,8 @@ in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len); if (send_output_hook != NULL) { - mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), M_NOWAIT); + mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), + M_NOWAIT); if (mtag == NULL) goto bad; else @@ -1080,7 +1081,8 @@ in6_cksum(m, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), icmp6len); if (send_output_hook != NULL) { - mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), M_NOWAIT); + mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), + M_NOWAIT); if (mtag == NULL) goto bad; *(unsigned short *)(mtag + 1) = nd_na->nd_na_type; ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#13 (text+ko) ==== @@ -7,8 +7,8 @@ * structure. */ -#define SND_OUT 0 /* outgoing traffic sent to sendd */ -#define SND_IN 1 +#define SND_OUT 0 /* Outgoing traffic */ +#define SND_IN 1 /* Incoming traffic. */ -#define RTM_SND_OUT 0 /* outgoing traffic with RTM header sent to sendd */ -#define RTM_SND_IN 1 /* incoming traffic with RTM header sent to sendd */ +#define RTM_SND_OUT 0 /* Outgoing RTM SeND packet sent to user space */ +#define RTM_SND_IN 1 /* Incoming RTM SeND packet sent to user space */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907041536.n64Fadel088822>