From owner-p4-projects@FreeBSD.ORG  Sat May 17 03:54:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 364351065673; Sat, 17 May 2008 03:54:28 +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 ECA63106566B
	for <perforce@freebsd.org>; Sat, 17 May 2008 03:54:27 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DB4968FC12
	for <perforce@freebsd.org>; Sat, 17 May 2008 03:54:27 +0000 (UTC)
	(envelope-from julian@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 m4H3sRRD012011
	for <perforce@freebsd.org>; Sat, 17 May 2008 03:54:27 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4H3sRAC012009
	for perforce@freebsd.org; Sat, 17 May 2008 03:54:27 GMT
	(envelope-from julian@freebsd.org)
Date: Sat, 17 May 2008 03:54:27 GMT
Message-Id: <200805170354.m4H3sRAC012009@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141750 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: Sat, 17 May 2008 03:54:28 -0000

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

Change 141750 by julian@julian_trafmon1 on 2008/05/17 03:53:39

	fix typos submitted by Norikatsu Shigemura <nork@>

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_fw.h#10 edit
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#32 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#10 (text+ko) ====

@@ -566,7 +566,7 @@
 	int		fw_prid;
 };
 
-#define IPFW_TABLES_MAX		128
+#define	IPFW_TABLES_MAX		128
 struct ip_fw_chain {
 	struct ip_fw	*rules;		/* list of rules */
 	struct ip_fw	*reap;		/* list of rules to reap */
@@ -666,14 +666,6 @@
 
 #ifdef IPFW_INTERNAL
 
-#define	IPFW_TABLES_MAX		128
-struct ip_fw_chain {
-	struct ip_fw	*rules;		/* list of rules */
-	struct ip_fw	*reap;		/* list of rules to reap */
-	LIST_HEAD(, cfg_nat) nat;       /* list of nat entries */
-	struct radix_node_head *tables[IPFW_TABLES_MAX];
-	struct rwlock	rwmtx;
-};
 #define	IPFW_LOCK_INIT(_chain) \
 	rw_init(&(_chain)->rwmtx, "IPFW static rules")
 #define	IPFW_LOCK_DESTROY(_chain)	rw_destroy(&(_chain)->rwmtx)

==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#32 (text+ko) ====

@@ -3350,7 +3350,7 @@
 					if (t == NULL) {
 						nat_id = (cmd->arg1 == IP_FW_TABLEARG) ?
 						    tablearg : cmd->arg1;
-						LOOKUP_NAT(layer3_chain, nat_id, t);
+						LOOKUP_NAT(V_layer3_chain, nat_id, t);
 						if (t == NULL) {
 							retval = IP_FW_DENY;
 							goto done;
@@ -4400,6 +4400,7 @@
 		else {
 			printf("IP_FW_NAT_CFG: ipfw_nat not present, please load it.\n");
 			error = EINVAL;
+		}
 	}
 	break;
 
@@ -4645,7 +4646,11 @@
 		"disabled, ",
 #endif
 
-		default_rule.cmd[0].opcode == O_ACCEPT ? "accept" : "deny");
+#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
+		"accept"
+#else
+		"deny"
+#endif
 		);
 
 #ifdef IPFIREWALL_VERBOSE