PERFORCE change 177935 for review

[Ana Kukec]

http://p4web.freebsd.org/@@177935?ac=10

Change 177935 by anchie at anchie_malimis on 2010/05/07 23:09:52

	Continue processing in NDP stack if send_sendso_input () returns -1
	when SEND module is not loaded; continue SEND processing if it
	returns 0, continue processing in NDP stack also if there is no
	module loaded.

Affected files ...

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

Differences ...

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

@@ -786,6 +786,8 @@
 				error = send_sendso_input_hook(m, 
 				    SND_IN, ip6len);
 				/* -1 == no app on SEND socket */
+				if (!error)
+				    return (IPPROTO_DONE);
 				if (error == -1)
 				    nd6_rs_input(m, off, icmp6len);
 			}
@@ -799,6 +801,8 @@
 			    icmp6len, IPPROTO_DONE);
                         error = send_sendso_input_hook(n, 
 			    SND_IN, ip6len);
+			if (!error)
+			    return (IPPROTO_DONE);
 			/* -1 == no app on SEND socket */
 			if (error == -1)
 			    nd6_rs_input(n, off, icmp6len);
@@ -820,6 +824,8 @@
 			if (send_sendso_input_hook != NULL) {
 				error = send_sendso_input_hook(m, 
 				    SND_IN, ip6len);	
+				if (!error)
+				    return (IPPROTO_DONE);
 				if (error == -1)
 				    nd6_ra_input(m, off, icmp6len);
 			}
@@ -831,6 +837,8 @@
 		if (send_sendso_input_hook != NULL) {
 			error = send_sendso_input_hook(n, 
 			    SND_IN, ip6len);	
+			if (!error)
+			    return (IPPROTO_DONE);
 			if (error == -1)
 			    nd6_ra_input(n, off, icmp6len);
 		}
@@ -849,6 +857,8 @@
 			if (send_sendso_input_hook != NULL) { 
 				error = send_sendso_input_hook(m, 
 				    SND_IN, ip6len);	
+				if (!error)
+				    return (IPPROTO_DONE);
 				if (error == -1)
 				    nd6_ns_input(m, off, icmp6len);
 					
@@ -861,6 +871,8 @@
 		if (send_sendso_input_hook != NULL) { 
 			error = send_sendso_input_hook(n, 
 			    SND_IN, ip6len);
+			if (!error)
+			    return (IPPROTO_DONE);
 			if (error == -1)
 			    nd6_ns_input(n, off, icmp6len);
 		} 
@@ -881,6 +893,8 @@
 			if (send_sendso_input_hook != NULL) {
 				error = send_sendso_input_hook(m, 
 				    SND_IN, ip6len);
+				if (!error)
+				    return (IPPROTO_DONE);
 				if (error == -1)
 				    nd6_na_input(m, off, icmp6len);
 			}
@@ -892,6 +906,8 @@
 		if (send_sendso_input_hook != NULL) { 
 			error = send_sendso_input_hook(n, 
 			    SND_IN, ip6len);
+			if (!error)
+			    return (IPPROTO_DONE);
 			if (error == -1)
 			    nd6_na_input(n, off, icmp6len);
 		}
@@ -910,6 +926,8 @@
 			if (send_sendso_input_hook != NULL) { 
 			    error = send_sendso_input_hook(m, 
 				    SND_IN, ip6len);	
+			    if (!error)
+				return (IPPROTO_DONE);
 			    if (error == -1)	
 				icmp6_redirect_input(m, off);
 			}
@@ -921,6 +939,8 @@
 		if (send_sendso_input_hook != NULL) { 
 		    error = send_sendso_input_hook(n, 
 			SND_IN, ip6len);
+		    if (!error)
+			return (IPPROTO_DONE);
 		    if (error == -1)
 			icmp6_redirect_input(n, off);
 		}