author | mjm <mjm> | 2002-12-27 16:57:37 (UTC) |
---|---|---|
committer | mjm <mjm> | 2002-12-27 16:57:37 (UTC) |
commit | 66b657ed956fecdfeb82956b444d75b0c028a060 (patch) (side-by-side diff) | |
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 | 18 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.cc | 9 | ||||
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.hh | 10 |
3 files changed, 18 insertions, 19 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 @@ -3,6 +3,3 @@ CPP = g++ - -OPTIMFLAGS = -g -WARNFLAGS = -Wall -pedantic -DDEBUG -LDFLAGS = +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; @@ -57,3 +57,4 @@ int main(int argc, char **argv) { - 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); @@ -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) { 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> |