From Roman Francoise: rename the USB-sniffing devices to "usbmonN", so
as not to collide with the "usbN" names for USB-based networking devices.
This commit is contained in:
parent
05326b0246
commit
3866e83123
1
CREDITS
1
CREDITS
|
@ -101,6 +101,7 @@ Additional people who have contributed patches:
|
||||||
Richard Stearn <richard at rns-stearn dot demon dot co dot uk>
|
Richard Stearn <richard at rns-stearn dot demon dot co dot uk>
|
||||||
Rick Jones <raj at cup dot hp dot com>
|
Rick Jones <raj at cup dot hp dot com>
|
||||||
Roberto Mariani <jelot-tcpdump at jelot dot it>
|
Roberto Mariani <jelot-tcpdump at jelot dot it>
|
||||||
|
Roman Francoise <rfrancoise at debian dot org>
|
||||||
Sagun Shakya <sagun dot shakya at sun dot com>
|
Sagun Shakya <sagun dot shakya at sun dot com>
|
||||||
Scott Barron <sb125499 at ohiou dot edu>
|
Scott Barron <sb125499 at ohiou dot edu>
|
||||||
Scott Gifford <sgifford at tir dot com>
|
Scott Gifford <sgifford at tir dot com>
|
||||||
|
|
2
inet.c
2
inet.c
|
@ -669,7 +669,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
|
||||||
|| strstr(device, "bluetooth") != NULL
|
|| strstr(device, "bluetooth") != NULL
|
||||||
#endif
|
#endif
|
||||||
#ifdef PCAP_SUPPORT_USB
|
#ifdef PCAP_SUPPORT_USB
|
||||||
|| strstr(device, "usb") != NULL
|
|| strstr(device, "usbmon") != NULL
|
||||||
#endif
|
#endif
|
||||||
) {
|
) {
|
||||||
*netp = *maskp = 0;
|
*netp = *maskp = 0;
|
||||||
|
|
|
@ -324,7 +324,7 @@ pcap_create(const char *device, char *ebuf)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PCAP_SUPPORT_USB
|
#ifdef PCAP_SUPPORT_USB
|
||||||
if (strstr(device, "usb")) {
|
if (strstr(device, "usbmon")) {
|
||||||
return usb_create(device, ebuf);
|
return usb_create(device, ebuf);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -64,7 +64,7 @@ static const char rcsid[] _U_ =
|
||||||
#include <linux/usbdevice_fs.h>
|
#include <linux/usbdevice_fs.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define USB_IFACE "usb"
|
#define USB_IFACE "usbmon"
|
||||||
#define USB_TEXT_DIR "/sys/kernel/debug/usbmon"
|
#define USB_TEXT_DIR "/sys/kernel/debug/usbmon"
|
||||||
#define SYS_USB_BUS_DIR "/sys/bus/usb/devices"
|
#define SYS_USB_BUS_DIR "/sys/bus/usb/devices"
|
||||||
#define PROC_USB_BUS_DIR "/proc/bus/usb"
|
#define PROC_USB_BUS_DIR "/proc/bus/usb"
|
||||||
|
|
Reference in New Issue