dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

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:
Guy Harris 2009-03-19 09:37:03 -07:00
parent 05326b0246
commit 3866e83123
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS
View File

@ -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>
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>

2
inet.c
View File

@ -669,7 +669,7 @@ pcap_lookupnet(device, netp, maskp, errbuf)
|| strstr(device, "bluetooth") != NULL
#endif
#ifdef PCAP_SUPPORT_USB
|| strstr(device, "usb") != NULL
|| strstr(device, "usbmon") != NULL
#endif
) {
*netp = *maskp = 0;

2
pcap-linux.c
View File

@ -324,7 +324,7 @@ pcap_create(const char *device, char *ebuf)
#endif
#ifdef PCAP_SUPPORT_USB
if (strstr(device, "usb")) {
if (strstr(device, "usbmon")) {
return usb_create(device, ebuf);
}
#endif

2
pcap-usb-linux.c
View File

@ -64,7 +64,7 @@ static const char rcsid[] _U_ =
#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"