Date: Sat, 23 Jan 2010 22:21:56 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r202901 - user/luigi/ipfw3-head/sys/netinet/ipfw Message-ID: <201001232221.o0NMLuif036084@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Sat Jan 23 22:21:56 2010 New Revision: 202901 URL: http://svn.freebsd.org/changeset/base/202901 Log: refine includes for testing Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c 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_fifo.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c Sat Jan 23 22:11:18 2010 (r202900) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_fifo.c Sat Jan 23 22:21:56 2010 (r202901) @@ -35,13 +35,13 @@ #include <netinet/in.h> #include <netinet/ip_var.h> /* ipfw_rule_ref */ #include <netinet/ip_fw.h> /* flow_id */ -#else -#include "dn_test.h" -#endif #include <netinet/ip_dummynet.h> #include <netinet/ipfw/dn_heap.h> #include <netinet/ipfw/ip_dn_private.h> #include <netinet/ipfw/dn_sched.h> +#else +#include "dn_test.h" +#endif /* * This file implements a FIFO scheduler for a single queue. Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c Sat Jan 23 22:11:18 2010 (r202900) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c Sat Jan 23 22:21:56 2010 (r202901) @@ -35,13 +35,13 @@ #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> #include <netinet/ipfw/dn_sched.h> +#else +#include "dn_test.h" +#endif #define DN_SCHED_RR 3 // XXX Where? Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c Sat Jan 23 22:11:18 2010 (r202900) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c Sat Jan 23 22:21:56 2010 (r202901) @@ -36,13 +36,13 @@ #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> #include <netinet/ipfw/dn_sched.h> +#else +#include "dn_test.h" +#endif #ifndef MAX64 #define MAX64(x,y) (( (int64_t) ( (y)-(x) )) > 0 ) ? (y) : (x) Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h Sat Jan 23 22:11:18 2010 (r202900) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h Sat Jan 23 22:21:56 2010 (r202901) @@ -25,6 +25,7 @@ struct mbuf { int len; } m_pkthdr; struct mbuf *m_nextpkt; + int flow_id; }; typedef void * module_t; struct _md_t { @@ -37,4 +38,9 @@ typedef struct _md_t moduledata_t; moduledata_t *_g_##name = & name##_mod #define MODULE_DEPEND(a, b, c, d, e) +#include <netinet/ip_dummynet.h> +#include <netinet/ipfw/dn_heap.h> +#include <netinet/ipfw/ip_dn_private.h> +#include <netinet/ipfw/dn_sched.h> + #endif /* _DN_TEST_H */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001232221.o0NMLuif036084>