upgraded to new libfunctions

3 files changed, 23 insertions, 24 deletions

diff --git a/noncore/net/wellenreiter/daemon/source/Makefile b/noncore/net/wellenreiter/daemon/source/Makefile
index 238dcce..fb897bf 100644
--- a/noncore/net/wellenreiter/daemon/source/Makefile
+++ b/noncore/net/wellenreiter/daemon/source/Makefile
@@ -2,7 +2,4 @@
 
-CPP	       = g++
-
-OPTIMFLAGS	= -g
-WARNFLAGS	= -Wall  -pedantic -DDEBUG
-LDFLAGS		= 
+CPP		= g++
+CPPFLAGS	= -g -Wall  -pedantic -DDEBUG -I ../../
 LIBS		= -lpcap ../../libwellenreiter/source/libwellenreiter.a
@@ -11,6 +8,6 @@ OBJ		= daemon.o
 .SUFFIXES:
-.PHONY:		all clean distclean realclean
+.PHONY:		all wellenreiterd clean distclean realclean
 
 %.o : %.cc
-	$(CPP) $(WARNFLAGS) $(OPTIMFLAGS) -c $< -o $@
+	$(CPP) $(CPPFLAGS) -c $< -o $@
 
@@ -19,9 +16,10 @@ all:	wellenreiterd
 wellenreiterd:	$(OBJ)
-	$(CPP) $(OPTIMFLAGS) $(WARNFLAGS) $(OBJ) $(LDFLAGS) $(LIBS) -o $@
-	@echo Built wellenreiterd
+	$(CPP) $(CPPFLAGS) $(OBJ) $(LIBS) -o $@
+	@echo Build wellenreiterd
 
 clean distclean realclean:
-	@rm -rf wellenreiterd *~ *.o
+	@rm -f wellenreiterd *~ *.o
 	@echo All dependent files have been removed.
 
-daemon.o:	config.hh daemon.cc daemon.hh
+daemon.o:	config.hh
+
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index ae65a82..5d4a6b4 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -13,3 +13,3 @@ int main(int argc, char **argv)
   int sock, maxfd, retval, card_type;
-  char buffer[128], sniffer_device[6];
+  char buffer[128], sniffer_device[5];
   struct pcap_pkthdr header;
@@ -56,7 +56,8 @@ int main(int argc, char **argv)
     if (retval != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
-      {
-	wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", sniffer_device);
+    {
+	wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", 
+		   sniffer_device);
 	pcap_close(handletopcap);
 	return 0;
-      }
+    }
     wl_loginfo("Your successfully listen on %s in 802.11 raw mode", sniffer_device);
@@ -65,3 +66,3 @@ int main(int argc, char **argv)
   /* Setup socket for incoming commands */
-  if((sock=commsock(DAEMONADDR, DAEMONPORT)) < 0)
+  if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT)) < 0)
   {
@@ -93,3 +94,3 @@ int main(int argc, char **argv)
       /* Receive data from socket */
-      if((retval=recvcomm(&sock, buffer, sizeof(buffer))) < 0)
+      if((retval=wl_recv(&sock, buffer, sizeof(buffer))) < 0)
       {
@@ -113,3 +114,3 @@ int main(int argc, char **argv)
 	}
-      } 
+      }
     } /* FD_ISSET */
@@ -128,3 +129,3 @@ int main(int argc, char **argv)
   } /* while(1) */
-
+  
   close(sock);
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.hh b/noncore/net/wellenreiter/daemon/source/daemon.hh
index 8d03b97..c55e86c 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.hh
+++ b/noncore/net/wellenreiter/daemon/source/daemon.hh
@@ -15,7 +15,7 @@
 
-#include "../../libwellenreiter/source/sock.hh"
-#include "../../libwellenreiter/source/log.hh"
-#include "../../libwellenreiter/source/proto.hh"
-#include "../../libwellenreiter/source/cardmode.hh"
-#include "../../libwellenreiter/source/sniff.hh"
+#include <libwellenreiter/source/wl_sock.hh>
+#include <libwellenreiter/source/wl_log.hh>
+#include <libwellenreiter/source/wl_proto.hh>
+#include <libwellenreiter/source/cardmode.hh>
+#include <libwellenreiter/source/sniff.hh>