summaryrefslogtreecommitdiff
authormjm <mjm>2002-12-14 19:13:32 (UTC)
committer mjm <mjm>2002-12-14 19:13:32 (UTC)
commitd9d4e587e62eac418b892c90145e958d6495d081 (patch) (unidiff)
tree6a554548d6dfaaa082f4b088f8912f4c5fc7e528
parent57918323f3b2e1377d9cf97ed6466e31b260d24a (diff)
downloadopie-d9d4e587e62eac418b892c90145e958d6495d081.zip
opie-d9d4e587e62eac418b892c90145e958d6495d081.tar.gz
opie-d9d4e587e62eac418b892c90145e958d6495d081.tar.bz2
code cleanup, possible bug in sniff.cc fixed
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc1
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh2
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/proto.cc9
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/sniff.cc17
4 files changed, 11 insertions, 18 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index a1c3945..3aaa4a7 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -1,31 +1,32 @@
1/* 1/*
2 * Set card modes for sniffing 2 * Set card modes for sniffing
3 * 3 *
4 * $Id$ 4 * $Id$
5 */ 5 */
6 6
7#include "cardmode.hh" 7#include "cardmode.hh"
8#include "log.hh"
8 9
9/* main card into monitor function */ 10/* main card into monitor function */
10int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) 11int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
11{ 12{
12 char CiscoRFMON[35] = "/proc/driver/aironet/"; 13 char CiscoRFMON[35] = "/proc/driver/aironet/";
13 FILE *CISCO_CONFIG_FILE; 14 FILE *CISCO_CONFIG_FILE;
14 pcap_t *handle = (pcap_t*)orighandle; 15 pcap_t *handle = (pcap_t*)orighandle;
15 16
16 /* Checks if we have a device to sniff on */ 17 /* Checks if we have a device to sniff on */
17 if(device == NULL) 18 if(device == NULL)
18 { 19 {
19 wl_logerr("No device given"); 20 wl_logerr("No device given");
20 return 0; 21 return 0;
21 } 22 }
22 23
23 /* Setting the prmiscous and up flag to the interface */ 24 /* Setting the prmiscous and up flag to the interface */
24 if (!card_set_promisc_up(device)) 25 if (!card_set_promisc_up(device))
25 { 26 {
26 wl_logerr("Cannot set interface to promisc mode: %s", strerror(errno)); 27 wl_logerr("Cannot set interface to promisc mode: %s", strerror(errno));
27 return 0; 28 return 0;
28 } 29 }
29 wl_loginfo("Interface set to promisc mode"); 30 wl_loginfo("Interface set to promisc mode");
30 31
31 /* Check the cardtype and executes the commands to go into monitor mode */ 32 /* Check the cardtype and executes the commands to go into monitor mode */
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index fad74cf..7c6a21d 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -1,37 +1,35 @@
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 <errno.h> 8#include <errno.h>
9#include <sys/socket.h> 9#include <sys/socket.h>
10#include <netinet/in.h> 10#include <netinet/in.h>
11#include <arpa/inet.h> 11#include <arpa/inet.h>
12 12
13extern "C" 13extern "C"
14{ 14{
15#include <net/bpf.h> 15#include <net/bpf.h>
16#include <pcap.h> 16#include <pcap.h>
17} 17}
18 18
19#include "../../libwellenreiter/source/log.hh"
20
21/* Defines, used for the card setup */ 19/* Defines, used for the card setup */
22#define DEFAULT_PATH "/proc/driver/aironet/%s/Config" 20#define DEFAULT_PATH "/proc/driver/aironet/%s/Config"
23 #define CARD_TYPE_CISCO1 21 #define CARD_TYPE_CISCO1
24 #define CARD_TYPE_NG 2 22 #define CARD_TYPE_NG 2
25 #define CARD_TYPE_HOSTAP3 23 #define CARD_TYPE_HOSTAP3
26 24
27/* only for now, until we have the daemon running */ 25/* only for now, until we have the daemon running */
28/*the config file should provide these information */ 26/*the config file should provide these information */
29#define CARD_TYPE CARD_TYPE_HOSTAP 27#define CARD_TYPE CARD_TYPE_HOSTAP
30 #define SBIN_PATH "/sbin/ifconfig %s promisc up" 28 #define SBIN_PATH "/sbin/ifconfig %s promisc up"
31#define WLANCTL_PATH "/sbin/wlanctl-ng" 29#define WLANCTL_PATH "/sbin/wlanctl-ng"
32 30
33/* Prototypes */ 31/* Prototypes */
34int card_into_monitormode (pcap_t **, char *, int); 32int card_into_monitormode (pcap_t **, char *, int);
35int card_set_promisc_up (const char *); 33int card_set_promisc_up (const char *);
36 34
37#endif /* CARDMODE_HH */ 35#endif /* CARDMODE_HH */
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/proto.cc
index 305f401..2ec23f4 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/proto.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/proto.cc
@@ -35,57 +35,56 @@ int send_network_found (const char *guihost, int guiport, void *structure)
35 snprintf(temp, 3, "%d", ptr->channel); 35 snprintf(temp, 3, "%d", ptr->channel);
36 36
37 memcpy(buffer + 3, temp, 2); 37 memcpy(buffer + 3, temp, 2);
38 38
39 /* Set WEP y/n */ 39 /* Set WEP y/n */
40 memset(temp, 0, sizeof(temp)); 40 memset(temp, 0, sizeof(temp));
41 snprintf(temp, 2, "%d", ptr->wep); 41 snprintf(temp, 2, "%d", ptr->wep);
42 memcpy(buffer + 5, temp, 1); 42 memcpy(buffer + 5, temp, 1);
43 43
44 /* Set MAC address */ 44 /* Set MAC address */
45 memcpy(buffer + 6, ptr->mac, 17); 45 memcpy(buffer + 6, ptr->mac, 17);
46 46
47 /* Set lenght of ssid */ 47 /* Set lenght of ssid */
48 memset(temp, 0, sizeof(temp)); 48 memset(temp, 0, sizeof(temp));
49 49
50 if(ptr->ssid_len > 99) 50 if(ptr->ssid_len > 99)
51 snprintf(temp, 4, "%d", ptr->ssid_len); 51 snprintf(temp, 4, "%d", ptr->ssid_len);
52 else if(ptr->ssid_len < 10) 52 else if(ptr->ssid_len < 10)
53 snprintf(temp, 4, "00%d", ptr->ssid_len); 53 snprintf(temp, 4, "00%d", ptr->ssid_len);
54 else 54 else
55 snprintf(temp, 4, "0%d", ptr->ssid_len); 55 snprintf(temp, 4, "0%d", ptr->ssid_len);
56 56
57 memcpy(buffer + 23, temp, 3); 57 memcpy(buffer + 23, temp, 3);
58 58
59 fprintf( stderr, "Temp is %s\n", temp );
60 fprintf( stderr, "ssid_len is %d\n", ptr->ssid_len );
61
62 /* Set ssid */ 59 /* Set ssid */
63 memcpy(buffer + 26, ptr->bssid, ptr->ssid_len); 60 memcpy(buffer + 26, ptr->bssid, ptr->ssid_len);
64 61
65 fprintf( stderr, "Buffer is %s\n", buffer );
66
67 /* Send prepared buffer to GUI */ 62 /* Send prepared buffer to GUI */
63#ifdef DEBUG
64 wl_loginfo("Sending network to GUI: '%s'", buffer);
65#endif
66
68 sendcomm(guihost, guiport, buffer); 67 sendcomm(guihost, guiport, buffer);
69 68
70 return 1; 69 return 1;
71} 70}
72 71
73/* Fill buffer into structur */ 72/* Fill buffer into structur */
74int get_network_found (void *structure, const char *buffer) 73int get_network_found (void *structure, const char *buffer)
75{ 74{
76 wl_network_t *ptr; 75 wl_network_t *ptr;
77 char temp[512]; 76 char temp[512];
78 77
79 ptr = (wl_network_t *)structure; 78 ptr = (wl_network_t *)structure;
80 79
81 /* Get net type */ 80 /* Get net type */
82 memset(temp, 0, sizeof(temp)); 81 memset(temp, 0, sizeof(temp));
83 memcpy(temp, buffer + 2, 1); 82 memcpy(temp, buffer + 2, 1);
84 ptr->net_type = atoi(temp); 83 ptr->net_type = atoi(temp);
85 84
86 /* Get channel */ 85 /* Get channel */
87 memset(temp, 0, sizeof(temp)); 86 memset(temp, 0, sizeof(temp));
88 memcpy(temp, buffer + 3, 2); 87 memcpy(temp, buffer + 3, 2);
89 ptr->channel = atoi(temp); 88 ptr->channel = atoi(temp);
90 89
91 /* Set WEP y/n */ 90 /* Set WEP y/n */
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
index 84caf12..c703052 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
@@ -73,88 +73,83 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack
73 { 73 {
74 if (!strcmp(pinfoptr->desthwaddr,"ff:ff:ff:ff:ff:ff") == 0) 74 if (!strcmp(pinfoptr->desthwaddr,"ff:ff:ff:ff:ff:ff") == 0)
75 { 75 {
76 /* Every beacon must have the broadcast as destination 76 /* Every beacon must have the broadcast as destination
77 so it must be a shitti packet */ 77 so it must be a shitti packet */
78 pinfoptr->isvalid = 0; 78 pinfoptr->isvalid = 0;
79 return; 79 return;
80 } 80 }
81 81
82 if (pinfoptr->cap_ESS == pinfoptr->cap_IBSS) 82 if (pinfoptr->cap_ESS == pinfoptr->cap_IBSS)
83 { 83 {
84 /* Only one of both are possible, so must be 84 /* Only one of both are possible, so must be
85 a noise packet, if this comes up */ 85 a noise packet, if this comes up */
86 pinfoptr->isvalid = 0; 86 pinfoptr->isvalid = 0;
87 return; 87 return;
88 } 88 }
89 if (pinfoptr->channel < 1 || pinfoptr->channel > 14) 89 if (pinfoptr->channel < 1 || pinfoptr->channel > 14)
90 { 90 {
91 /* Only channels between 1 and 14 are possible 91 /* Only channels between 1 and 14 are possible
92 others must be noise packets */ 92 others must be noise packets */
93 pinfoptr->isvalid = 0; 93 pinfoptr->isvalid = 0;
94 return; 94 return;
95 } 95 }
96 96
97 printf( "cap_ESS is %d, cap_IBSS is %d\n", pinfoptr->cap_ESS, pinfoptr->cap_IBSS );
98
99 /* Here should be the infos to the gui issued */ 97 /* Here should be the infos to the gui issued */
100 if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0) 98 if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0)
101 { 99 {
102 wl_loginfo("Found an access point"); 100 wl_loginfo("Found an access point");
103 wl_net.net_type=1; 101 wl_net.net_type=1;
104 } 102 }
105 else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 2) 103 else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 2)
106 { 104 {
107 wl_loginfo("Found an ad-hoc network"); 105 wl_loginfo("Found an ad-hoc network");
108 wl_net.net_type=2; 106 wl_net.net_type=2;
109 } 107 }
108
110 if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0) 109 if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0)
111 {
112 wl_loginfo("Net is a non-broadcasting network"); 110 wl_loginfo("Net is a non-broadcasting network");
113 }
114 else 111 else
115 {
116 wl_loginfo("SSID is: %s", pinfoptr->ssid); 112 wl_loginfo("SSID is: %s", pinfoptr->ssid);
117 // wl_net.bssid=pinfoptr->ssid; 113
118 } 114 wl_loginfo("SSID is: %s", pinfoptr->ssid);
115 memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1);
119 116
120 wl_loginfo("SSID length is: %d", pinfoptr->ssid_len); 117 wl_loginfo("SSID length is: %d", pinfoptr->ssid_len);
121 wl_net.ssid_len=pinfoptr->ssid_len; 118 wl_net.ssid_len=pinfoptr->ssid_len;
122 119
123 wl_loginfo("Channel is: %d", pinfoptr->channel); 120 wl_loginfo("Channel is: %d", pinfoptr->channel);
124 wl_net.channel=pinfoptr->channel; 121 wl_net.channel=pinfoptr->channel;
125 wl_net.wep=pinfoptr->cap_WEP; 122 wl_net.wep=pinfoptr->cap_WEP;
126 123
127 wl_loginfo("Mac is: %s", pinfoptr->sndhwaddr); 124 wl_loginfo("Mac is: %s", pinfoptr->sndhwaddr);
128 memcpy(wl_net.mac, pinfoptr->sndhwaddr, sizeof(wl_net.mac)-1);; 125 memcpy(wl_net.mac, pinfoptr->sndhwaddr, sizeof(wl_net.mac)-1);;
129 wl_loginfo("SSID is: %s", pinfoptr->ssid); 126
130 memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1);
131
132 // printf ("\n\tDest : %s\n",pinfoptr->desthwaddr);
133 send_network_found((char *)guihost, guiport, &wl_net); 127 send_network_found((char *)guihost, guiport, &wl_net);
134 wl_loginfo("Sent network to GUI '%s:%d'", guihost, guiport); 128 wl_loginfo("Sent network to GUI '%s:%d'", guihost, guiport);
135 } 129 }
136 break; 130 break;
131
137 default: 132 default:
138 wl_logerr("Unknown IEEE802.11 frame subtype (%d)", FC_SUBTYPE(fc)); 133 wl_logerr("Unknown IEEE802.11 frame subtype (%d)", FC_SUBTYPE(fc));
139 break; 134 break;
140 } /* End of switch over different mgt frame types */ 135 } /* End of switch over different mgt frame types */
141 136
142 break; 137 break;
143 138
144 case T_CTRL: 139 case T_CTRL:
145 wl_loginfo("Received control frame, not implemented yet"); 140 wl_loginfo("Received control frame, not implemented yet");
146 break; 141 break;
147 142
148 case T_DATA: 143 case T_DATA:
149 wl_loginfo("Received date frame, not implemented yet"); 144 wl_loginfo("Received date frame, not implemented yet");
150 break; 145 break;
151 146
152 default: 147 default:
153 wl_logerr("Unknown IEEE802.11 frame type (%d)", FC_TYPE(fc)); 148 wl_logerr("Unknown IEEE802.11 frame type (%d)", FC_TYPE(fc));
154 break; 149 break;
155 } 150 }
156} 151}
157 152
158/* This decodes the 802.11b frame header out of the 802.11b packet 153/* This decodes the 802.11b frame header out of the 802.11b packet
159 all the infos is placed into the packetinfo structure */ 154 all the infos is placed into the packetinfo structure */
160int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo) 155int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo)