From owner-p4-projects@FreeBSD.ORG  Mon Mar 31 23:32:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E1D591065675; Mon, 31 Mar 2008 23:32:14 +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 A04221065673
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 23:32:14 +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 9420F8FC28
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 23:32:14 +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 m2VNWEdO082584
	for <perforce@freebsd.org>; Mon, 31 Mar 2008 23:32:14 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2VNWE9h082582
	for perforce@freebsd.org; Mon, 31 Mar 2008 23:32:14 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 31 Mar 2008 23:32:14 GMT
Message-Id: <200803312332.m2VNWE9h082582@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 139106 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: Mon, 31 Mar 2008 23:32:15 -0000

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

Change 139106 by piso@piso_newluxor on 2008/03/31 23:31:45

	Reassemble fragments before passing it to libalias.
	While here, do not accept packet coming from L2 in 
	nat action.
	Not working yet.

Affected files ...

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

Differences ...

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

@@ -249,13 +249,46 @@
 	/* XXX - libalias duct tape */
 	int ldt, retval;
 
+	/* ipfw_nat works only at layer 3 */
+	if (args->eh != NULL) {
+		// XXX get out
+	}		
+
 	ldt = 0;
 	retval = 0;
 	if ((m = m_pullup(m, sizeof(struct ip))) ==
 	    NULL)
 		goto badnat;
 	ip = mtod(m, struct ip *);
-	if (args->eh == NULL) {
+	if (ip->ip_off & (IP_MF | IP_OFFMASK)) {
+		struct mbuf *reass = NULL;
+
+		/* Reassemble packet. */
+		//reass = ip_reass(m);
+
+		/*
+		 * IP header checksum fixup after reassembly and leave header
+		 * in network byte order.
+		 */
+		if (reass != NULL) {
+			int hlen;
+			
+			ip = mtod(reass, struct ip *);
+			hlen = ip->ip_hl << 2;
+			ip->ip_len = htons(ip->ip_len);
+			ip->ip_off = htons(ip->ip_off);
+			ip->ip_sum = 0;
+			if (hlen == sizeof(struct ip))
+				ip->ip_sum = in_cksum_hdr(ip);
+			else
+				ip->ip_sum = in_cksum(reass, hlen);
+			m = reass;
+		} else {
+			printf("fragment found\n");
+			m = NULL;
+			goto badnat;
+		}
+	} else {
 		ip->ip_len = htons(ip->ip_len);
 		ip->ip_off = htons(ip->ip_off);
 	}
@@ -320,8 +353,11 @@
 	else
 		retval = LibAliasOut(t->lib, &m,
 		    MCLBYTES);
-	if (retval != PKT_ALIAS_OK &&
-	    retval != PKT_ALIAS_FOUND_HEADER_FRAGMENT) {
+	if (retval != PKT_ALIAS_OK) {
+		if (retval & 
+		    (PKT_ALIAS_FOUND_HEADER_FRAGMENT | 
+			PKT_ALIAS_UNRESOLVED_FRAGMENT))
+			printf("fragment in libalias?!?!\n"); // XXX panic?!?!
 		printf("retval: %d", retval);
 		/* XXX - should i add some logging? */
 		m_free(m);
@@ -406,11 +442,8 @@
 		}
 		ip->ip_len = htons(ip->ip_len);
 	}
-
-	if (args->eh == NULL) {
-		ip->ip_len = ntohs(ip->ip_len);
-		ip->ip_off = ntohs(ip->ip_off);
-	}
+	ip->ip_len = ntohs(ip->ip_len);
+	ip->ip_off = ntohs(ip->ip_off);
 
 	args->m = m;
 	return (IP_FW_NAT);