diff options
| author |   dlg <dlg@openbsd.org> | 2019-09-30 01:53:04 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-09-30 01:53:04 +0000 |
| commit | f1d9eb9729dfae311f02f30dbeca129d9ca1f384 (patch) | |
| tree | 42ee2d274968b7597c8bd05fcf663b4170f4b439 /sys/netinet | |
| parent | Restore SC_DEBUGN() as it was used outside sys/scsi. Some things are (diff) | |
| download | wireguard-openbsd-f1d9eb9729dfae311f02f30dbeca129d9ca1f384.tar.xz wireguard-openbsd-f1d9eb9729dfae311f02f30dbeca129d9ca1f384.zip | |
remove the "copy function" argument to bpf_mtap_hdr.
it was previously (ab)used by pflog, which has since been fixed.
apart from that nothing else used it, so we can trim the cruft.
ok kn@ claudio@ visa@
visa@ also made sure i fixed ipw(4) so i386 won't break.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_ah.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_esp.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_ipcomp.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ipsec_input.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c index 533cdf32f4f..e94b9ead813 100644 --- a/sys/netinet/ip_ah.c +++ b/sys/netinet/ip_ah.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ah.c,v 1.143 2018/08/28 15:15:02 mpi Exp $ */ +/* $OpenBSD: ip_ah.c,v 1.144 2019/09/30 01:53:05 dlg Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -914,7 +914,7 @@ ah_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, hdr.flags |= M_AUTH; bpf_mtap_hdr(encif->if_bpf, (char *)&hdr, - ENC_HDRLEN, m, BPF_DIRECTION_OUT, NULL); + ENC_HDRLEN, m, BPF_DIRECTION_OUT); } } #endif diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index 03c24919305..bf44aa8bbb0 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.158 2018/08/28 15:15:02 mpi Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.159 2019/09/30 01:53:05 dlg Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -767,7 +767,7 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, hdr.flags |= M_AUTH; bpf_mtap_hdr(encif->if_bpf, (char *)&hdr, - ENC_HDRLEN, m, BPF_DIRECTION_OUT, NULL); + ENC_HDRLEN, m, BPF_DIRECTION_OUT); } } #endif diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c index dac65a0344f..37bb95ea4b9 100644 --- a/sys/netinet/ip_ipcomp.c +++ b/sys/netinet/ip_ipcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipcomp.c,v 1.66 2018/09/13 12:29:43 mpi Exp $ */ +/* $OpenBSD: ip_ipcomp.c,v 1.67 2019/09/30 01:53:05 dlg Exp $ */ /* * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org) @@ -337,7 +337,7 @@ ipcomp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, hdr.spi = tdb->tdb_spi; bpf_mtap_hdr(encif->if_bpf, (char *)&hdr, - ENC_HDRLEN, m, BPF_DIRECTION_OUT, NULL); + ENC_HDRLEN, m, BPF_DIRECTION_OUT); } } #endif diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index 0e251fc4e3d..b6d0083af40 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.168 2018/11/09 13:26:12 claudio Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.169 2019/09/30 01:53:05 dlg Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -677,7 +677,7 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff) hdr.flags = m->m_flags & (M_AUTH|M_CONF); bpf_mtap_hdr(encif->if_bpf, (char *)&hdr, - ENC_HDRLEN, m, BPF_DIRECTION_IN, NULL); + ENC_HDRLEN, m, BPF_DIRECTION_IN); } } #endif |