diff options
Diffstat (limited to 'source/n/tcpdump')
| -rw-r--r-- | source/n/tcpdump/libpcap.20-fix-any-intf.diff | 159 | ||||
| -rwxr-xr-x | source/n/tcpdump/tcpdump.SlackBuild | 24 |
2 files changed, 181 insertions, 2 deletions
diff --git a/source/n/tcpdump/libpcap.20-fix-any-intf.diff b/source/n/tcpdump/libpcap.20-fix-any-intf.diff new file mode 100644 index 00000000..84afa682 --- /dev/null +++ b/source/n/tcpdump/libpcap.20-fix-any-intf.diff @@ -0,0 +1,159 @@ +commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808 +Author: guy <guy> +Date: Wed Nov 19 08:20:39 2008 +0000 + + Fix the handling of the "any" device, including making it reject + attempts to open it in monitor mode. +--- + pcap-linux.c | 68 ++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 42 insertions(+), 26 deletions(-) + +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -297,6 +297,12 @@ + { + pcap_t *handle; + ++ /* ++ * A null device name is equivalent to the "any" device. ++ */ ++ if (device == NULL) ++ device = "any"; ++ + #ifdef HAVE_DAG_API + if (strstr(device, "dag")) { + return dag_create(device, ebuf); +@@ -338,10 +344,9 @@ + struct iwreq ireq; + #endif + +- if (p->opt.source == NULL) { ++ if (strcmp(p->opt.source, "any") == 0) { + /* +- * This is equivalent to the "any" device, and we don't +- * support monitor mode on it. ++ * Monitor mode makes no sense on the "any" device. + */ + return 0; + } +@@ -518,12 +523,11 @@ + handle->stats_op = pcap_stats_linux; + + /* +- * NULL and "any" are special devices which give us the hint to +- * monitor all devices. ++ * The "any" device is a special device which causes us not ++ * to bind to a particular device and thus to look at all ++ * devices. + */ +- if (!device || strcmp(device, "any") == 0) { +- device = NULL; +- handle->md.device = strdup("any"); ++ if (strcmp(device, "any") == 0) { + if (handle->opt.promisc) { + handle->opt.promisc = 0; + /* Just a warning. */ +@@ -531,10 +535,9 @@ + "Promiscuous mode not supported on the \"any\" device"); + status = PCAP_WARNING_PROMISC_NOTSUP; + } ++ } + +- } else +- handle->md.device = strdup(device); +- ++ handle->md.device = strdup(device); + if (handle->md.device == NULL) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s", + pcap_strerror(errno) ); +@@ -1657,19 +1660,21 @@ + activate_new(pcap_t *handle) + { + #ifdef HAVE_PF_PACKET_SOCKETS ++ const char *device = handle->opt.source; ++ int is_any_device = (strcmp(device, "any") == 0); + int sock_fd = -1, arptype, val; + int err = 0; + struct packet_mreq mr; +- const char* device = handle->opt.source; + + /* +- * Open a socket with protocol family packet. If a device is +- * given we try to open it in raw mode otherwise we use +- * the cooked interface. +- */ +- sock_fd = device ? +- socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)) +- : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)); ++ * Open a socket with protocol family packet. If the ++ * "any" device was specified, we open a SOCK_DGRAM ++ * socket for the cooked interface, otherwise we first ++ * try a SOCK_RAW socket for the raw interface. ++ */ ++ sock_fd = is_any_device ? ++ socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) : ++ socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + + if (sock_fd == -1) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", +@@ -1704,7 +1709,7 @@ + * to cooked mode if we have an unknown interface type + * or a type we know doesn't work well in raw mode. + */ +- if (device) { ++ if (!is_any_device) { + /* Assume for now we don't need cooked mode. */ + handle->md.cooked = 0; + +@@ -1819,15 +1824,23 @@ + } + } else { + /* +- * This is cooked mode. ++ * The "any" device. ++ */ ++ if (handle->opt.rfmon) { ++ /* ++ * It doesn't support monitor mode. ++ */ ++ return PCAP_ERROR_RFMON_NOTSUP; ++ } ++ ++ /* ++ * It uses cooked mode. + */ + handle->md.cooked = 1; + handle->linktype = DLT_LINUX_SLL; + + /* + * We're not bound to a device. +- * XXX - true? Or true only if we're using +- * the "any" device? + * For now, we're using this as an indication + * that we can't transmit; stop doing that only + * if we figure out how to transmit in cooked +@@ -1852,10 +1865,13 @@ + + /* + * Hmm, how can we set promiscuous mode on all interfaces? +- * I am not sure if that is possible at all. ++ * I am not sure if that is possible at all. For now, we ++ * silently ignore attempts to turn promiscuous mode on ++ * for the "any" device (so you don't have to explicitly ++ * disable it in programs such as tcpdump). + */ + +- if (device && handle->opt.promisc) { ++ if (!is_any_device && handle->opt.promisc) { + memset(&mr, 0, sizeof(mr)); + mr.mr_ifindex = handle->md.ifindex; + mr.mr_type = PACKET_MR_PROMISC; +@@ -3118,7 +3134,7 @@ + + /* Bind to the given device */ + +- if (!device) { ++ if (strcmp(device, "any") == 0) { + strncpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems", + PCAP_ERRBUF_SIZE); + return PCAP_ERROR; diff --git a/source/n/tcpdump/tcpdump.SlackBuild b/source/n/tcpdump/tcpdump.SlackBuild index ec1d39ee..15715c56 100755 --- a/source/n/tcpdump/tcpdump.SlackBuild +++ b/source/n/tcpdump/tcpdump.SlackBuild @@ -22,8 +22,17 @@ VERSION=4.0.0 LIBVER=1.0.0 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -47,6 +56,9 @@ cd $TMP rm -rf libpcap-$LIBVER tar xvf $CWD/libpcap-$LIBVER.tar.gz || exit 1 cd libpcap-$LIBVER || exit 1 + +zcat $CWD/libpcap.20-fix-any-intf.diff.gz | patch -p1 --verbose || exit 1 + find . -type d -name CVS -depth -exec rm -rf {} \; chown -R root:root . find . \ @@ -63,8 +75,16 @@ CFLAGS="$(getconf LFS_CFLAGS)" \ --enable-ipv6 \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 +make shared $NUMJOBS || make || exit 1 mkdir -p $PKG/usr/bin # otherwise it errors out on install make install DESTDIR=$PKG || exit 1 +strip --strip-debug libpcap.so.1.?.? +cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + ln -sf libpcap.so.1.?.? libpcap.so.1 + ln -sf libpcap.so.1 libpcap.so.0 + ln -sf libpcap.so.1 libpcap.so +) mkdir -p $PKG/usr/doc/libpcap-$LIBVER cp -a \ CHANGES CREDITS FILES INSTALL.txt LICENSE README README.linux TODO VERSION \ |