svn commit: r336903 - stable/11/contrib/tcpdump
Slava Shwartsman
slavash at FreeBSD.org
Mon Jul 30 12:51:58 UTC 2018
Author: slavash
Date: Mon Jul 30 12:51:57 2018
New Revision: 336903
URL: https://svnweb.freebsd.org/changeset/base/336903
Log:
MFC r334318:
Vendor import two upstream commits:
c1bb8784abd3ca978e376b0d10e324db0491237b
9c4af7213cc2543a1f5586d8f2c19f86aa0cbe72
Approved by: hselasky (mentor), kib (mentor)
Sponsored by: Mellanox Technologies
Modified:
stable/11/contrib/tcpdump/tcpdump.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/tcpdump/tcpdump.c
==============================================================================
--- stable/11/contrib/tcpdump/tcpdump.c Mon Jul 30 12:44:44 2018 (r336902)
+++ stable/11/contrib/tcpdump/tcpdump.c Mon Jul 30 12:51:57 2018 (r336903)
@@ -77,7 +77,6 @@ The Regents of the University of California. All righ
*/
#ifdef HAVE_CAPSICUM
#include <sys/capsicum.h>
-#include <sys/sysctl.h>
#include <sys/nv.h>
#include <sys/ioccom.h>
#include <net/bpf.h>
@@ -114,6 +113,10 @@ The Regents of the University of California. All righ
#endif /* HAVE_CAP_NG_H */
#endif /* HAVE_LIBCAP_NG */
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#endif /* __FreeBSD__ */
+
#include "netdissect.h"
#include "interface.h"
#include "addrtoname.h"
@@ -1095,6 +1098,10 @@ open_interface(const char *device, netdissect_options
sysctlbyname(sysctl, parent, &s, NULL, 0);
strlcpy(newdev, device, sizeof(newdev));
/* Suggest a new wlan device. */
+ /* FIXME: incrementing the index this way is not going to work well
+ * when the index is 9 or greater but the only consequence in this
+ * specific case would be an error message that looks a bit odd.
+ */
newdev[strlen(newdev)-1]++;
error("%s is not a monitor mode VAP\n"
"To create a new monitor mode VAP use:\n"
More information about the svn-src-stable-11
mailing list