summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/Makefile20
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc17
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.hh10
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
@@ -1,27 +1,25 @@
# $Id$
-CPP = g++
-
-OPTIMFLAGS = -g
-WARNFLAGS = -Wall -pedantic -DDEBUG
-LDFLAGS =
+CPP = g++
+CPPFLAGS = -g -Wall -pedantic -DDEBUG -I ../../
LIBS = -lpcap ../../libwellenreiter/source/libwellenreiter.a
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 $@
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
@@ -6,17 +6,17 @@
#include "config.hh"
#include "daemon.hh"
/* Main function of wellenreiterd */
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;
pcap_t *handletopcap;
const unsigned char *packet;
fd_set rset;
fprintf(stderr, "wellenreiterd %s\n\n", VERSION);
fprintf(stderr, "(c) 2002 by M-M-M\n\n");
@@ -49,26 +49,27 @@ int main(int argc, char **argv)
#ifdef HAVE_PCAP_NONBLOCK
pcap_setnonblock(handletopcap, 1, NULL);
#endif
/* getting the datalink type */
retval = pcap_datalink(handletopcap);
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);
////////////////////////////////////////
/* Setup socket for incoming commands */
- if((sock=commsock(DAEMONADDR, DAEMONPORT)) < 0)
+ if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT)) < 0)
{
wl_logerr("Cannot setup socket");
exit(-1);
}
wl_loginfo("Set up socket '%d' for GUI communication", sock);
FD_ZERO(&rset);
@@ -86,17 +87,17 @@ int main(int argc, char **argv)
wl_logerr("Error calling select: %s", strerror(errno));
break;
}
/* Got data on local socket from GUI */
if(FD_ISSET(sock, &rset))
{
/* Receive data from socket */
- if((retval=recvcomm(&sock, buffer, sizeof(buffer))) < 0)
+ if((retval=wl_recv(&sock, buffer, sizeof(buffer))) < 0)
{
wl_logerr("Error trying to read: %s", strerror(errno));
break;
}
else
{
/* check type of packet and start function according to it */
switch(retval)
@@ -106,32 +107,32 @@ int main(int argc, char **argv)
break;
case 99:
wl_loginfo("Received STOPSNIFF command");
break;
default:
wl_logerr("Received unknown command: %d", retval);
break;
}
- }
+ }
} /* FD_ISSET */
/* Check pcap lib for packets */
if(FD_ISSET(pcap_fileno(handletopcap), &rset))
{
/* Grab one single packet */
packet = pcap_next(handletopcap, &header);
/* process the packet */
process_packets(&header,*&packet, GUIADDR, GUIPORT);
}
} /* while(1) */
-
+
close(sock);
exit(0);
}
void usage(void)
{
fprintf(stderr, "Usage: wellenreiter <device> <cardtype>\n" \
"\t<device> = Wirelessdevice (e.g. wlan0)\n" \
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
@@ -8,17 +8,17 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <errno.h>
-#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>
void usage(void);
#endif /* DAEMON_HH */