Date: Mon, 18 Aug 2014 14:24:59 GMT From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272609 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw Message-ID: <201408181424.s7IEOxno050494@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dpl Date: Mon Aug 18 14:24:58 2014 New Revision: 272609 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272609 Log: Corrected minor errors Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c Mon Aug 18 14:24:30 2014 (r272608) +++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c Mon Aug 18 14:24:58 2014 (r272609) @@ -111,9 +111,6 @@ static VNET_DEFINE(int, fw_deny_unknown_exthdrs); #define V_fw_deny_unknown_exthdrs VNET(fw_deny_unknown_exthdrs) -static VNET_DEFINE(int, fw_permit_single_frag6) = 1; -#define V_fw_permit_single_frag6 VNET(fw_permit_single_frag6) - #ifdef IPFIREWALL_DEFAULT_TO_ACCEPT static int default_to_accept = 1; #else @@ -128,7 +125,7 @@ static unsigned int default_fw_tables = IPFW_TABLES_DEFAULT; /* JIT compiling API */ -funcptr compile_code(ip_fw_args *, ip_fw_chain *); +funcptr compile_code(struct ip_fw_args *, struct ip_fw_chain *); /* Pointer to the actual compiled code */ int (*compiledfuncptr)(struct ip_fw_args *, struct ip_fw_chain *) = 0; @@ -412,7 +409,7 @@ /* XXX 0 is a valid proto: IP/IPv6 Hop-by-Hop Option */ // Fill in some variables. - inspect_pkt(args, ip, m, scr_ip, dst_ip, src_port, dst_port, &etype, &ext_hd, &iplen, &pktlen, &is_ipv4, &is_ipv6, &hlen, &proto, &icmp6_type, &ip6f_mf, &offset, &ulp); + inspect_pkt(args, ip, m, &src_ip, &dst_ip, &src_port, &dst_port, &etype, &ext_hd, &iplen, &pktlen, &is_ipv4, &is_ipv6, &hlen, &proto, &icmp6_type, &ip6f_mf, &offset, &ulp); IPFW_PF_RLOCK(chain); if (! V_ipfw_vnet_ready) { /* shutting down, leave NOW. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181424.s7IEOxno050494>