summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc2
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc74
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh9
3 files changed, 53 insertions, 32 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index 8471efc..46a50ed 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -9,7 +9,7 @@
9 9
10/* should be parsed from cfg-file */ 10/* should be parsed from cfg-file */
11#define MAXCHANNEL 13 11#define MAXCHANNEL 13
12#define CHANINTERVAL 700000 12#define CHANINTERVAL 500000
13 13
14/* Main function of wellenreiterd */ 14/* Main function of wellenreiterd */
15int main(int argc, char **argv) 15int main(int argc, char **argv)
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index 0c23922..9e0a772 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -46,7 +46,7 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
46 else if (cardtype == CARD_TYPE_NG) 46 else if (cardtype == CARD_TYPE_NG)
47 { 47 {
48 char wlanngcmd[62]; 48 char wlanngcmd[62];
49 snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "%s %s lnxreq_wlansniff channel=1 enable=true", WLANCTL_PATH, device); 49 snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, 1);
50 if (system(wlanngcmd) != 0) 50 if (system(wlanngcmd) != 0)
51 { 51 {
52 wl_logerr("Could not set %s in raw mode, check cardtype", device); 52 wl_logerr("Could not set %s in raw mode, check cardtype", device);
@@ -57,25 +57,23 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
57 { 57 {
58 wl_logerr("Got a host-ap card, nothing is implemented now"); 58 wl_logerr("Got a host-ap card, nothing is implemented now");
59 char hostapcmd[250]; 59 char hostapcmd[250];
60 snprintf(hostapcmd, sizeof(hostapcmd) -1, "%s %s monitor 2", IWPRIV_PATH, device); 60 snprintf(hostapcmd, sizeof(hostapcmd) -1, "$(which iwpriv) %s monitor 2 %d", device,1);
61 if (system(hostapcmd) !=0) 61 if (system(hostapcmd) !=0)
62 { 62 {
63 wl_logerr("Could not set %s in raw mode, check cardtype", device); 63 wl_logerr("Could not set %s in raw mode, check cardtype", device);
64 return 0; 64 return 0;
65 } 65 }
66 } 66 }
67 else if (cardtype == CARD_TYPE_ORINOCCO) 67 else if (cardtype == CARD_TYPE_ORINOCCO || cardtype == CARD_TYPE_HOSTAP)
68 { 68 {
69 char lucentcmd[62]; 69 if (!card_set_channel (device, 1, CARD_TYPE_ORINOCCO))
70 snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, 1); 70 {
71 if (system(lucentcmd) != 0) 71 wl_logerr("Could not set %s in raw mode, check cardtype", device);
72 { 72 return 0;
73 wl_logerr("Could not set %s in raw mode, check cardtype", device);
74 return 0;
75 } 73 }
76 else 74 else
77 { 75 {
78 wl_loginfo("Successfully set %s into raw mode",device); 76 wl_loginfo("Successfully set %s into raw mode",device);
79 } 77 }
80 } 78 }
81 79
@@ -166,26 +164,46 @@ int card_set_channel (const char *device, int channel, int cardtype)
166 return 1; 164 return 1;
167 } 165 }
168 /* If it is a lucent orinocco card */ 166 /* If it is a lucent orinocco card */
169 else if (cardtype == CARD_TYPE_ORINOCCO) 167 else if (cardtype == CARD_TYPE_ORINOCCO || cardtype == CARD_TYPE_HOSTAP)
170 { 168 {
171 char lucentreset[63]; 169 int fd;
172 char lucentcmd[62]; 170 //Wireless tools structure for the iocalls
173 snprintf(lucentreset, sizeof(lucentreset) -1,"$(which iwpriv) %s force_reset", device); 171 struct iwreq ireq;
174 if (system(lucentreset) != 0) 172 int *ptr;
175 { 173 /* Socket needed to use the iocall to */
176 wl_logerr("Could not reset the card %s",device); 174 fd = socket(AF_INET, SOCK_STREAM, 0);
177 return 0; 175 if ( fd == -1 ) {
178 } 176 return -1;
179 snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, channel); 177 }
180 if (system(lucentcmd) != 0) 178 ptr = (int *) ireq.u.name;
181 { 179 // This is the monitor mode for 802.11 non-prism header
182 wl_logerr("Could not set %s in raw mode, check cardtype", device); 180 ptr[0] = 2;
183 return 0; 181 ptr[1] = channel;
184 } 182 strcpy(ireq.ifr_ifrn.ifrn_name, device);
185 wl_loginfo("Channel %d set on interface %s",channel,device); 183 if (ioctl( fd, SIOCIWFIRSTPRIV + 0x8, &ireq)==0)
186 return 1; 184 {
185 /* All was fine... */
186 // close(fd);
187 wl_loginfo("Set channel %d on interface %s",channel, device);
188 return 1;
189 }
190 else
191 { /* iocall does not work */
192 wl_logerr("Could not set channel %d on %s, check cardtype",channel, device);
193 return 0;
194 }
187 } 195 }
188 196 else if (cardtype == CARD_TYPE_NG)
197 {
198 char wlanngcmd[62];
199 snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=true", device, channel);
200 if (system(wlanngcmd) != 0)
201 {
202 wl_logerr("Could not set channel %d on %s, check cardtype",channel, device);
203 return 0;
204 }
205
206 }
189 /* For undefined situations */ 207 /* For undefined situations */
190 return 0; 208 return 0;
191} 209}
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index 3a1991b..242d8c5 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -13,6 +13,12 @@
13#include <arpa/inet.h> 13#include <arpa/inet.h>
14#include <sys/ioctl.h> 14#include <sys/ioctl.h>
15#include <linux/if.h> 15#include <linux/if.h>
16#include <linux/wireless.h>
17
18#ifndef SIOCIWFIRSTPRIV
19#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
20#endif
21
16 22
17extern "C" 23extern "C"
18{ 24{
@@ -31,9 +37,6 @@ extern "C"
31/* only for now, until we have the daemon running */ 37/* only for now, until we have the daemon running */
32/*the config file should provide these information */ 38/*the config file should provide these information */
33#define CARD_TYPE CARD_TYPE_HOSTAP 39#define CARD_TYPE CARD_TYPE_HOSTAP
34 #define SBIN_PATH "/sbin/ifconfig %s promisc up"
35#define WLANCTL_PATH "/sbin/wlanctl-ng"
36 #define IWPRIV_PATH "/sbin/iwpriv"
37 40
38/* Prototypes */ 41/* Prototypes */
39int card_check_rfmon_datalink (char *device); 42int card_check_rfmon_datalink (char *device);