diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2014-06-25 16:21:21 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2014-06-25 16:21:21 +0000 |
| commit | 05217d13b86ccb11dd51eab9383f02c728521f39 (patch) | |
| tree | c326fe026e71a59dbdd68fd2323796dad22598a5 /sys/net | |
| parent | c8303cc4719f71987147a95973eb20df1825ba2c (diff) | |
pf_translate doesn't use the mbuf argument anymore.
From Alexandr Nedvedicky <alexandr ! nedvedicky at oracle ! com>. Thanks!
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_pflog.c | 4 | ||||
| -rw-r--r-- | sys/net/pf.c | 6 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c index e5bda3371b3..f0d18ef9ff7 100644 --- a/sys/net/if_pflog.c +++ b/sys/net/if_pflog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflog.c,v 1.58 2013/11/16 00:36:01 chl Exp $ */ +/* $OpenBSD: if_pflog.c,v 1.59 2014/06/25 16:21:20 mikeb Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -440,7 +440,7 @@ pflog_bpfcopy(const void *src_arg, void *dst_arg, size_t len) if (pd.virtual_proto != PF_VPROTO_FRAGMENT && (pfloghdr->rewritten = pf_translate(&pd, &pfloghdr->saddr, pfloghdr->sport, &pfloghdr->daddr, pfloghdr->dport, 0, - pfloghdr->dir, pd.m))) { + pfloghdr->dir))) { m_copyback(pd.m, pd.off, min(pd.m->m_len - pd.off, pd.hdrlen), pd.hdr.any, M_NOWAIT); #if INET && INET6 diff --git a/sys/net/pf.c b/sys/net/pf.c index 45be0738e70..fbb8fbaae8c 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.878 2014/05/20 11:03:13 mpi Exp $ */ +/* $OpenBSD: pf.c,v 1.879 2014/06/25 16:21:20 mikeb Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -3417,7 +3417,7 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm, sk->port[pd->af == pd->naf ? pd->sidx : pd->didx], &sk->addr[pd->af == pd->naf ? pd->didx : pd->sidx], sk->port[pd->af == pd->naf ? pd->didx : pd->sidx], - virtual_type, icmp_dir, pd->m); + virtual_type, icmp_dir); } } else { while ((ri = SLIST_FIRST(&rules))) { @@ -3657,7 +3657,7 @@ csfailed: int pf_translate(struct pf_pdesc *pd, struct pf_addr *saddr, u_int16_t sport, struct pf_addr *daddr, u_int16_t dport, u_int16_t virtual_type, - int icmp_dir, struct mbuf *m) + int icmp_dir) { /* * when called from bpf_mtap_pflog, there are extra constraints: diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 30c24026056..4b2227af340 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.399 2014/04/22 14:41:03 mpi Exp $ */ +/* $OpenBSD: pfvar.h,v 1.400 2014/06/25 16:21:20 mikeb Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1840,7 +1840,7 @@ struct pf_state_key *pf_alloc_state_key(int); void pf_pkt_addr_changed(struct mbuf *); int pf_state_key_attach(struct pf_state_key *, struct pf_state *, int); int pf_translate(struct pf_pdesc *, struct pf_addr *, u_int16_t, - struct pf_addr *, u_int16_t, u_int16_t, int, struct mbuf *); + struct pf_addr *, u_int16_t, u_int16_t, int); int pf_translate_af(struct pf_pdesc *); void pf_route(struct mbuf **, struct pf_rule *, int, struct ifnet *, struct pf_state *); |