From Roman Francoise: rename the USB-sniffing devices to "usbmonN", so

as not to collide with the "usbN" names for USB-based networking
devices.

diff --git a/CREDITS b/CREDITS
index 7f691d55ffbd272c7d1327ed21382423b616b445..7c1f6f4e8129b2c820c2c0e70a8c96f6fa7ae1f5 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -101,6 +101,7 @@ Additional people who have contributed patches:
        Richard Stearn                  <richard at rns-stearn dot demon dot co dot uk>
        Rick Jones                      <raj at cup dot hp dot com>
        Roberto Mariani                 <jelot-tcpdump at jelot dot it>
        Richard Stearn                  <richard at rns-stearn dot demon dot co dot uk>
        Rick Jones                      <raj at cup dot hp dot com>
        Roberto Mariani                 <jelot-tcpdump at jelot dot it>

+       Roman Francoise                 <rfrancoise at debian dot org>

        Sagun Shakya                    <sagun dot shakya at sun dot com>
        Scott Barron                    <sb125499 at ohiou dot edu>
        Scott Gifford                   <sgifford at tir dot com>
        Sagun Shakya                    <sagun dot shakya at sun dot com>
        Scott Barron                    <sb125499 at ohiou dot edu>
        Scott Gifford                   <sgifford at tir dot com>

diff --git a/inet.c b/inet.c
index 9cd7df7d20f0a20e8a81e43cce5352ebcc2d24e3..11efbf4a321626f1874dfd02223e1243cb6e1232 100644 (file)
--- a/inet.c
+++ b/inet.c
@@ -669,7 +669,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
            || strstr(device, "bluetooth") != NULL
 #endif
 #ifdef PCAP_SUPPORT_USB
            || strstr(device, "bluetooth") != NULL
 #endif
 #ifdef PCAP_SUPPORT_USB

-           || strstr(device, "usb") != NULL
+           || strstr(device, "usbmon") != NULL

 #endif
            ) {
                *netp = *maskp = 0;
 #endif
            ) {
                *netp = *maskp = 0;

diff --git a/pcap-linux.c b/pcap-linux.c
index 43dfe926707aca4a12ecf241794c583f189b4dde..9314eec13544193ebc14fa391690abf771e6b1ad 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -324,7 +324,7 @@ pcap_create(const char *device, char *ebuf)
 #endif
 
 #ifdef PCAP_SUPPORT_USB
 #endif
 
 #ifdef PCAP_SUPPORT_USB

-       if (strstr(device, "usb")) {
+       if (strstr(device, "usbmon")) {

                return usb_create(device, ebuf);
        }
 #endif
                return usb_create(device, ebuf);
        }
 #endif

diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index 93c3f6d28a909557b489361c92bdd337ccc95c32..358865cb7d4252b1ef748f41126d875d5bf6a4d3 100644 (file)
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -64,7 +64,7 @@ static const char rcsid[] _U_ =
 #include <linux/usbdevice_fs.h>
 #endif
 
 #include <linux/usbdevice_fs.h>
 #endif
 

-#define USB_IFACE "usb"
+#define USB_IFACE "usbmon"

 #define USB_TEXT_DIR "/sys/kernel/debug/usbmon"
 #define SYS_USB_BUS_DIR "/sys/bus/usb/devices"
 #define PROC_USB_BUS_DIR "/proc/bus/usb"
 #define USB_TEXT_DIR "/sys/kernel/debug/usbmon"
 #define SYS_USB_BUS_DIR "/sys/bus/usb/devices"
 #define PROC_USB_BUS_DIR "/proc/bus/usb"