1 files changed, 8 insertions, 19 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
@@ -13,2 +13,3 @@
 
+
 /* Main function of wellenreiterd */
@@ -20,3 +21,3 @@ int main(int argc, char **argv)
   struct sockaddr_in saddr;
-  pcap_t *handletopcap;
+//  pcap_t *handletopcap;
   wl_cardtype_t cardtype;
@@ -42,22 +43,10 @@ int main(int argc, char **argv)
 
-  /* set card into monitor mode */
-  if(!card_into_monitormode(&handletopcap, cardtype.iface, 
-                            cardtype.type))
+  /* 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("Cannot initialize the wireless-card, aborting");
-    exit(EXIT_FAILURE);
+          wl_logerr("daemon, start_sniff did not return proper, 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)
-  {
-    wl_logerr("pcap_open_live() failed: %s", strerror(errno));
-    exit(EXIT_FAILURE);
-  }
-  
-#ifdef HAVE_PCAP_NONBLOCK
-  pcap_setnonblock(handletopcap, 1, NULL);
-#endif
+  wl_loginfo ("daemon, wireless card prepared for sniffing");