author | mjm <mjm> | 2002-12-27 16:57:37 (UTC) |
---|---|---|
committer | mjm <mjm> | 2002-12-27 16:57:37 (UTC) |
commit | 66b657ed956fecdfeb82956b444d75b0c028a060 (patch) (unidiff) | |
tree | 147b135b6510a9caf9b68490d64cff717dbcedd2 /noncore | |
parent | 3cb928900ffb1d2799bd7e8e1871aaf8d89b56cf (diff) | |
download | opie-66b657ed956fecdfeb82956b444d75b0c028a060.zip opie-66b657ed956fecdfeb82956b444d75b0c028a060.tar.gz opie-66b657ed956fecdfeb82956b444d75b0c028a060.tar.bz2 |
upgraded to new libfunctions
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/Makefile | 20 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.cc | 17 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.hh | 10 |
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 @@ | |||
2 | 2 | ||
3 | CPP = g++ | 3 | CPP = g++ |
4 | 4 | CPPFLAGS= -g -Wall -pedantic -DDEBUG -I ../../ | |
5 | OPTIMFLAGS= -g | ||
6 | WARNFLAGS= -Wall -pedantic -DDEBUG | ||
7 | LDFLAGS = | ||
8 | LIBS = -lpcap ../../libwellenreiter/source/libwellenreiter.a | 5 | LIBS = -lpcap ../../libwellenreiter/source/libwellenreiter.a |
@@ -11,6 +8,6 @@ OBJ = daemon.o | |||
11 | .SUFFIXES: | 8 | .SUFFIXES: |
12 | .PHONY: all clean distclean realclean | 9 | .PHONY: all wellenreiterd clean distclean realclean |
13 | 10 | ||
14 | %.o : %.cc | 11 | %.o : %.cc |
15 | $(CPP) $(WARNFLAGS) $(OPTIMFLAGS) -c $< -o $@ | 12 | $(CPP) $(CPPFLAGS) -c $< -o $@ |
16 | 13 | ||
@@ -19,9 +16,10 @@ all: wellenreiterd | |||
19 | wellenreiterd:$(OBJ) | 16 | wellenreiterd:$(OBJ) |
20 | $(CPP) $(OPTIMFLAGS) $(WARNFLAGS) $(OBJ) $(LDFLAGS) $(LIBS) -o $@ | 17 | $(CPP) $(CPPFLAGS) $(OBJ) $(LIBS) -o $@ |
21 | @echo Built wellenreiterd | 18 | @echo Build wellenreiterd |
22 | 19 | ||
23 | clean distclean realclean: | 20 | clean distclean realclean: |
24 | @rm -rf wellenreiterd *~ *.o | 21 | @rm -f wellenreiterd *~ *.o |
25 | @echo All dependent files have been removed. | 22 | @echo All dependent files have been removed. |
26 | 23 | ||
27 | daemon.o:config.hh daemon.cc daemon.hh | 24 | daemon.o:config.hh |
25 | |||
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) | |||
13 | int sock, maxfd, retval, card_type; | 13 | int sock, maxfd, retval, card_type; |
14 | char buffer[128], sniffer_device[6]; | 14 | char buffer[128], sniffer_device[5]; |
15 | struct pcap_pkthdr header; | 15 | struct pcap_pkthdr header; |
@@ -56,7 +56,8 @@ int main(int argc, char **argv) | |||
56 | if (retval != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */ | 56 | if (retval != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */ |
57 | { | 57 | { |
58 | wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", sniffer_device); | 58 | wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", |
59 | sniffer_device); | ||
59 | pcap_close(handletopcap); | 60 | pcap_close(handletopcap); |
60 | return 0; | 61 | return 0; |
61 | } | 62 | } |
62 | wl_loginfo("Your successfully listen on %s in 802.11 raw mode", sniffer_device); | 63 | wl_loginfo("Your successfully listen on %s in 802.11 raw mode", sniffer_device); |
@@ -65,3 +66,3 @@ int main(int argc, char **argv) | |||
65 | /* Setup socket for incoming commands */ | 66 | /* Setup socket for incoming commands */ |
66 | if((sock=commsock(DAEMONADDR, DAEMONPORT)) < 0) | 67 | if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT)) < 0) |
67 | { | 68 | { |
@@ -93,3 +94,3 @@ int main(int argc, char **argv) | |||
93 | /* Receive data from socket */ | 94 | /* Receive data from socket */ |
94 | if((retval=recvcomm(&sock, buffer, sizeof(buffer))) < 0) | 95 | if((retval=wl_recv(&sock, buffer, sizeof(buffer))) < 0) |
95 | { | 96 | { |
@@ -113,3 +114,3 @@ int main(int argc, char **argv) | |||
113 | } | 114 | } |
114 | } | 115 | } |
115 | } /* FD_ISSET */ | 116 | } /* FD_ISSET */ |
@@ -128,3 +129,3 @@ int main(int argc, char **argv) | |||
128 | } /* while(1) */ | 129 | } /* while(1) */ |
129 | 130 | ||
130 | close(sock); | 131 | 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 @@ | |||
15 | 15 | ||
16 | #include "../../libwellenreiter/source/sock.hh" | 16 | #include <libwellenreiter/source/wl_sock.hh> |
17 | #include "../../libwellenreiter/source/log.hh" | 17 | #include <libwellenreiter/source/wl_log.hh> |
18 | #include "../../libwellenreiter/source/proto.hh" | 18 | #include <libwellenreiter/source/wl_proto.hh> |
19 | #include "../../libwellenreiter/source/cardmode.hh" | 19 | #include <libwellenreiter/source/cardmode.hh> |
20 | #include "../../libwellenreiter/source/sniff.hh" | 20 | #include <libwellenreiter/source/sniff.hh> |
21 | 21 | ||