From owner-p4-projects@FreeBSD.ORG  Wed Jan 31 16:40:25 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9355516A403; Wed, 31 Jan 2007 16:40:25 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 1F99D16A401
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 16:40:25 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E71113C4A7
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 16:40:25 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0VGeOHv049384
	for <perforce@freebsd.org>; Wed, 31 Jan 2007 16:40:24 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0VGeOhN049381
	for perforce@freebsd.org; Wed, 31 Jan 2007 16:40:24 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 31 Jan 2007 16:40:24 GMT
Message-Id: <200701311640.l0VGeOhN049381@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 113775 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: Wed, 31 Jan 2007 16:40:25 -0000

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

Change 113775 by piso@piso_newluxor on 2007/01/31 16:40:09

	Start filling in mbuf placeholders i left around: ProtoAliasIn() and ProtoAliasOut() first.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#44 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#44 (text+ko) ====

@@ -692,8 +692,11 @@
 	struct ip *pip;
 	struct alias_link *lnk;
 #ifdef _KERNEL
-	// XXX - m_pullup()
-	pip = ptr;
+	struct mbuf *m;
+	m = m_pullup(ptr, sizeof(struct ip));
+	if (m == NULL)
+		return (PKT_ALIAS_IGNORED);
+	pip = mtod(m, struct ip *);
 #else
 	pip = ptr;
 #endif
@@ -731,8 +734,11 @@
 	struct alias_link *lnk;
 	struct ip *pip;
 #ifdef _KERNEL
-	// XXX m_pullup()
-	pip = ptr;
+	struct mbuf *m;
+	m = m_pullup(ptr, sizeof(struct ip));
+	if (m == NULL)
+		return (PKT_ALIAS_IGNORED);
+	pip = mtod(m, struct ip *);
 #else
 	pip = ptr;
 #endif
@@ -1368,11 +1374,11 @@
 			if (error ==  0)
 				iresult = PKT_ALIAS_OK;
 			else
-				iresult = ProtoAliasIn(la, pip);
+				iresult = ProtoAliasIn(la, ptr);
 		}
  			break; 
 		default:
-			iresult = ProtoAliasIn(la, pip);
+			iresult = ProtoAliasIn(la, ptr);
 			break;
 		}
 
@@ -1509,11 +1515,11 @@
 			if (error == 0)
  				iresult = PKT_ALIAS_OK;
  			else
- 				iresult = ProtoAliasOut(la, pip, create);
+ 				iresult = ProtoAliasOut(la, ptr, create);
 		}
  			break;
 		default:
-			iresult = ProtoAliasOut(la, pip, create);
+			iresult = ProtoAliasOut(la, ptr, create);
 			break;
 		}
 	} else {