diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2016-05-12 19:42:13 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2016-05-12 19:42:13 +0000 |
| commit | 34530d661f92ed22e62c625112b2b0c6bb4d5990 (patch) | |
| tree | 65cb82add9fe1f704eb85cc7c1107140b4528005 /sys/net | |
| parent | 9fde0230421261666f183634f51146242b025c0c (diff) | |
| download | FreeBSD-src-34530d661f92ed22e62c625112b2b0c6bb4d5990.zip FreeBSD-src-34530d661f92ed22e62c625112b2b0c6bb4d5990.tar.gz | |
Allow silencing of 'promiscuous mode enabled/disabled' messages.
PR: 166255
Submitted by: eugen.grosbein.net
Obtained from: eugen.grosbein.net
MFC after: 1 week
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 7a0bcec..e816442 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -112,6 +112,13 @@ SYSCTL_INT(_net_link, OID_AUTO, log_link_state_change, CTLFLAG_RW, &log_link_state_change, 0, "log interface link state change events"); +/* Log promiscuous mode change events */ +static int log_promisc_mode_change = 1; + +SYSCTL_INT(_net_link, OID_AUTO, log_promisc_mode_change, CTLFLAG_RW, + &log_promisc_mode_change, 1, + "log promiscuous mode change events"); + /* Interface description */ static unsigned int ifdescr_maxlen = 1024; SYSCTL_UINT(_net, OID_AUTO, ifdescr_maxlen, CTLFLAG_RW, @@ -2326,9 +2333,11 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) ifp->if_flags |= IFF_PROMISC; else if (ifp->if_pcount == 0) ifp->if_flags &= ~IFF_PROMISC; - log(LOG_INFO, "%s: permanently promiscuous mode %s\n", - ifp->if_xname, - (new_flags & IFF_PPROMISC) ? "enabled" : "disabled"); + if (log_promisc_mode_change) + log(LOG_INFO, "%s: permanently promiscuous mode %s\n", + ifp->if_xname, + ((new_flags & IFF_PPROMISC) ? + "enabled" : "disabled")); } ifp->if_flags = (ifp->if_flags & IFF_CANTCHANGE) | (new_flags &~ IFF_CANTCHANGE); @@ -2813,7 +2822,8 @@ ifpromisc(struct ifnet *ifp, int pswitch) error = if_setflag(ifp, IFF_PROMISC, IFF_PPROMISC, &ifp->if_pcount, pswitch); /* If promiscuous mode status has changed, log a message */ - if (error == 0 && ((ifp->if_flags ^ oldflags) & IFF_PROMISC)) + if (error == 0 && ((ifp->if_flags ^ oldflags) & IFF_PROMISC) && + log_promisc_mode_change) log(LOG_INFO, "%s: promiscuous mode %s\n", ifp->if_xname, (ifp->if_flags & IFF_PROMISC) ? "enabled" : "disabled"); |
