Date: Sat, 17 May 2008 03:54:27 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 141750 for review Message-ID: <200805170354.m4H3sRAC012009@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805170354.m4H3sRAC012009>