7 files changed, 37 insertions, 75 deletions

diff --git a/noncore/net/wellenreiter/daemon/source/Makefile b/noncore/net/wellenreiter/daemon/source/Makefile
index bcbc799..f3f41f0 100644
--- a/noncore/net/wellenreiter/daemon/source/Makefile
+++ b/noncore/net/wellenreiter/daemon/source/Makefile
@@ -8,3 +8,3 @@ LDFLAGS		=
         LIBS    = -lpcap ../../libwellenreiter/source/libwellenreiter.a
-        OBJ     = daemon.o
+        OBJ     = daemon.o cardmode.o sniffer.o
 
@@ -22,7 +22,2 @@ wellenreiterd:	$(OBJ)
 
-sniffer: sniffer.o cardmode.o
-        $(CPP) $(OPTIMFLAGS) $(WARNFLAGS) sniffer.o cardmode.o $(LDFLAGS) $(LIBS) -o $@
-        @echo Build sniffer
-
-
 clean distclean realclean:
diff --git a/noncore/net/wellenreiter/daemon/source/TODO b/noncore/net/wellenreiter/daemon/source/TODO
index 39b1a05..2d72ab7 100644
--- a/noncore/net/wellenreiter/daemon/source/TODO
+++ b/noncore/net/wellenreiter/daemon/source/TODO
@@ -2,3 +2,2 @@ implement communication protocol
 security analysis
-implement sniffer (last step)
 security analysis
diff --git a/noncore/net/wellenreiter/daemon/source/cardmode.cc b/noncore/net/wellenreiter/daemon/source/cardmode.cc
index f84ce23..8069edc 100644
--- a/noncore/net/wellenreiter/daemon/source/cardmode.cc
+++ b/noncore/net/wellenreiter/daemon/source/cardmode.cc
@@ -2,2 +2,3 @@
 
+#include "config.hh"
 #include "cardmode.hh"
diff --git a/noncore/net/wellenreiter/daemon/source/cardmode.hh b/noncore/net/wellenreiter/daemon/source/cardmode.hh
index 87284a1..ecc97b1 100644
--- a/noncore/net/wellenreiter/daemon/source/cardmode.hh
+++ b/noncore/net/wellenreiter/daemon/source/cardmode.hh
@@ -15,4 +15,2 @@
 
-#endif /* CARDMODE_HH */
-
 /* Defines, used for the card setup */
@@ -35,2 +33,2 @@ int card_set_promisc_up (char * device);
 
-
+#endif /* CARDMODE_HH */
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index b3a37b6..1f9e98a 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -8,2 +8,4 @@
 #include "daemon.hh"
+#include "cardmode.hh"
+#include "sniffer.hh"
 
