PERFORCE change 138571 for review

[Paolo Pisati]

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

Change 138571 by piso at piso_newluxor on 2008/03/26 00:18:17

	Adapt ipfw_nat to the new libalias API. 

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#2 edit

Differences ...

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

@@ -253,7 +253,7 @@
 
 	ldt = 0;
 	retval = 0;
-	if ((mcl = m_megapullup(m, m->m_pkthdr.len)) ==
+	if ((mcl = m_pullup(m, sizeof(struct ip))) ==
 	    NULL)
 		goto badnat;
 	ip = mtod(mcl, struct ip *);
@@ -317,10 +317,10 @@
 
 	c = mtod(mcl, char *);
 	if (args->oif == NULL)
-		retval = LibAliasIn(t->lib, c, 
+		retval = LibAliasIn(t->lib, &mcl, 
 				    MCLBYTES);
 	else
-		retval = LibAliasOut(t->lib, c, 
+		retval = LibAliasOut(t->lib, &mcl, 
 				     MCLBYTES);
 	if (retval != PKT_ALIAS_OK) {
 		/* XXX - should i add some logging? */