Author: ae
Date: Mon Apr 7 12:59:17 2014
New Revision: 264225
URL: http://svnweb.freebsd.org/changeset/base/264225
Log:
MFC r263969,263971:
Don't generate an ICMPv6 error message if packet was consumed by filter.
Remove unused label.
Sponsored by: Yandex LLC
Modified:
stable/9/sys/netinet6/ip6_forward.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet6/ip6_forward.c
==============================================================================
--- stable/9/sys/netinet6/ip6_forward.c Mon Apr 7 12:58:54 2014
(r264224)
+++ stable/9/sys/netinet6/ip6_forward.c Mon Apr 7 12:59:17 2014
(r264225)
@@ -563,10 +563,8 @@ skip_routing:
odst = ip6->ip6_dst;
/* Run through list of hooks for output packets. */
error = pfil_run_hooks(&V_inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT,
NULL);
- if (error != 0)
- goto senderr;
- if (m == NULL)
- goto freecopy;
+ if (error != 0 || m == NULL)
+ goto freecopy; /* consumed by filter */
ip6 = mtod(m, struct ip6_hdr *);
/* See if destination IP address was changed by packet filter. */
@@ -635,7 +633,6 @@ pass:
}
}
-senderr:
if (mcopy == NULL)
goto out;
switch (error) {
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
