Date: Mon, 7 Apr 2014 12:58:54 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r264224 - stable/10/sys/netinet6 Message-ID: <201404071258.s37Cwsts040578@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Mon Apr 7 12:58:54 2014 New Revision: 264224 URL: http://svnweb.freebsd.org/changeset/base/264224 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/10/sys/netinet6/ip6_forward.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet6/ip6_forward.c ============================================================================== --- stable/10/sys/netinet6/ip6_forward.c Mon Apr 7 12:51:41 2014 (r264223) +++ stable/10/sys/netinet6/ip6_forward.c Mon Apr 7 12:58:54 2014 (r264224) @@ -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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404071258.s37Cwsts040578>