generic cleaup

1 files changed, 25 insertions, 22 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
@@ -32,3 +32,3 @@ int main(int argc, char **argv)
     usage();
-
+  
   /* Set sniffer device */
@@ -42,3 +42,5 @@ int main(int argc, char **argv)
 
-  if(!card_into_monitormode(&handletopcap, cardtype.iface, cardtype.type))
+  /* set card into monitor mode */
+  if(!card_into_monitormode(&handletopcap, cardtype.iface, 
+                            cardtype.type))
   {
@@ -49,16 +51,14 @@ int main(int argc, char **argv)
 
-
-  /////// following line will be moved to lib as soon as possible ////////////
-    if((handletopcap = pcap_open_live(cardtype.iface, BUFSIZ, 1, 0, NULL)) == NULL)
-    {
-      wl_logerr("pcap_open_live() failed: %s", strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-
+  /* 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);
+  pcap_setnonblock(handletopcap, 1, NULL);
 #endif
-  ////////////////////////////////////////
- 
-
+  
   /* Setup socket for incoming commands */
@@ -72,3 +72,4 @@ int main(int argc, char **argv)
   /* Create channelswitching thread */
-  if(pthread_create(&sub, NULL, channel_switcher, (void *)&cardtype) != 0)
+  if(pthread_create(&sub, NULL, channel_switcher, 
+                    (void *)&cardtype) != 0)
   {
@@ -97,4 +98,5 @@ int main(int argc, char **argv)
 
-    /* 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;
 
@@ -124,7 +126,7 @@ int main(int argc, char **argv)
           case 99:
-              wl_loginfo("Received STOPSNIFF command");
-              break;
+            wl_loginfo("Received STOPSNIFF command");
+            break;
           default:
-              wl_logerr("Received unknown command: %d", retval);
-              break;
+            wl_logerr("Received unknown command: %d", retval);
+            break;
         }
@@ -150,3 +152,4 @@ int main(int argc, char **argv)
 
-void usage(void)
+void 
+usage(void)
 {