PERFORCE change 166350 for review

[Ana Kukec]

http://perforce.freebsd.org/chv.cgi?CH=166350

Change 166350 by anchie at anchie_malimis on 2009/07/21 08:28:30

	Call the input hook for each incoming ND packet, and return
	IPPROTO_DONE after sending it to userspace SEND application.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#18 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#18 (text+ko) ====

@@ -765,8 +765,8 @@
 			/* give up local */
 
 			/* Send incoming SeND-protected/ND packet to user space. */
-			if (send_output_hook != NULL) {
-				send_output_hook(m, ifp, SND_IN, ip6len);
+			if (send_input_hook != NULL) {
+				send_input_hook(m, ifp, SND_IN, ip6len);
 				return (IPPROTO_DONE);
 			} else {
 				/* give up local */
@@ -775,8 +775,8 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL) {
-			send_output_hook(n, ifp, SND_IN, ip6len);
+		if (send_input_hook != NULL) {
+			send_input_hook(n, ifp, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
 			nd6_rs_input(n, off, icmp6len);
@@ -792,16 +792,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) {
-				send_output_hook(m, ifp, SND_IN, ip6len);
+			if (send_input_hook != NULL) {
+				send_input_hook(m, ifp, SND_IN, ip6len);
 				return (IPPROTO_DONE);
 			} else
 				nd6_ra_input(m, off, icmp6len);
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL) {
-			send_output_hook(n, ifp, SND_IN, ip6len);
+		if (send_input_hook != NULL) {
+			send_input_hook(n, ifp, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
 			nd6_ra_input(n, off, icmp6len);
@@ -817,8 +817,8 @@
 		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) {
-				send_output_hook(m, ifp, SND_IN, ip6len);
+			if (send_input_hook != NULL) {
+				send_input_hook(m, ifp, SND_IN, ip6len);
 				return (IPPROTO_DONE);
 			} else {
 				/* give up local */
@@ -827,8 +827,8 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL) {
-			send_output_hook(n, ifp, SND_IN, ip6len);
+		if (send_input_hook != NULL) {
+			send_input_hook(n, ifp, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
 			nd6_ns_input(n, off, icmp6len);
@@ -844,8 +844,8 @@
 		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) {
-				send_output_hook(m, ifp, SND_IN, ip6len);
+			if (send_input_hook != NULL) {
+				send_input_hook(m, ifp, SND_IN, ip6len);
 				return (IPPROTO_DONE);
 			} else {
 				/* give up local */
@@ -854,8 +854,8 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL) {
-			send_output_hook(n, ifp, SND_IN, ip6len);
+		if (send_input_hook != NULL) {
+			send_input_hook(n, ifp, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
 			nd6_na_input(n, off, icmp6len);
@@ -871,8 +871,8 @@
 		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) {
-				send_output_hook(m, ifp, SND_IN, ip6len);
+			if (send_input_hook != NULL) {
+				send_input_hook(m, ifp, SND_IN, ip6len);
 				return (IPPROTO_DONE);
 			} else {
 				/* give up local */
@@ -881,8 +881,8 @@
 			m = NULL;
 			goto freeit;
 		}
-		if (send_output_hook != NULL) {
-			send_output_hook(n, ifp, SND_IN, ip6len);
+		if (send_input_hook != NULL) {
+			send_input_hook(n, ifp, SND_IN, ip6len);
 			return (IPPROTO_DONE);
 		} else
 			icmp6_redirect_input(n, off);
@@ -2790,7 +2790,7 @@
 	nd_rd->nd_rd_cksum = in6_cksum(m, IPPROTO_ICMPV6,
 	    sizeof(*ip6), ntohs(ip6->ip6_plen));
 
-        if (send_output_hook != NULL) {
+        if (send_input_hook != NULL) {
 		mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short), 
 			M_NOWAIT);
 		if (mtag == NULL)