From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 00:06:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A0491065674; Thu, 27 Mar 2008 00:06:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE131106566B
	for <perforce@freebsd.org>; Thu, 27 Mar 2008 00:06:24 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B01D58FC15
	for <perforce@freebsd.org>; Thu, 27 Mar 2008 00:06:24 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R06O9G011828
	for <perforce@freebsd.org>; Thu, 27 Mar 2008 00:06:24 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R06OCD011826
	for perforce@freebsd.org; Thu, 27 Mar 2008 00:06:24 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 27 Mar 2008 00:06:24 GMT
Message-Id: <200803270006.m2R06OCD011826@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138688 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Mar 2008 00:06:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=138688

Change 138688 by piso@piso_newluxor on 2008/03/27 00:06:17

	Adapt ng_nat to the new libalias API.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#15 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#15 (text+ko) ====

@@ -675,7 +675,6 @@
 	struct mbuf	*m;
 	struct ip	*ip;
 	int rval, error = 0;
-	char *c;
 
 	/* We have no required hooks. */
 	if (!(priv->flags & NGNAT_CONNECTED)) {
@@ -689,7 +688,7 @@
 
 	m = NGI_M(item);
 
-	if ((m = m_megapullup(m, m->m_pkthdr.len)) == NULL) {
+	if ((m = m_pullup(m, sizeof(struct ip))) == NULL) {
 		NGI_M(item) = NULL;	/* avoid double free */
 		NG_FREE_ITEM(item);
 		return (ENOBUFS);
@@ -697,21 +696,20 @@
 
 	NGI_M(item) = m;
 
-	c = mtod(m, char *);
 	ip = mtod(m, struct ip *);
 
 	KASSERT(m->m_pkthdr.len == ntohs(ip->ip_len),
 	    ("ng_nat: ip_len != m_pkthdr.len"));
 
 	if (hook == priv->in) {
-		rval = LibAliasIn(priv->lib, c, MCLBYTES);
+		rval = LibAliasIn(priv->lib, &m, MCLBYTES);
 		if (rval != PKT_ALIAS_OK &&
 		    rval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) {
 			NG_FREE_ITEM(item);
 			return (EINVAL);
 		}
 	} else if (hook == priv->out) {
-		rval = LibAliasOut(priv->lib, c, MCLBYTES);
+		rval = LibAliasOut(priv->lib, &m, MCLBYTES);
 		if (rval != PKT_ALIAS_OK) {
 			NG_FREE_ITEM(item);
 			return (EINVAL);
@@ -719,11 +717,30 @@
 	} else
 		panic("ng_nat: unknown hook!\n");
 
-	m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len);
+
+        if ((m = m_pullup(m, sizeof(struct ip))) == NULL) {
+                NGI_M(item) = NULL;     /* avoid double free */
+                NG_FREE_ITEM(item);
+                return (ENOBUFS);
+        }
+
+        NGI_M(item) = m;
+
+        ip = mtod(m, struct ip *);
+	m->m_pkthdr.len = ntohs(ip->ip_len);
 
 	if ((ip->ip_off & htons(IP_OFFMASK)) == 0 &&
 	    ip->ip_p == IPPROTO_TCP) {
-		struct tcphdr *th = (struct tcphdr *)((caddr_t)ip +
+		struct tcphdr *th;
+		if ((m = m_pullup(m, (ip->ip_hl << 2) 
+		    + sizeof(struct tcphdr))) == NULL) {
+                	NGI_M(item) = NULL;     /* avoid double free */
+                	NG_FREE_ITEM(item);
+                	return (ENOBUFS);
+	 	}
+		NGI_M(item) = m;
+		ip = mtod(m, struct ip *);
+		th = (struct tcphdr *)((caddr_t)ip +
 		    (ip->ip_hl << 2));
 
 		/*