From owner-svn-soc-all@FreeBSD.ORG Tue Aug 5 11:16:55 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6C15B85 for ; Tue, 5 Aug 2014 11:16:55 +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 A327A27D3 for ; Tue, 5 Aug 2014 11:16:55 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s75BGt3L067242 for ; Tue, 5 Aug 2014 11:16:55 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s75BGsew067227 for svn-soc-all@FreeBSD.org; Tue, 5 Aug 2014 11:16:54 GMT (envelope-from dpl@FreeBSD.org) Date: Tue, 5 Aug 2014 11:16:54 GMT Message-Id: <201408051116.s75BGsew067227@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: r271927 - soc2014/dpl/netmap-ipfwjit/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, 05 Aug 2014 11:16:55 -0000 Author: dpl Date: Tue Aug 5 11:16:54 2014 New Revision: 271927 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271927 Log: Changed the type of the function to be called to accept struct ip_fw_chain* as an arg. Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.h Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c Tue Aug 5 10:48:53 2014 (r271926) +++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw2.c Tue Aug 5 11:16:54 2014 (r271927) @@ -131,7 +131,7 @@ funcptr compile_code(ip_fw_args *, ip_fw_chain *); /* Pointer to the actual compiled code */ -int (*compiledfuncptr)(struct ip_fw_args *) = 0; +int (*compiledfuncptr)(struct ip_fw_args *, struct ip_fw_chain *) = 0; /* * Each rule belongs to one of 32 different sets (0..31). @@ -403,7 +403,7 @@ compiledfuncptr = compile_code(args, chain); IPFW_PF_RUNLOCK(chain); } else - return compiledfuncptr(); + return compiledfuncptr(args, chain); /* Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.h ============================================================================== --- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.h Tue Aug 5 10:48:53 2014 (r271926) +++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_rules.h Tue Aug 5 11:16:54 2014 (r271927) @@ -30,6 +30,10 @@ #include /* XXX for in_cksum */ +// dpl XXX. The real function will be inserted by the JIT. +// dpl XXX. For now, we put the chain there, that could change, tough. +int ipfw_chk_jit(struct ip_fw_args *args, struct ip_fw_chain *chain); + /* * Some macros used in the various matching options. * L3HDR maps an ipv4 pointer into a layer3 header pointer of type T