author | max <max> | 2003-02-07 17:17:35 (UTC) |
---|---|---|
committer | max <max> | 2003-02-07 17:17:35 (UTC) |
commit | 014608882b23343473c5d0e7dca3ea09cf02dcfb (patch) (unidiff) | |
tree | 90eac99cbb0faca581cc9b5cc37a9fd460548050 /noncore | |
parent | a14c5974339f5beef433754d52c952cb99834619 (diff) | |
download | opie-014608882b23343473c5d0e7dca3ea09cf02dcfb.zip opie-014608882b23343473c5d0e7dca3ea09cf02dcfb.tar.gz opie-014608882b23343473c5d0e7dca3ea09cf02dcfb.tar.bz2 |
Chanswitch
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.cc | 24 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.hh | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc | 9 |
3 files changed, 24 insertions, 10 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc index d6e8f6b..b57e6a0 100644 --- a/noncore/net/wellenreiter/daemon/source/daemon.cc +++ b/noncore/net/wellenreiter/daemon/source/daemon.cc | |||
@@ -1,63 +1,71 @@ | |||
1 | /* | 1 | /* |
2 | * Startup functions of wellenreiter | 2 | * Startup functions of wellenreiter |
3 | * | 3 | * |
4 | * $Id$ | 4 | * $Id$ |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include "config.hh" | 7 | #include "config.hh" |
8 | #include "daemon.hh" | 8 | #include "daemon.hh" |
9 | 9 | ||
10 | // temporary solution, will be removed soon | 10 | // temporary solution, will be removed soon |
11 | #define MAXCHANNEL 13 | 11 | #define MAXCHANNEL 13 |
12 | int card_type; | ||
12 | char sniffer_device[6]; | 13 | char sniffer_device[6]; |
13 | int channel=0; | 14 | int channel=0; |
14 | int timedout=1; | 15 | int timedout=1; |
15 | 16 | ||
16 | static int chanswitch() | 17 | void chanswitch(int blah) |
17 | { | 18 | { |
18 | if(channel >= MAXCHANNEL) | 19 | if(channel >= MAXCHANNEL) |
19 | channel=1 | 20 | { |
21 | channel=1; | ||
22 | } | ||
23 | else | ||
24 | { | ||
25 | channel++; | ||
26 | } | ||
20 | card_set_channel(sniffer_device, channel, card_type); | 27 | card_set_channel(sniffer_device, channel, card_type); |
21 | timedout=0; | 28 | timedout=0; |
29 | alarm(1); | ||
22 | } | 30 | } |
23 | 31 | ||
24 | /* Main function of wellenreiterd */ | 32 | /* Main function of wellenreiterd */ |
25 | int main(int argc, char **argv) | 33 | int main(int argc, char **argv) |
26 | { | 34 | { |
27 | int sock, maxfd, retval, card_type; | 35 | int sock, maxfd, retval; |
28 | char buffer[WL_SOCKBUF]; | 36 | char buffer[WL_SOCKBUF]; |
29 | struct pcap_pkthdr header; | 37 | struct pcap_pkthdr header; |
30 | struct sockaddr_in saddr; | 38 | struct sockaddr_in saddr; |
31 | pcap_t *handletopcap; | 39 | pcap_t *handletopcap; |
32 | const unsigned char *packet; | 40 | const unsigned char *packet; |
33 | 41 | ||
34 | fd_set rset; | 42 | fd_set rset; |
35 | 43 | ||
36 | fprintf(stderr, "wellenreiterd %s\n\n", VERSION); | 44 | fprintf(stderr, "wellenreiterd %s\n\n", VERSION); |
37 | fprintf(stderr, "(c) 2002 by M-M-M\n\n"); | 45 | fprintf(stderr, "(c) 2002 by M-M-M\n\n"); |
38 | 46 | ||
39 | if(argc < 3) | 47 | if(argc < 3) |
40 | usage(); | 48 | usage(); |
41 | 49 | ||
42 | // removed soon, see above | 50 | // removed soon, see above |
43 | SIGNAL(SIGALRM, chanswitch); | 51 | signal(SIGALRM, chanswitch); |
44 | 52 | alarm(1); | |
45 | /* Set sniffer device */ | 53 | /* Set sniffer device */ |
46 | memset(sniffer_device, 0, sizeof(sniffer_device)); | 54 | memset(sniffer_device, 0, sizeof(sniffer_device)); |
47 | strncpy(sniffer_device, (char *)argv[1], sizeof(sniffer_device) - 1); | 55 | strncpy(sniffer_device, (char *)argv[1], sizeof(sniffer_device) - 1); |
48 | 56 | ||
49 | /* Set card type */ | 57 | /* Set card type */ |
50 | card_type = atoi(argv[2]); | 58 | card_type = atoi(argv[2]); |
51 | if(card_type < 1 || card_type > 3) | 59 | if(card_type < 1 || card_type > 4) |
52 | usage(); | 60 | usage(); |
53 | 61 | ||
54 | if(!card_into_monitormode(&handletopcap, sniffer_device, card_type)) | 62 | if(!card_into_monitormode(&handletopcap, sniffer_device, card_type)) |
55 | { | 63 | { |
56 | wl_logerr("Cannot initialize the wireless-card, aborting"); | 64 | wl_logerr("Cannot initialize the wireless-card, aborting"); |
57 | exit(-1); | 65 | exit(-1); |
58 | } | 66 | } |
59 | wl_loginfo("Set card into monitor mode"); | 67 | wl_loginfo("Set card into monitor mode"); |
60 | 68 | ||
61 | /////// following line will be moved to lib as soon as possible //////////// | 69 | /////// following line will be moved to lib as soon as possible //////////// |
62 | if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL) | 70 | if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL) |
63 | { | 71 | { |
@@ -82,25 +90,24 @@ int main(int argc, char **argv) | |||
82 | FD_ZERO(&rset); | 90 | FD_ZERO(&rset); |
83 | 91 | ||
84 | /* Start main loop */ | 92 | /* Start main loop */ |
85 | wl_loginfo("Starting main loop"); | 93 | wl_loginfo("Starting main loop"); |
86 | while(1) | 94 | while(1) |
87 | { | 95 | { |
88 | 96 | ||
89 | FD_SET(sock, &rset); | 97 | FD_SET(sock, &rset); |
90 | FD_SET(pcap_fileno(handletopcap), &rset); | 98 | FD_SET(pcap_fileno(handletopcap), &rset); |
91 | 99 | ||
92 | // blah | 100 | // blah |
93 | timedout=1; | 101 | timedout=1; |
94 | alarm(1); | ||
95 | 102 | ||
96 | /* socket or pcap handle bigger? Will be cleaned up, have to check pcap */ | 103 | /* socket or pcap handle bigger? Will be cleaned up, have to check pcap */ |
97 | maxfd = (sock > pcap_fileno(handletopcap) ? sock : pcap_fileno(handletopcap)) + 1; | 104 | maxfd = (sock > pcap_fileno(handletopcap) ? sock : pcap_fileno(handletopcap)) + 1; |
98 | 105 | ||
99 | if(select(maxfd, &rset, NULL, NULL, NULL) < 0 && timedout) | 106 | if(select(maxfd, &rset, NULL, NULL, NULL) < 0 && timedout) |
100 | { | 107 | { |
101 | wl_logerr("Error calling select: %s", strerror(errno)); | 108 | wl_logerr("Error calling select: %s", strerror(errno)); |
102 | break; | 109 | break; |
103 | } | 110 | } |
104 | 111 | ||
105 | /* Got data on local socket from GUI */ | 112 | /* Got data on local socket from GUI */ |
106 | if(FD_ISSET(sock, &rset)) | 113 | if(FD_ISSET(sock, &rset)) |
@@ -143,15 +150,16 @@ int main(int argc, char **argv) | |||
143 | } /* while(1) */ | 150 | } /* while(1) */ |
144 | 151 | ||
145 | close(sock); | 152 | close(sock); |
146 | exit(0); | 153 | exit(0); |
147 | } | 154 | } |
148 | 155 | ||
149 | void usage(void) | 156 | void usage(void) |
150 | { | 157 | { |
151 | fprintf(stderr, "Usage: wellenreiter <device> <cardtype>\n" \ | 158 | fprintf(stderr, "Usage: wellenreiter <device> <cardtype>\n" \ |
152 | "\t<device> = Wirelessdevice (e.g. wlan0)\n" \ | 159 | "\t<device> = Wirelessdevice (e.g. wlan0)\n" \ |
153 | "\t<cardtype> = Cardtype:\t Cisco\t= 1\n" \ | 160 | "\t<cardtype> = Cardtype:\t Cisco\t= 1\n" \ |
154 | "\t\t\t\tNG\t= 2\n" \ | 161 | "\t\t\t\tNG\t= 2\n" \ |
155 | "\t\t\t\tHOSTAP\t= 3\n"); | 162 | "\t\t\t\tHOSTAP\t= 3\n" \ |
163 | "\t\t\t\tLUCENT\t= 4\n"); | ||
156 | exit(-1); | 164 | exit(-1); |
157 | } | 165 | } |
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.hh b/noncore/net/wellenreiter/daemon/source/daemon.hh index 1cc3c7c..d50487a 100644 --- a/noncore/net/wellenreiter/daemon/source/daemon.hh +++ b/noncore/net/wellenreiter/daemon/source/daemon.hh | |||
@@ -3,23 +3,24 @@ | |||
3 | #ifndef DAEMON_HH | 3 | #ifndef DAEMON_HH |
4 | #define DAEMON_HH | 4 | #define DAEMON_HH |
5 | 5 | ||
6 | #include <stdio.h> | 6 | #include <stdio.h> |
7 | #include <string.h> | 7 | #include <string.h> |
8 | #include <sys/types.h> | 8 | #include <sys/types.h> |
9 | #include <sys/time.h> | 9 | #include <sys/time.h> |
10 | #include <sys/socket.h> | 10 | #include <sys/socket.h> |
11 | #include <netinet/in.h> | 11 | #include <netinet/in.h> |
12 | #include <arpa/inet.h> | 12 | #include <arpa/inet.h> |
13 | #include <unistd.h> | 13 | #include <unistd.h> |
14 | #include <errno.h> | 14 | #include <errno.h> |
15 | #include <signal.h> | ||
15 | 16 | ||
16 | #include <libwellenreiter/source/wl_sock.hh> | 17 | #include <libwellenreiter/source/wl_sock.hh> |
17 | #include <libwellenreiter/source/wl_log.hh> | 18 | #include <libwellenreiter/source/wl_log.hh> |
18 | #include <libwellenreiter/source/wl_types.hh> | 19 | #include <libwellenreiter/source/wl_types.hh> |
19 | #include <libwellenreiter/source/wl_proto.hh> | 20 | #include <libwellenreiter/source/wl_proto.hh> |
20 | #include <libwellenreiter/source/cardmode.hh> | 21 | #include <libwellenreiter/source/cardmode.hh> |
21 | #include <libwellenreiter/source/sniff.hh> | 22 | #include <libwellenreiter/source/sniff.hh> |
22 | 23 | ||
23 | void usage(void); | 24 | void usage(void); |
24 | 25 | ||
25 | #endif /* DAEMON_HH */ | 26 | #endif /* DAEMON_HH */ |
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc index 697d182..0c23922 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc | |||
@@ -64,24 +64,28 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) | |||
64 | return 0; | 64 | return 0; |
65 | } | 65 | } |
66 | } | 66 | } |
67 | else if (cardtype == CARD_TYPE_ORINOCCO) | 67 | else if (cardtype == CARD_TYPE_ORINOCCO) |
68 | { | 68 | { |
69 | char lucentcmd[62]; | 69 | char lucentcmd[62]; |
70 | snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, 1); | 70 | snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, 1); |
71 | if (system(lucentcmd) != 0) | 71 | if (system(lucentcmd) != 0) |
72 | { | 72 | { |
73 | wl_logerr("Could not set %s in raw mode, check cardtype", device); | 73 | wl_logerr("Could not set %s in raw mode, check cardtype", device); |
74 | return 0; | 74 | return 0; |
75 | } | 75 | } |
76 | else | ||
77 | { | ||
78 | wl_loginfo("Successfully set %s into raw mode",device); | ||
79 | } | ||
76 | } | 80 | } |
77 | 81 | ||
78 | /* Setting the promiscous and up flag to the interface */ | 82 | /* Setting the promiscous and up flag to the interface */ |
79 | if (!card_check_rfmon_datalink(device)) | 83 | if (!card_check_rfmon_datalink(device)) |
80 | { | 84 | { |
81 | wl_logerr("Cannot set interface to rfmon mode"); | 85 | wl_logerr("Cannot set interface to rfmon mode"); |
82 | return 0; | 86 | return 0; |
83 | } | 87 | } |
84 | else | 88 | else |
85 | { | 89 | { |
86 | wl_loginfo("Interface set to rfmon mode"); | 90 | wl_loginfo("Interface set to rfmon mode"); |
87 | } | 91 | } |
@@ -147,41 +151,42 @@ int card_set_promisc_up (const char *device) | |||
147 | return 1; | 151 | return 1; |
148 | } | 152 | } |
149 | else | 153 | else |
150 | { | 154 | { |
151 | printf("%s flags could not be set", device); | 155 | printf("%s flags could not be set", device); |
152 | return 0; | 156 | return 0; |
153 | } | 157 | } |
154 | } | 158 | } |
155 | 159 | ||
156 | /* Set channel (Wireless frequency) of the device */ | 160 | /* Set channel (Wireless frequency) of the device */ |
157 | int card_set_channel (const char *device, int channel, int cardtype) | 161 | int card_set_channel (const char *device, int channel, int cardtype) |
158 | { | 162 | { |
159 | |||
160 | if (cardtype == CARD_TYPE_CISCO) | 163 | if (cardtype == CARD_TYPE_CISCO) |
161 | { | 164 | { |
162 | /* Cisco cards don't need channelswitching */ | 165 | /* Cisco cards don't need channelswitching */ |
163 | return 1; | 166 | return 1; |
164 | } | 167 | } |
165 | /* If it is a lucent orinocco card */ | 168 | /* If it is a lucent orinocco card */ |
166 | else if (cardtype == CARD_TYPE_ORINOCCO) | 169 | else if (cardtype == CARD_TYPE_ORINOCCO) |
167 | { | 170 | { |
168 | char lucentreset[63]; | 171 | char lucentreset[63]; |
169 | char lucentcmd[62]; | 172 | char lucentcmd[62]; |
170 | snprintf(lucentreset, sizeof(lucentreset) -1,"$(which iwpriv) %s card_reset", device); | 173 | snprintf(lucentreset, sizeof(lucentreset) -1,"$(which iwpriv) %s force_reset", device); |
171 | if (system(lucentreset) != 0) | 174 | if (system(lucentreset) != 0) |
172 | { | 175 | { |
173 | wl_logerr("Could not reset the card %s",device); | 176 | wl_logerr("Could not reset the card %s",device); |
174 | return 0; | 177 | return 0; |
175 | } | 178 | } |
176 | snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, channel); | 179 | snprintf(lucentcmd, sizeof(lucentcmd) - 1, "$(which iwpriv) %s monitor 2 %d", device, channel); |
177 | if (system(lucentcmd) != 0) | 180 | if (system(lucentcmd) != 0) |
178 | { | 181 | { |
179 | wl_logerr("Could not set %s in raw mode, check cardtype", device); | 182 | wl_logerr("Could not set %s in raw mode, check cardtype", device); |
180 | return 0; | 183 | return 0; |
181 | } | 184 | } |
185 | wl_loginfo("Channel %d set on interface %s",channel,device); | ||
186 | return 1; | ||
182 | } | 187 | } |
183 | 188 | ||
184 | /* For undefined situations */ | 189 | /* For undefined situations */ |
185 | return 0; | 190 | return 0; |
186 | } | 191 | } |
187 | 192 | ||