revert "cleanup". extern C is necessary here [on linux] because of a collision

of net/bpf.h and pcap.h headers.

2 files changed, 8 insertions, 0 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index 6ec5b95..b85b7b7 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -1,32 +1,36 @@
 /* $Id$ */
 
 #ifndef CARDMODE_HH
 #define CARDMODE_HH
 
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+
+extern "C"
+{
 #include <net/bpf.h>
 #include <pcap.h>  
+}
 
 /* Defines, used for the card setup */
 #define   DEFAULT_PATH       "/proc/driver/aironet/%s/Config"
         #define   CARD_TYPE_CISCO1
         #define   CARD_TYPE_NG        2
         #define   CARD_TYPE_HOSTAP3
 
 /* only for now, until we have the daemon running */
 /*the config file should provide these information */
 #define   CARD_TYPE              CARD_TYPE_HOSTAP
         #define   SBIN_PATH         "/sbin/ifconfig %s promisc up"
 #define   WLANCTL_PATH           "/sbin/wlanctl-ng"
 
 /* Prototypes */
 int card_into_monitormode (pcap_t **, char *, int);
 int card_set_promisc_up (const char *);
 
 #endif /* CARDMODE_HH */
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh
index 713b383..c7108ac 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh
@@ -1,48 +1,52 @@
 /* $Id$ */
 
 #ifndef SNIFF_HH
 #define SNIFF_HH
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+
+extern "C"
+{
 #include <net/bpf.h>
 #include <pcap.h>  
+}
 
 #define   NONBROADCASTING "non-broadcasting"
 
 /* holds all the interresting data */
 struct packetinfo
 {
   int isvalid;
   int pktlen;
   int fctype;
   int fcsubtype;
   int fc_wep;
   int cap_WEP;
   int cap_IBSS;
   int cap_ESS;
   int channel;
   char bssid[sizeof("00:00:00:00:00:00") + 1];
   char desthwaddr[sizeof("00:00:00:00:00:00") + 1];
   char sndhwaddr[sizeof("00:00:00:00:00:00") + 1];
   char ssid[128];
   int ssid_len;
 };
 
 void process_packets(const struct pcap_pkthdr* pkthdr,const u_char* packet, char *, int);
 int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo);
 void etheraddr_string(register const u_char *ep,char * text);
 int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo);
 
 int GetHeaderLength(u_int16_t fc);
 
 /*
  * True if  "l" bytes of "var" were captured.
  *