Deleted Added
full compact
ip_dn_private.h (206425) ip_dn_private.h (206428)
1/*-
2 * Copyright (c) 2010 Luigi Rizzo, Riccardo Panicucci, Universita` di Pisa
3 * All rights reserved
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27/*
28 * internal dummynet APIs.
29 *
1/*-
2 * Copyright (c) 2010 Luigi Rizzo, Riccardo Panicucci, Universita` di Pisa
3 * All rights reserved
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27/*
28 * internal dummynet APIs.
29 *
30 * $FreeBSD: head/sys/netinet/ipfw/ip_dn_private.h 206425 2010-04-09 16:06:53Z luigi $
30 * $FreeBSD: head/sys/netinet/ipfw/ip_dn_private.h 206428 2010-04-09 18:02:19Z luigi $
31 */
32
33#ifndef _IP_DN_PRIVATE_H
34#define _IP_DN_PRIVATE_H
35
36/* debugging support
37 * use ND() to remove debugging, D() to print a line,
38 * DX(level, ...) to print above a certain level

--- 106 unchanged lines hidden (view full) ---

145 * with net.inet.ip.dummynet.expire=0, or it happens every
146 * expire ticks.
147 **/
148 int drain_fs;
149 int drain_sch;
150 uint32_t expire;
151 uint32_t expire_cycle; /* tick count */
152
31 */
32
33#ifndef _IP_DN_PRIVATE_H
34#define _IP_DN_PRIVATE_H
35
36/* debugging support
37 * use ND() to remove debugging, D() to print a line,
38 * DX(level, ...) to print above a certain level

--- 106 unchanged lines hidden (view full) ---

145 * with net.inet.ip.dummynet.expire=0, or it happens every
146 * expire ticks.
147 **/
148 int drain_fs;
149 int drain_sch;
150 uint32_t expire;
151 uint32_t expire_cycle; /* tick count */
152
153 int init_done;
154
153 /* if the upper half is busy doing something long,
154 * can set the busy flag and we will enqueue packets in
155 * a queue for later processing.
156 */
157 int busy;
158 struct mq pending;
159
160#ifdef _KERNEL

--- 188 unchanged lines hidden (view full) ---

349 DN_DETACH = 0x0010,
350 DN_ACTIVE = 0x0020, /* object is in evheap */
351 DN_F_DLINE = 0x0040, /* object is a delay line */
352 DN_F_SCHI = 0x00C0, /* object is a sched.instance */
353 DN_QHT_IS_Q = 0x0100, /* in flowset, qht is a single queue */
354};
355
356extern struct dn_parms dn_cfg;
155 /* if the upper half is busy doing something long,
156 * can set the busy flag and we will enqueue packets in
157 * a queue for later processing.
158 */
159 int busy;
160 struct mq pending;
161
162#ifdef _KERNEL

--- 188 unchanged lines hidden (view full) ---

351 DN_DETACH = 0x0010,
352 DN_ACTIVE = 0x0020, /* object is in evheap */
353 DN_F_DLINE = 0x0040, /* object is a delay line */
354 DN_F_SCHI = 0x00C0, /* object is a sched.instance */
355 DN_QHT_IS_Q = 0x0100, /* in flowset, qht is a single queue */
356};
357
358extern struct dn_parms dn_cfg;
359//VNET_DECLARE(struct dn_parms, _base_dn_cfg);
360//#define dn_cfg VNET(_base_dn_cfg)
357
358int dummynet_io(struct mbuf **, int , struct ip_fw_args *);
359void dummynet_task(void *context, int pending);
360void dn_reschedule(void);
361
362struct dn_queue *ipdn_q_find(struct dn_fsk *, struct dn_sch_inst *,
363 struct ipfw_flow_id *);
364struct dn_sch_inst *ipdn_si_find(struct dn_schk *, struct ipfw_flow_id *);

--- 38 unchanged lines hidden ---
361
362int dummynet_io(struct mbuf **, int , struct ip_fw_args *);
363void dummynet_task(void *context, int pending);
364void dn_reschedule(void);
365
366struct dn_queue *ipdn_q_find(struct dn_fsk *, struct dn_sch_inst *,
367 struct ipfw_flow_id *);
368struct dn_sch_inst *ipdn_si_find(struct dn_schk *, struct ipfw_flow_id *);

--- 38 unchanged lines hidden ---