| -rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc index 4407436..5cf4e97 100644 --- a/noncore/net/wellenreiter/daemon/source/daemon.cc +++ b/noncore/net/wellenreiter/daemon/source/daemon.cc @@ -27,89 +27,91 @@ int main(int argc, char **argv) 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(); - if(!card_into_monitormode(&handletopcap, cardtype.iface, cardtype.type)) + /* 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"); - - /////// following line will be moved to lib as soon as possible //////////// - if((handletopcap = pcap_open_live(cardtype.iface, BUFSIZ, 1, 0, NULL)) == NULL) + /* setup pcap */ + if((handletopcap = pcap_open_live(cardtype.iface, + BUFSIZ, 1, 0, NULL)) == NULL) { wl_logerr("pcap_open_live() failed: %s", strerror(errno)); exit(EXIT_FAILURE); } #ifdef HAVE_PCAP_NONBLOCK pcap_setnonblock(handletopcap, 1, NULL); #endif - //////////////////////////////////////// - /* 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) + 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); /* Start main loop */ wl_loginfo("Starting main loop"); while(1) { FD_SET(sock, &rset); FD_SET(pcap_fileno(handletopcap), &rset); - /* socket or pcap handle bigger? Will be cleaned up, have to check pcap */ - maxfd = (sock > pcap_fileno(handletopcap) ? sock + 1: pcap_fileno(handletopcap)) + 1; + /* maxfd = biggest filefd */ + maxfd = (sock > pcap_fileno(handletopcap) ? + sock + 1 : pcap_fileno(handletopcap)) + 1; if(select(maxfd, &rset, NULL, NULL, NULL) < 0) { wl_logerr("Error calling select: %s", strerror(errno)); break; } /* Got data on local socket from GUI */ if(FD_ISSET(sock, &rset)) { /* Receive data from socket */ if((retval=wl_recv(&sock, saddr, buffer, sizeof(buffer))) < 0) { wl_logerr("Error trying to read: %s", strerror(errno)); break; } @@ -135,33 +137,34 @@ int main(int argc, char **argv) if(FD_ISSET(pcap_fileno(handletopcap), &rset)) { /* Grab one single packet */ packet = pcap_next(handletopcap, &header); /* process the packet */ process_packets(&header,*&packet, GUIADDR, GUIPORT); } } /* while(1) */ close(sock); exit(EXIT_SUCCESS); } -void usage(void) +void +usage(void) { fprintf(stderr, "Usage: wellenreiter <device> <cardtype>\n" \ "\t<device> = Wirelessdevice (e.g. wlan0)\n" \ "\t<cardtype> = Cardtype:\tCisco\t= 1\n" \ "\t\t\t\tNG\t= 2\n" \ "\t\t\t\tHOSTAP\t= 3\n" \ "\t\t\t\tLUCENT\t= 4\n"); exit(EXIT_FAILURE); } void * channel_switcher(void *cardtypeptr) { wl_cardtype_t *cardtype; int channel=1; |