From owner-p4-projects@FreeBSD.ORG Fri May 7 23:10:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2409D1065678; Fri, 7 May 2010 23:10:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C4603106566B for ; Fri, 7 May 2010 23:09:59 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B27C78FC16 for ; Fri, 7 May 2010 23:09:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o47N9xmQ085476 for ; Fri, 7 May 2010 23:09:59 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o47N9xgw085474 for perforce@freebsd.org; Fri, 7 May 2010 23:09:59 GMT (envelope-from anchie@FreeBSD.org) Date: Fri, 7 May 2010 23:09:59 GMT Message-Id: <201005072309.o47N9xgw085474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 May 2010 23:10:00 -0000 http://p4web.freebsd.org/@@177935?ac=10 Change 177935 by anchie@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); }