Diffstat (limited to 'noncore/net/wellenreiter/daemon') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.cc | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc index 3a28217..b840f17 100644 --- a/noncore/net/wellenreiter/daemon/source/daemon.cc +++ b/noncore/net/wellenreiter/daemon/source/daemon.cc @@ -2,73 +2,62 @@ * Startup functions of wellenreiter * * $Id$ */ #include "config.hh" #include "daemon.hh" /* should be parsed from cfg-file */ #define MAXCHANNEL 13 #define CHANINTERVAL 500000 + /* Main function of wellenreiterd */ int main(int argc, char **argv) { int sock, maxfd, retval; char buffer[WL_SOCKBUF]; struct pcap_pkthdr header; struct sockaddr_in saddr; - pcap_t *handletopcap; +// pcap_t *handletopcap; wl_cardtype_t cardtype; pthread_t sub; const unsigned char *packet; fd_set rset; fprintf(stderr, "wellenreiterd %s\n\n", VERSION); fprintf(stderr, "(c) 2002 by M-M-M\n\n"); if(argc < 3) usage(); /* Set sniffer device */ memset(cardtype.iface, 0, sizeof(cardtype.iface)); strncpy(cardtype.iface, (char *)argv[1], sizeof(cardtype.iface) - 1); /* Set card type */ cardtype.type = atoi(argv[2]); if(cardtype.type < 1 || cardtype.type > 4) usage(); - /* set card into monitor mode */ - if(!card_into_monitormode(&handletopcap, cardtype.iface, - cardtype.type)) - { - wl_logerr("Cannot initialize the wireless-card, aborting"); - exit(EXIT_FAILURE); - } - wl_loginfo("Set card into monitor mode"); - - /* setup pcap */ - if((handletopcap = pcap_open_live(cardtype.iface, - BUFSIZ, 1, 0, NULL)) == NULL) + /* Until we do not act as a read daemon, it starts the sniffer + right after startup */ + if (!start_sniffer(cardtype.iface,cardtype.type)) { - wl_logerr("pcap_open_live() failed: %s", strerror(errno)); + wl_logerr("daemon, start_sniff did not return proper, aborting"); exit(EXIT_FAILURE); } - -#ifdef HAVE_PCAP_NONBLOCK - pcap_setnonblock(handletopcap, 1, NULL); -#endif + wl_loginfo ("daemon, wireless card prepared for sniffing"); /* Setup socket for incoming commands */ if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT, saddr)) < 0) { wl_logerr("Cannot setup socket"); exit(EXIT_FAILURE); } wl_loginfo("Set up socket '%d' for GUI communication", sock); /* Create channelswitching thread */ if(pthread_create(&sub, NULL, channel_switcher, (void *)&cardtype) != 0) |