generic cleaup

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
@@ -37,43 +37,44 @@ int main(int argc, char **argv)
 
   /* 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))
@@ -92,14 +93,15 @@ int main(int argc, char **argv)
   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;
     }     
@@ -145,13 +147,14 @@ int main(int argc, char **argv)
   } /* 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"                 \