From owner-svn-soc-all@FreeBSD.ORG Tue Jun 10 15:39:59 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2651BA9E for ; Tue, 10 Jun 2014 15:39:59 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12ABF234C for ; Tue, 10 Jun 2014 15:39:59 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5AFdwSi012304 for ; Tue, 10 Jun 2014 15:39:58 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5AFdwoo012298 for svn-soc-all@FreeBSD.org; Tue, 10 Jun 2014 15:39:58 GMT (envelope-from dpl@FreeBSD.org) Date: Tue, 10 Jun 2014 15:39:58 GMT Message-Id: <201406101539.s5AFdwoo012298@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r269361 - soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2014 15:39:59 -0000 Author: dpl Date: Tue Jun 10 15:39:57 2014 New Revision: 269361 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269361 Log: Corrected a lacking hlen at O_VERSRCREACH. And adding the type to the function arguments. Modified: soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h Modified: soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c Tue Jun 10 15:21:33 2014 (r269360) +++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c Tue Jun 10 15:39:57 2014 (r269361) @@ -1587,7 +1587,7 @@ break; case O_VERSRCREACH: - rule_versrcreach(&match, oif, m, is_ipv6, args, scr_ip); + rule_versrcreach(&match, hlen, oif, m, is_ipv6, args, scr_ip); break; case O_ANTISPOOF: Modified: soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h ============================================================================== --- soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h Tue Jun 10 15:21:33 2014 (r269360) +++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h Tue Jun 10 15:39:57 2014 (r269361) @@ -444,7 +444,7 @@ } inline void -rule_tcpopts(int *match, hlen, void *ulp, uint8_t proto, u_short offset, ipfw_insn *cmd); +rule_tcpopts(int *match, u_int hlen, void *ulp, uint8_t proto, u_short offset, ipfw_insn *cmd); { PULLUP_LEN(hlen, ulp, (TCP(ulp)->th_off << 2)); *match = (proto == IPPROTO_TCP && offset == 0 && @@ -531,7 +531,7 @@ } inline void -rule_log(int *match, struct ip_fw *f, hlen, struct ip_fw_args *args, struct mbuf *m, struct ifnet *oif, u_short offset, u_short ip6f_mf, uint32_t tablearg, struct ip *ip) +rule_log(int *match, struct ip_fw *f, u_int hlen, struct ip_fw_args *args, struct mbuf *m, struct ifnet *oif, u_short offset, u_short ip6f_mf, uint32_t tablearg, struct ip *ip) { ipfw_log(f, hlen, args, m, oif, offset | ip6f_mf, tablearg, ip); @@ -562,7 +562,7 @@ } inline void -rule_versrcreach(int *match, int is_ipv6 struct ip_fw_args *args, struct in_addr *src_ip) +rule_versrcreach(int *match, u_int hlen, int is_ipv6 struct ip_fw_args *args, struct in_addr *src_ip) { /* Outgoing packets automatically pass/match */ match = (hlen > 0 && ((oif != NULL) || @@ -575,7 +575,7 @@ } inline void -rule_antispoof(int *match, struct ifnet *oif, hlen, int is_ipv4 struct in_addr *src_ip, int is_ipv6 struct ip_fw_args *args, m) +rule_antispoof(int *match, struct ifnet *oif, u_int hlen, int is_ipv4 struct in_addr *src_ip, int is_ipv6 struct ip_fw_args *args, m) { } @@ -702,7 +702,7 @@ } inline void -rule_reject(hlen, int is_ipv4 u_short offset, uint8_t proto, void *void *ulp, struct mbuf *m, struct in_addr *dst_ip, struct ip_fw_args *args, ipfw_insn *cmd, uint16_t iplen struct ip *ip) +rule_reject(u_int hlen, int is_ipv4 u_short offset, uint8_t proto, void *void *ulp, struct mbuf *m, struct in_addr *dst_ip, struct ip_fw_args *args, ipfw_insn *cmd, uint16_t iplen struct ip *ip) { } @@ -743,7 +743,7 @@ #ifdef INET6 inline void -rule_unreach6(hlen, int is_ipv4 u_short offset, uint8_t proto, icmp6_type, struct mbuf *m, struct ip_fw_args *args, ipfw_insn *cmd, struct ip *ip) +rule_unreach6(u_int hlen, int is_ipv4 u_short offset, uint8_t proto, icmp6_type, struct mbuf *m, struct ip_fw_args *args, ipfw_insn *cmd, struct ip *ip) { }