PERFORCE change 114113 for review

[Paolo Pisati]

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

Change 114113 by piso at piso_newluxor on 2007/02/06 17:36:34

	Libalias handles mbuf chain now, and the entire packet won't 
	lay anymore in the first mbuf, so stop assuming 
	m_pkthdr.len == m_len.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#9 edit
.. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#42 edit

Differences ...

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

@@ -247,7 +247,7 @@
 		return (ENOBUFS);
 	}
 	ip = mtod(m, struct ip *);
-	m->m_pkthdr.len = m->m_len = ntohs(ip->ip_len);
+	m->m_pkthdr.len = ntohs(ip->ip_len);
 
 	if ((ip->ip_off & htons(IP_OFFMASK)) == 0 &&
 	    ip->ip_p == IPPROTO_TCP) {		

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

@@ -3586,8 +3586,7 @@
 					goto badnat;
 				}
 				ip = mtod(m, struct ip *);
-				m->m_pkthdr.len = m->m_len = 
-				    ntohs(ip->ip_len);
+				m->m_pkthdr.len = ntohs(ip->ip_len);
 
 				/* 
 				 * XXX - libalias checksum offload