Move the Linux Bluetooth and USB declarations to a header file.

[libpcap] / pcap-linux.c

diff --git a/pcap-linux.c b/pcap-linux.c
index d011358b396bff0423e1464dcf66afaa11eb3710..9e761f1b0e79d09c3a7e137ab7723408c4d57637 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.127 2006-10-13 17:34:53 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.128 2006-10-13 17:46:46 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -87,6 +87,14 @@ static const char rcsid[] _U_ =
 #ifdef HAVE_SEPTEL_API
 #include "pcap-septel.h"
 #endif /* HAVE_SEPTEL_API */
+
+#ifdef PCAP_SUPPORT_USB
+#include "pcap-usb-linux.h"
+#endif
+
+#ifdef PCAP_SUPPORT_BT
+#include "pcap-bt-linux.h"
+#endif
          
 #include <errno.h>
 #include <stdlib.h>
@@ -184,23 +192,6 @@ typedef int                socklen_t;
  */
 #define BIGGER_THAN_ALL_MTUS   (64*1024)
 
-#ifdef PCAP_SUPPORT_USB
-/*
- * Prototypes for USB-related functions
- */
-int usb_platform_finddevs(pcap_if_t **alldevsp, char *err_str);
-pcap_t* usb_open_live(const char* bus, int snaplen, int promisc , int to_ms, char* errmsg);
-#endif
-
-#ifdef PCAP_SUPPORT_BT
-/*
- * Prototypes for Bluetooth-related functions
- */
-int bt_platform_finddevs(pcap_if_t **alldevsp, char *err_str);
-pcap_t* bt_open_live(const char* bus, int snaplen, int promisc , int to_ms, char* errmsg);
-#endif
-
-
 /*
  * Prototypes for internal functions
  */
@@ -278,10 +269,11 @@ pcap_open_live(const char *device, int snaplen, int promisc, int to_ms,
        }
 #endif
 
+#ifdef PCAP_SUPPORT_USB
        if (strstr(device, "usb")) {
                return usb_open_live(device, snaplen, promisc, to_ms, ebuf);
        }
-
+#endif
 
        /* Allocate a handle for this session. */