From owner-svn-src-user@FreeBSD.ORG Fri Jan 22 23:56:46 2010 Return-Path: <owner-svn-src-user@FreeBSD.ORG> Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2FB8106568D; Fri, 22 Jan 2010 23:56:46 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B2FA68FC15; Fri, 22 Jan 2010 23:56:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0MNukZC030716; Fri, 22 Jan 2010 23:56:46 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0MNukdL030712; Fri, 22 Jan 2010 23:56:46 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201001222356.o0MNukdL030712@svn.freebsd.org> From: Luigi Rizzo <luigi@FreeBSD.org> Date: Fri, 22 Jan 2010 23:56:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202848 - user/luigi/ipfw3-head/sys/netinet/ipfw X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 22 Jan 2010 23:56:46 -0000 Author: luigi Date: Fri Jan 22 23:56:46 2010 New Revision: 202848 URL: http://svn.freebsd.org/changeset/base/202848 Log: more support for userland testing Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c Fri Jan 22 23:50:46 2010 (r202847) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c Fri Jan 22 23:56:46 2010 (r202848) @@ -24,6 +24,7 @@ * SUCH DAMAGE. */ +#ifdef _KERNEL #include <sys/malloc.h> #include <sys/socket.h> #include <sys/socketvar.h> @@ -34,6 +35,9 @@ #include <netinet/in.h> #include <netinet/ip_var.h> /* ipfw_rule_ref */ #include <netinet/ip_fw.h> /* flow_id */ +#else +#include <netinet/ipfw/dn_test.h> +#endif #include <netinet/ip_dummynet.h> #include <netinet/ipfw/dn_heap.h> #include <netinet/ipfw/ip_dn_private.h> Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c Fri Jan 22 23:50:46 2010 (r202847) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c Fri Jan 22 23:56:46 2010 (r202848) @@ -25,6 +25,7 @@ * SUCH DAMAGE. */ +#ifdef _KERNEL #include <sys/malloc.h> #include <sys/socket.h> #include <sys/socketvar.h> @@ -35,6 +36,9 @@ #include <netinet/in.h> #include <netinet/ip_var.h> /* ipfw_rule_ref */ #include <netinet/ip_fw.h> /* flow_id */ +#else +#include <netinet/ipfw/dn_test.h> +#endif #include <netinet/ip_dummynet.h> #include <netinet/ipfw/dn_heap.h> #include <netinet/ipfw/ip_dn_private.h> Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h Fri Jan 22 23:50:46 2010 (r202847) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h Fri Jan 22 23:56:46 2010 (r202848) @@ -7,6 +7,7 @@ #include <stdio.h> #include <stdlib.h> #include <strings.h> /* bzero */ +#include <errno.h> #include <inttypes.h> #include <sys/queue.h> #include <sys/time.h>