-.\" $OpenBSD: mbuf.9,v 1.71 2014/04/14 09:06:41 mpi Exp $
+.\" $OpenBSD: mbuf.9,v 1.72 2014/04/22 14:41:03 mpi Exp $
.\"
.\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org>
.\" All rights reserved.
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: April 14 2014 $
+.Dd $Mdocdate: April 22 2014 $
.Dt MBUF 9
.Os
.Sh NAME
};
struct pkthdr_pf {
- void *hdr;
void *statekey;
u_int32_t qid;
u_int16_t tag;
-/* $OpenBSD: if_de.c,v 1.113 2014/04/19 12:25:03 henning Exp $ */
+/* $OpenBSD: if_de.c,v 1.114 2014/04/22 14:41:03 mpi Exp $ */
/* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */
/*-
/*
* the original dequeueing policy is dequeue-and-prepend if something
- * goes wrong. when altq is used, it is changed to peek-and-dequeue.
+ * goes wrong.
* the modification becomes a bit complicated since tulip_txput() might
* copy and modify the mbuf passed.
*/
-/* $OpenBSD: uipc_mbuf.c,v 1.182 2014/04/21 11:10:54 henning Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.183 2014/04/22 14:41:03 mpi Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
memcpy(m->m_data, m0->m_data, m0->m_len);
}
m->m_pkthdr.len = m->m_len = m0->m_len;
- m->m_pkthdr.pf.hdr = NULL; /* altq will cope */
m0->m_flags &= ~(M_EXT|M_CLUSTER); /* cluster is gone */
m_free(m0);
m->m_pkthdr.csum_flags, MCS_BITS);
(*pr)("m_pkthdr.ether_vtag: %hu\tm_ptkhdr.ph_rtableid: %u\n",
m->m_pkthdr.ether_vtag, m->m_pkthdr.ph_rtableid);
- (*pr)("m_pkthdr.pf.hdr: %p\n",
- m->m_pkthdr.pf.hdr);
(*pr)("m_pkthdr.pf.statekey: %p\tm_pkthdr.pf.inp %p\n",
m->m_pkthdr.pf.statekey, m->m_pkthdr.pf.inp);
(*pr)("m_pkthdr.pf.qid: %u\tm_pkthdr.pf.tag: %hu\n",
-/* $OpenBSD: if_tun.c,v 1.123 2014/04/18 15:20:00 henning Exp $ */
+/* $OpenBSD: if_tun.c,v 1.124 2014/04/22 14:41:03 mpi Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
/*
* Start packet transmission on the interface.
- * when the interface queue is rate-limited by ALTQ or TBR,
- * if_start is needed to drain packets from the queue in order
- * to notify readers when outgoing packets become ready.
* In layer 2 mode this function is called from ether_output.
*/
void
-/* $OpenBSD: pf.c,v 1.875 2014/04/21 12:22:25 henning Exp $ */
+/* $OpenBSD: pf.c,v 1.876 2014/04/22 14:41:03 mpi Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
struct pf_queuehead *pf_queues_active;
struct pf_queuehead *pf_queues_inactive;
-struct pf_altqqueue pf_altqs[2];
-struct pf_altqqueue *pf_altqs_active;
-struct pf_altqqueue *pf_altqs_inactive;
struct pf_status pf_status;
-u_int32_t ticket_altqs_active;
-u_int32_t ticket_altqs_inactive;
-int altqs_inactive_open;
-
MD5_CTX pf_tcp_secret_ctx;
u_char pf_tcp_secret[16];
int pf_tcp_secret_init;
struct pool pf_src_tree_pl, pf_rule_pl, pf_queue_pl;
struct pool pf_state_pl, pf_state_key_pl, pf_state_item_pl;
-struct pool pf_altq_pl, pf_rule_item_pl, pf_sn_item_pl;
+struct pool pf_rule_item_pl, pf_sn_item_pl;
struct pool hfsc_class_pl, hfsc_classq_pl, hfsc_internal_sc_pl;
void pf_init_threshold(struct pf_threshold *, u_int32_t,
-/* $OpenBSD: pf_ioctl.c,v 1.271 2014/04/19 12:59:53 henning Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.272 2014/04/22 14:41:03 mpi Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
"pfstitem", NULL);
pool_init(&pf_rule_item_pl, sizeof(struct pf_rule_item), 0, 0, 0,
"pfruleitem", NULL);
- pool_init(&pf_altq_pl, sizeof(struct pf_altq), 0, 0, 0, "pfaltq",
- &pool_allocator_nointr);
pool_init(&pf_queue_pl, sizeof(struct pf_queuespec), 0, 0, 0,
"pfqueue", NULL);
pool_init(&hfsc_class_pl, sizeof(struct hfsc_class), 0, 0, PR_WAITOK,
TAILQ_INIT(&pf_queues[1]);
pf_queues_active = &pf_queues[0];
pf_queues_inactive = &pf_queues[1];
- TAILQ_INIT(&pf_altqs[0]);
- TAILQ_INIT(&pf_altqs[1]);
- pf_altqs_active = &pf_altqs[0];
- pf_altqs_inactive = &pf_altqs[1];
TAILQ_INIT(&state_list);
/* default rule should never be garbage collected */
to->max_src_conn_rate.limit = from->max_src_conn_rate.limit;
to->max_src_conn_rate.seconds = from->max_src_conn_rate.seconds;
- /* set queue IDs. little ugly due to both altq and new system... */
if (to->qname[0] != 0) {
if ((to->qid = pf_qname2qid(to->qname, 0)) == 0)
return (EBUSY);
-/* $OpenBSD: pfvar.h,v 1.398 2014/04/19 12:59:53 henning Exp $ */
+/* $OpenBSD: pfvar.h,v 1.399 2014/04/22 14:41:03 mpi Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
int flags;
};
-struct pf_altq {
- char ifname[IFNAMSIZ];
-
- void *altq_disc; /* discipline-specific state */
- TAILQ_ENTRY(pf_altq) entries;
-
- /* scheduler spec */
- u_int8_t scheduler; /* scheduler type */
- u_int16_t tbrsize; /* tokenbucket regulator size */
- u_int32_t ifbandwidth; /* interface bandwidth */
-
- /* queue spec */
- char qname[PF_QNAME_SIZE]; /* queue name */
- char parent[PF_QNAME_SIZE]; /* parent name */
- u_int32_t parent_qid; /* parent queue id */
- u_int32_t bandwidth; /* queue bandwidth */
- u_int8_t priority; /* priority */
- u_int16_t qlimit; /* queue size limit */
- u_int16_t flags; /* misc flags */
- union {
- struct cbq_opts cbq_opts;
- struct priq_opts priq_opts;
- struct hfsc_opts hfsc_opts;
- } pq_u;
-
- u_int32_t qid; /* return value */
-};
-
struct pf_tagname {
TAILQ_ENTRY(pf_tagname) entries;
char name[PF_TAG_NAME_SIZE];
unsigned limit;
};
-struct pfioc_altq {
- u_int32_t action;
- u_int32_t ticket;
- u_int32_t nr;
- struct pf_altq altq;
-};
-
-struct pfioc_altqstats {
- u_int32_t ticket;
- u_int32_t nr;
- void *buf;
- int nbytes;
- u_int8_t scheduler;
-};
-
struct pfioc_ruleset {
u_int32_t nr;
char path[MAXPATHLEN];
extern struct pf_queuehead pf_queues[2];
extern struct pf_queuehead *pf_queues_active, *pf_queues_inactive;
-TAILQ_HEAD(pf_altqqueue, pf_altq);
-extern struct pf_altqqueue pf_altqs[2];
-
-extern u_int32_t ticket_altqs_active;
-extern u_int32_t ticket_altqs_inactive;
-extern int altqs_inactive_open;
extern u_int32_t ticket_pabuf;
-extern struct pf_altqqueue *pf_altqs_active;
-extern struct pf_altqqueue *pf_altqs_inactive;
extern int pf_free_queues(struct pf_queuehead *,
struct ifnet *);
extern int pf_remove_queues(struct ifnet *);
extern void pf_calc_skip_steps(struct pf_rulequeue *);
extern struct pool pf_src_tree_pl, pf_sn_item_pl, pf_rule_pl;
extern struct pool pf_state_pl, pf_state_key_pl, pf_state_item_pl,
- pf_altq_pl, pf_rule_item_pl, pf_queue_pl;
+ pf_rule_item_pl, pf_queue_pl;
extern struct pool pf_state_scrub_pl;
extern struct pool hfsc_class_pl, hfsc_classq_pl,
hfsc_internal_sc_pl;
-/* $OpenBSD: mbuf.h,v 1.175 2014/04/14 09:06:42 mpi Exp $ */
+/* $OpenBSD: mbuf.h,v 1.176 2014/04/22 14:41:03 mpi Exp $ */
/* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */
/*
struct inpcb;
struct pkthdr_pf {
- void *hdr; /* saved hdr pos in mbuf, for ECN */
struct pf_state_key *statekey; /* pf stackside statekey */
struct inpcb *inp; /* connected pcb for outgoing packet */
u_int32_t qid; /* queue id */
projects / openbsd / commitdiff