Date: Wed, 31 Mar 2010 02:47:19 GMT From: Ana Kukec <anchie@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 176333 for review Message-ID: <201003310247.o2V2lJPa068510@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=176333 Change 176333 by anchie@anchie_malimis on 2010/03/31 02:46:53 Cleanup. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#34 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#25 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#13 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#8 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#34 (text+ko) ==== @@ -779,7 +779,7 @@ /* give up local */ /* Send incoming SeND-protected/ND packet to user space. */ - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE); printf("send_sendso_input_hook\n"); send_sendso_input_hook(V_send_so, m, SND_IN, ip6len); @@ -790,7 +790,7 @@ m = NULL; goto freeit; } - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE); printf("send_sendso_input_hook\n"); send_sendso_input_hook(V_send_so, n, SND_IN, ip6len); @@ -809,7 +809,7 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* Send incoming SeND-protected/ND packet to user space. */ - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { send_sendso_input_hook(V_send_so, m, SND_IN, ip6len); return (IPPROTO_DONE); @@ -818,7 +818,7 @@ m = NULL; goto freeit; } - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { send_sendso_input_hook(V_send_so, n, SND_IN, ip6len); return (IPPROTO_DONE); } else @@ -833,9 +833,9 @@ if (icmp6len < sizeof(struct nd_neighbor_solicit)) goto badlen; if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { /* Send incoming SeND/ND packet to user space. */ - printf("%s: send_input_hook m=%p\n", __func__, m); + printf("%s: send_sendso_input_hook m=%p\n", __func__, m); send_sendso_input_hook(V_send_so, m, SND_IN, ip6len); } else { /* give up local */ @@ -844,9 +844,9 @@ m = NULL; goto freeit; } - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { /* Send incoming SeND/ND packet to user space. */ - printf("%s: send_input_hook n=%p\n", __func__, n); + printf("%s: send_sendso_input_hook n=%p\n", __func__, n); send_sendso_input_hook(V_send_so, n, SND_IN, ip6len); } else nd6_ns_input(n, off, icmp6len); @@ -862,7 +862,7 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* Send incoming SeND-protected/ND packet to user space. */ - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { send_sendso_input_hook(V_send_so, m, SND_IN, ip6len); return (IPPROTO_DONE); } else { @@ -872,7 +872,7 @@ m = NULL; goto freeit; } - if (send_input_hook != NULL) + if (send_sendso_input_hook != NULL) send_sendso_input_hook(V_send_so, n, SND_IN, ip6len); else nd6_na_input(n, off, icmp6len); @@ -888,7 +888,7 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* Send incoming SeND-protected/ND packet to user space. */ - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { send_sendso_input_hook(V_send_so, m, SND_IN, ip6len); return (IPPROTO_DONE); } else { @@ -898,7 +898,7 @@ m = NULL; goto freeit; } - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { send_sendso_input_hook(V_send_so, n, SND_IN, ip6len); return (IPPROTO_DONE); } else @@ -2804,7 +2804,7 @@ nd_rd->nd_rd_cksum = in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), ntohs(ip6->ip6_plen)); - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), M_NOWAIT); if (mtag == NULL) ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#25 (text+ko) ==== @@ -1987,7 +1987,7 @@ #endif /* send outgoing NS/NA/REDIRECT packet to sendd. */ - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL); if (mtag != NULL) { skip = 1; ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#13 (text+ko) ==== @@ -399,6 +399,8 @@ caddr_t mac; struct route_in6 ro; +printf("nd6_ns_output \n"); + bzero(&ro, sizeof(ro)); if (IN6_IS_ADDR_MULTICAST(taddr6)) @@ -568,7 +570,7 @@ nd_ns->nd_ns_cksum = in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len); - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), M_NOWAIT); if (mtag == NULL) @@ -895,7 +897,7 @@ * the 2nd argument as the 1st one. */ - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), M_NOWAIT); if (mtag == NULL) @@ -1090,7 +1092,7 @@ nd_na->nd_na_cksum = in6_cksum(m, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), icmp6len); - if (send_input_hook != NULL) { + if (send_sendso_input_hook != NULL) { mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), M_NOWAIT); if (mtag == NULL) ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#8 (text+ko) ==== @@ -534,7 +534,7 @@ * Send RA/RS messages to user land for protection, before sending * them to rtadvd/rtsol. */ - if (send_input_hook != NULL && + if (send_sendso_input_hook != NULL && so->so_proto->pr_protocol == IPPROTO_ICMPV6) { switch (type) { case ND_ROUTER_ADVERT:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003310247.o2V2lJPa068510>