File fix-usb-nic.patch of Package libpcap

Overview Repositories Revisions Requests Users Attributes Meta

File fix-usb-nic.patch of Package libpcap (Revision bac9d8261722e92cd0f8acaa2d7835b9)

Currently displaying revision bac9d8261722e92cd0f8acaa2d7835b9 , Show latest

From 3866e8312346839a7b6d1ddb521c4a0a8033dd5f Mon Sep 17 00:00:00 2001
From: Guy Harris <gharris@steve.local>
Date: Thu, 19 Mar 2009 09:37:03 -0700
Subject: [PATCH] From Roman Francoise: rename the USB-sniffing devices to "usbmonN", so
 as not to collide with the "usbN" names for USB-based networking
 devices.

Index: libpcap-0.9.8_CVS20080503/inet.c
===================================================================
--- libpcap-0.9.8_CVS20080503.orig/inet.c	2008-04-20 20:19:02.000000000 +0200
+++ libpcap-0.9.8_CVS20080503/inet.c	2009-03-26 14:35:10.000000000 +0100
@@ -669,7 +669,7 @@
 	    || strstr(device, "bluetooth") != NULL
 #endif
 #ifdef PCAP_SUPPORT_USB
-	    || strstr(device, "usb") != NULL
+	    || strstr(device, "usbmon") != NULL
 #endif
 	    ) {
 		*netp = *maskp = 0;
Index: libpcap-0.9.8_CVS20080503/pcap-linux.c
===================================================================
--- libpcap-0.9.8_CVS20080503.orig/pcap-linux.c	2009-03-26 14:34:55.000000000 +0100
+++ libpcap-0.9.8_CVS20080503/pcap-linux.c	2009-03-26 14:35:10.000000000 +0100
@@ -306,7 +306,7 @@
 #endif
 
 #ifdef PCAP_SUPPORT_USB
-	if (strstr(device, "usb")) {
+	if (strstr(device, "usbmon")) {
 		return usb_create(device, ebuf);
 	}
 #endif
Index: libpcap-0.9.8_CVS20080503/pcap-usb-linux.c
===================================================================
--- libpcap-0.9.8_CVS20080503.orig/pcap-usb-linux.c	2008-04-14 23:06:09.000000000 +0200
+++ libpcap-0.9.8_CVS20080503/pcap-usb-linux.c	2009-03-26 14:35:10.000000000 +0100
@@ -61,7 +61,7 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
-#define USB_IFACE "usb"
+#define USB_IFACE "usbmon"
 #define USB_TEXT_DIR "/sys/kernel/debug/usbmon"
 #define USB_BUS_DIR "/proc/bus/usb"
 #define USB_LINE_LEN 4096

Places

File fix-usb-nic.patch of Package libpcap (Revision bac9d8261722e92cd0f8acaa2d7835b9)

Places