summaryrefslogtreecommitdiff
authormjm <mjm>2003-02-09 15:48:34 (UTC)
committer mjm <mjm>2003-02-09 15:48:34 (UTC)
commitcc96fbb10eaeef5796f62ac26635b1b6ff42145b (patch) (side-by-side diff)
tree75b51de32c68edc3e4f0c8cc0e81f0952b91027f
parentcade16aa686978486acab98bc98602ede356ac09 (diff)
downloadopie-cc96fbb10eaeef5796f62ac26635b1b6ff42145b.zip
opie-cc96fbb10eaeef5796f62ac26635b1b6ff42145b.tar.gz
opie-cc96fbb10eaeef5796f62ac26635b1b6ff42145b.tar.bz2
implemented new timer function, threaded
added wl_cardtype_t
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc109
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.hh3
2 files changed, 69 insertions, 43 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index b57e6a0..4407436 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -9,23 +9,5 @@
-// temporary solution, will be removed soon
+/* should be parsed from cfg-file */
#define MAXCHANNEL 13
-int card_type;
-char sniffer_device[6];
-int channel=0;
-int timedout=1;
-
-void chanswitch(int blah)
-{
- if(channel >= MAXCHANNEL)
- {
- channel=1;
- }
- else
- {
- channel++;
- }
- card_set_channel(sniffer_device, channel, card_type);
- timedout=0;
- alarm(1);
-}
+#define CHANINTERVAL 100000
@@ -39,2 +21,4 @@ int main(int argc, char **argv)
pcap_t *handletopcap;
+ wl_cardtype_t cardtype;
+ pthread_t sub;
const unsigned char *packet;
@@ -49,18 +33,15 @@ int main(int argc, char **argv)
- // removed soon, see above
- signal(SIGALRM, chanswitch);
- alarm(1);
/* Set sniffer device */
- memset(sniffer_device, 0, sizeof(sniffer_device));
- strncpy(sniffer_device, (char *)argv[1], sizeof(sniffer_device) - 1);
+ memset(cardtype.iface, 0, sizeof(cardtype.iface));
+ strncpy(cardtype.iface, (char *)argv[1], sizeof(cardtype.iface) - 1);
/* Set card type */
- card_type = atoi(argv[2]);
- if(card_type < 1 || card_type > 4)
+ cardtype.type = atoi(argv[2]);
+ if(cardtype.type < 1 || cardtype.type > 4)
usage();
- if(!card_into_monitormode(&handletopcap, sniffer_device, card_type))
+ if(!card_into_monitormode(&handletopcap, cardtype.iface, cardtype.type))
{
wl_logerr("Cannot initialize the wireless-card, aborting");
- exit(-1);
+ exit(EXIT_FAILURE);
}
@@ -68,7 +49,8 @@ int main(int argc, char **argv)
+
/////// following line will be moved to lib as soon as possible ////////////
- if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL)
+ if((handletopcap = pcap_open_live(cardtype.iface, BUFSIZ, 1, 0, NULL)) == NULL)
{
wl_logerr("pcap_open_live() failed: %s", strerror(errno));
- exit(-1);
+ exit(EXIT_FAILURE);
}
@@ -78,5 +60,5 @@ int main(int argc, char **argv)
#endif
-
- ////////////////////////////////////////
+ ////////////////////////////////////////
+
/* Setup socket for incoming commands */
@@ -85,3 +67,3 @@ int main(int argc, char **argv)
wl_logerr("Cannot setup socket");
- exit(-1);
+ exit(EXIT_FAILURE);
}
@@ -89,2 +71,18 @@ int main(int argc, char **argv)
+ /* Create channelswitching thread */
+ if(pthread_create(&sub, NULL, channel_switcher, (void *)&cardtype) != 0)
+ {
+ wl_logerr("Cannot create thread: %s", strerror(errno));
+ close(sock);
+ exit(EXIT_FAILURE);
+ }
+ if(pthread_detach(sub))
+ {
+ wl_logerr("Error detaching thread");
+ close(sock);
+ pthread_exit((pthread_t *)sub);
+ exit(EXIT_FAILURE);
+ }
+ wl_loginfo("Created and detached channel switching thread");
+
FD_ZERO(&rset);
@@ -99,9 +97,6 @@ int main(int argc, char **argv)
- // blah
- timedout=1;
-
/* socket or pcap handle bigger? Will be cleaned up, have to check pcap */
- maxfd = (sock > pcap_fileno(handletopcap) ? sock : pcap_fileno(handletopcap)) + 1;
+ maxfd = (sock > pcap_fileno(handletopcap) ? sock + 1: pcap_fileno(handletopcap)) + 1;
- if(select(maxfd, &rset, NULL, NULL, NULL) < 0 && timedout)
+ if(select(maxfd, &rset, NULL, NULL, NULL) < 0)
{
@@ -115,3 +110,3 @@ int main(int argc, char **argv)
/* Receive data from socket */
- if((retval=wl_recv(&sock, saddr, buffer, sizeof(buffer))) < 0 && timedout)
+ if((retval=wl_recv(&sock, saddr, buffer, sizeof(buffer))) < 0)
{
@@ -152,3 +147,3 @@ int main(int argc, char **argv)
close(sock);
- exit(0);
+ exit(EXIT_SUCCESS);
}
@@ -163,3 +158,33 @@ void usage(void)
"\t\t\t\tLUCENT\t= 4\n");
- exit(-1);
+ exit(EXIT_FAILURE);
+}
+
+void *
+channel_switcher(void *cardtypeptr)
+{
+ wl_cardtype_t *cardtype;
+ int channel=1;
+
+ /* Get card info struct */
+ cardtype = (wl_cardtype_t *)cardtypeptr;
+
+ while(1)
+ {
+
+ /* If channel bigger than maxchannel, set to 1 */
+ if(channel > MAXCHANNEL)
+ channel=1;
+
+ /* Set channel */
+ if(!card_set_channel(cardtype->iface, channel, cardtype->type))
+ {
+ wl_logerr("Cannot set channel, thread exiting");
+ pthread_exit(NULL);
+ }
+
+ /* sleep */
+ usleep(CHANINTERVAL);
+
+ channel++;
+ } /* while */
}
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.hh b/noncore/net/wellenreiter/daemon/source/daemon.hh
index d50487a..f9ac45e 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.hh
+++ b/noncore/net/wellenreiter/daemon/source/daemon.hh
@@ -12,5 +12,5 @@
#include <arpa/inet.h>
+#include <pthread.h>
#include <unistd.h>
#include <errno.h>
-#include <signal.h>
@@ -24,2 +24,3 @@
void usage(void);
+void *channel_switcher(void *);