@@ -12,4 +14,3 @@ int main(int argc, char **argv)
 {
-  int sock, maxfd, guiport=GUIPORT;
-  char guihost[]="127.0.0.1";
+  int sock, maxfd;
   struct sockaddr_in *cliaddr;
@@ -17,3 +18,7 @@ int main(int argc, char **argv)
   char buffer[128];
-  FILE *fp=stdin; /* Will be replaced with sniffer */
+  pcap_t *handletopcap;             /* The handle to the libpcap */
+  char errbuf[PCAP_ERRBUF_SIZE]; /* The errorbuffer of libpacap */
+  struct pcap_pkthdr header;     /* The packet header from pcap*/
+  const u_char *packet;          /* The actual packet content*/
+
   fd_set rset;
@@ -22,2 +27,15 @@ int main(int argc, char **argv)
 
+  /* will be replaced soon, just for max because max is lazy :-) */
+  if(card_into_monitormode (SNIFFER_DEVICE, CARD_TYPE_NG) < 0)
+  {
+    fprintf(stderr, "Cannot set card into mon mode, aborting\n");
+    exit(-1);
+  }
+
+  /* opening the pcap for sniffing */
+  handletopcap = pcap_open_live(SNIFFER_DEVICE, BUFSIZ, 1, 1000, errbuf);
+#ifdef HAVE_PCAP_NONBLOCK
+  pcap_setnonblock(handletopcap, 1, errstr);
+#endif
+
   /* Setup socket for incoming commands */
@@ -38,4 +56,4 @@ int main(int argc, char **argv)
     FD_SET(sock, &rset);
-    FD_SET(fileno(fp), &rset);
-    maxfd=sock+fileno(fp)+1;
+    FD_SET(pcap_fileno(handletopcap), &rset);
+    maxfd=sock + pcap_fileno(handletopcap) + 1;
     if(select(maxfd, &rset, NULL, NULL, NULL) < 0)
@@ -57,4 +75,4 @@ int main(int argc, char **argv)
 
-      /* Pass string to analyze function */
-      //      sendcomm(guihost, guiport, buffer);
+      /* will be passed to analyze function */
+      fprintf(stderr, "Received command: %s\n", buffer);
 
@@ -62,15 +80,11 @@ int main(int argc, char **argv)
 
-    /* Will be replaced with sniffer ... later */
-    if(FD_ISSET(fileno(fp), &rset))
+    /* Pcap stuff */
+    if(FD_ISSET(pcap_fileno(handletopcap), &rset))
     {
-      memset(buffer, 0, sizeof(buffer));
-      if(fgets(buffer, sizeof(buffer) - 1, fp) == NULL)
-      {
-         wl_logerr("Cannot read from stdin: %s", strerror(errno));
-         break;
-      }
-      wl_loginfo("Sending command to '%s': %s", GUIADDR, buffer);
 
-      /* Send string to GUI */
-      sendcomm(guihost, guiport, "%d: %s", 1234, buffer);
+      /* Grab one single packet */
+      packet = pcap_next(handletopcap, &header);
+
+      /* process the packet */
+      process_packets(NULL,&header,*&packet);
 
diff --git a/noncore/net/wellenreiter/daemon/source/sniffer.cc b/noncore/net/wellenreiter/daemon/source/sniffer.cc
index be64d67..66d5b6f 100644
--- a/noncore/net/wellenreiter/daemon/source/sniffer.cc
+++ b/noncore/net/wellenreiter/daemon/source/sniffer.cc
@@ -14,41 +14,2 @@
 
-int main(void)
-        {
-        if(card_into_monitormode (SNIFFER_DEVICE, CARD_TYPE_NG) < 0)
-                return 0;
-                start_sniffing (SNIFFER_DEVICE);
-
-  return 1;
-}
-
-int start_sniffing (char * device)
-{
- 
-                pcap_t *handletopcap;     /* The handle to the libpcap */
-        char errbuf[PCAP_ERRBUF_SIZE]; /* The errorbuffer of libpacap */
-        struct pcap_pkthdr header;     /* The packet header from pcap*/
-    const u_char *packet;          /* The actual packet content*/
-
-        /* opening the pcap for sniffing */
-        handletopcap = pcap_open_live(device, BUFSIZ, 1, 1000, errbuf);
-
-        #ifdef HAVE_PCAP_NONBLOCK
-            pcap_setnonblock(handletopcap, 1, errstr);
-        #endif
-        /*start scanning */
-        //pcap_loop(handletopcap,-1,process_packets,NULL);
-        /* Loope endless */
-        while(1)
-        {
-                /* Grab one single packet */
-            packet = pcap_next(handletopcap, &header);
-
-                /* process the packet */
-                        process_packets(NULL,&header,*&packet);         
-        }
-
-        printf("\nDone processing packets... wheew!\n");
-        return 1;
-}
-
 void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_char* packet)
@@ -300,3 +261,3 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo)
 
-static int GetHeaderLength(u_int16_t fc)
+int GetHeaderLength(u_int16_t fc)
 {
diff --git a/noncore/net/wellenreiter/daemon/source/sniffer.hh b/noncore/net/wellenreiter/daemon/source/sniffer.hh
index d262353..7e1e3be 100644
--- a/noncore/net/wellenreiter/daemon/source/sniffer.hh
+++ b/noncore/net/wellenreiter/daemon/source/sniffer.hh
@@ -15,6 +15,4 @@
 
-
 #define   NONBROADCASTING "non-broadcasting"
 
-
 /* holds all the interresting data */
@@ -38,6 +36,2 @@ struct packetinfo
 
-
-/* Prototypes */
-int sniffer(void);
-int start_sniffing (char * device);
 void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_char* packet);
@@ -47,3 +41,3 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo);
 
-static int GetHeaderLength(u_int16_t fc);
+int GetHeaderLength(u_int16_t fc);