From owner-freebsd-net@FreeBSD.ORG  Mon Jul 21 08:31:13 2008
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 781831065671
	for <freebsd-net@freebsd.org>; Mon, 21 Jul 2008 08:31:13 +0000 (UTC)
	(envelope-from vanhu@zeninc.net)
Received: from smtp.zeninc.net (smtp.zeninc.net [80.67.176.25])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E6AC8FC18
	for <freebsd-net@freebsd.org>; Mon, 21 Jul 2008 08:31:13 +0000 (UTC)
	(envelope-from vanhu@zeninc.net)
Received: by smtp.zeninc.net (smtpd, from userid 1000)
	id 5C4A63F7B; Mon, 21 Jul 2008 10:31:10 +0200 (CEST)
Date: Mon, 21 Jul 2008 10:31:10 +0200
From: VANHULLEBUS Yvan <vanhu@FreeBSD.org>
To: freebsd-net@freebsd.org
Message-ID: <20080721083110.GA21786@zen.inc>
References: <20080630040103.94730.qmail@mailgate.gta.com>
	<486A45AB.2080609@freebsd.org> <487EC62A.3070301@freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <487EC62A.3070301@freebsd.org>
User-Agent: All mail clients suck. This one just sucks less.
Subject: Re:  FreeBSD NAT-T patch integration [CFR/CFT]
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jul 2008 08:31:13 -0000

On Wed, Jul 16, 2008 at 09:10:18PM -0700, Sam Leffler wrote:
[...]
> Please test/review the following patch against HEAD:
> 
> http://people.freebsd.org/~sam/nat_t-20080616.patch

I have tested the RELENG7 version of the patch, and it works well.


But I noticed a misplaced #endif at the beginning of udp_ctloutput(),
which will generate problems if INET6 is not defined:

	 if (sopt->sopt_level != IPPROTO_UDP) {
#ifdef INET6
		if (INP_CHECK_SOCKAF(so, AF_INET6)) {
			INP_WUNLOCK(inp);
			error = ip6_ctloutput(so, sopt);
#endif
		} else {
		    INP_WUNLOCK(inp);
			error = ip_ctloutput(so, sopt);
#ifdef INET6
		}
#endif
		return (error);
	}


The code should be:


	 if (sopt->sopt_level != IPPROTO_UDP) {
#ifdef INET6
		if (INP_CHECK_SOCKAF(so, AF_INET6)) {
			INP_WUNLOCK(inp);
			error = ip6_ctloutput(so, sopt);
		} else {
#endif
		    INP_WUNLOCK(inp);
			error = ip_ctloutput(so, sopt);
#ifdef INET6
		}
#endif
		return (error);
	}




Yvan.