Date: Thu, 14 Mar 2019 22:20:48 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345160 - head/sys/netpfil/ipfw Message-ID: <201903142220.x2EMKmsN055799@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Mar 14 22:20:48 2019 New Revision: 345160 URL: https://svnweb.freebsd.org/changeset/base/345160 Log: Simplify ipfw_bpf_mtap2(). No functional change. Modified: head/sys/netpfil/ipfw/ip_fw_bpf.c Modified: head/sys/netpfil/ipfw/ip_fw_bpf.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_bpf.c Thu Mar 14 22:08:09 2019 (r345159) +++ head/sys/netpfil/ipfw/ip_fw_bpf.c Thu Mar 14 22:20:48 2019 (r345160) @@ -163,22 +163,27 @@ ipfwlog_clone_create(struct if_clone *ifc, int unit, c void ipfw_bpf_mtap2(void *data, u_int dlen, struct mbuf *m) { + struct ifnet *logif; LOGIF_RLOCK_TRACKER; LOGIF_RLOCK(); - if (dlen == ETHER_HDR_LEN) { - if (V_log_if == NULL) { - LOGIF_RUNLOCK(); - return; - } - BPF_MTAP2(V_log_if, data, dlen, m); - } else if (dlen == PFLOG_HDRLEN) { - if (V_pflog_if == NULL) { - LOGIF_RUNLOCK(); - return; - } - BPF_MTAP2(V_pflog_if, data, dlen, m); + switch (dlen) { + case (ETHER_HDR_LEN): + logif = V_log_if; + break; + case (PFLOG_HDRLEN): + logif = V_pflog_if; + break; + default: +#ifdef INVARIANTS + panic("%s: unsupported len %d", __func__, dlen); +#endif + logif = NULL; } + + if (logif != NULL) + BPF_MTAP2(logif, data, dlen, m); + LOGIF_RUNLOCK(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903142220.x2EMKmsN055799>