summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-12-11 13:10:26 (UTC)
committer mickeyl <mickeyl>2002-12-11 13:10:26 (UTC)
commit57a776c8345422a0fc32b3fb9d604be1c050d201 (patch) (unidiff)
tree30d484143b11fe69f39c94078dc614ce78d40566
parent84d92e2298605f4d4f9a9209731f62c2b10e54e4 (diff)
downloadopie-57a776c8345422a0fc32b3fb9d604be1c050d201.zip
opie-57a776c8345422a0fc32b3fb9d604be1c050d201.tar.gz
opie-57a776c8345422a0fc32b3fb9d604be1c050d201.tar.bz2
fix for g++ complaining about different linking schemes:
/usr/include/net/bpf.h:408: previous declaration of `u_int bpf_filter(bpf_insn*, u_char*, unsigned int, unsigned int)' with C++ linkage /usr/include/pcap.h:201: conflicts with new declaration with C linkage /usr/include/net/bpf.h:407: previous declaration of `int bpf_validate(bpf_insn*, int)' with C++ linkage /usr/include/pcap.h:202: conflicts with new declaration with C linkage
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh6
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/sniff.hh6
2 files changed, 10 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index 976ceeb..a3f8280 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -1,25 +1,29 @@
1/* $Id$ */ 1/* $Id$ */
2 2
3#ifndef CARDMODE_HH 3#ifndef CARDMODE_HH
4#define CARDMODE_HH 4#define CARDMODE_HH
5 5
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <pcap.h>
9#include <errno.h> 8#include <errno.h>
10#include <sys/socket.h> 9#include <sys/socket.h>
11#include <netinet/in.h> 10#include <netinet/in.h>
12#include <arpa/inet.h> 11#include <arpa/inet.h>
12
13extern "C"
14{
13#include <net/bpf.h> 15#include <net/bpf.h>
16#include <pcap.h>
17}
14 18
15#include "../../libwellenreiter/source/log.hh" 19#include "../../libwellenreiter/source/log.hh"
16 20
17/* Defines, used for the card setup */ 21/* Defines, used for the card setup */
18#define DEFAULT_PATH "/proc/driver/aironet/%s/Config" 22#define DEFAULT_PATH "/proc/driver/aironet/%s/Config"
19 #define CARD_TYPE_CISCO1 23 #define CARD_TYPE_CISCO1
20 #define CARD_TYPE_NG 2 24 #define CARD_TYPE_NG 2
21 #define CARD_TYPE_HOSTAP3 25 #define CARD_TYPE_HOSTAP3
22 26
23/* only for now, until we have the daemon running */ 27/* only for now, until we have the daemon running */
24/*the config file should provide these information */ 28/*the config file should provide these information */
25#define CARD_TYPE CARD_TYPE_CISCO 29#define CARD_TYPE CARD_TYPE_CISCO
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh
index 60cdc43..c13461a 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh
@@ -1,26 +1,30 @@
1/* $Id$ */ 1/* $Id$ */
2 2
3#ifndef SNIFF_HH 3#ifndef SNIFF_HH
4#define SNIFF_HH 4#define SNIFF_HH
5 5
6#include <string.h> 6#include <string.h>
7#include <stdio.h> 7#include <stdio.h>
8#include <stdlib.h> 8#include <stdlib.h>
9#include <pcap.h>
10#include <errno.h> 9#include <errno.h>
11#include <sys/socket.h> 10#include <sys/socket.h>
12#include <netinet/in.h> 11#include <netinet/in.h>
13#include <arpa/inet.h> 12#include <arpa/inet.h>
13
14extern "C"
15{
14#include <net/bpf.h> 16#include <net/bpf.h>
17#include <pcap.h>
18}
15 19
16#define NONBROADCASTING "non-broadcasting" 20#define NONBROADCASTING "non-broadcasting"
17 21
18/* holds all the interresting data */ 22/* holds all the interresting data */
19struct packetinfo 23struct packetinfo
20{ 24{
21 int isvalid; 25 int isvalid;
22 int pktlen; 26 int pktlen;
23 int fctype; 27 int fctype;
24 int fcsubtype; 28 int fcsubtype;
25 int fc_wep; 29 int fc_wep;
26 int cap_WEP; 30 int cap_WEP;