summaryrefslogtreecommitdiff
authormjm <mjm>2002-12-31 12:38:28 (UTC)
committer mjm <mjm>2002-12-31 12:38:28 (UTC)
commit24fce03c32664c02e1acd547375d144260ec5cb7 (patch) (side-by-side diff)
treecacb33ddc2bc6979d84de976a3e8cf9e9c1f9f8a
parent44a0af99df02feb01c9879506e4d34d96afe046b (diff)
downloadopie-24fce03c32664c02e1acd547375d144260ec5cb7.zip
opie-24fce03c32664c02e1acd547375d144260ec5cb7.tar.gz
opie-24fce03c32664c02e1acd547375d144260ec5cb7.tar.bz2
updated to new library functions and changes.
Now uses wl_types.hh from lib.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc15
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.hh1
2 files changed, 10 insertions, 6 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index 9c34115..7c3f8a8 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -13,4 +13,5 @@ int main(int argc, char **argv)
int sock, maxfd, retval, card_type;
- char buffer[128], sniffer_device[6];
+ char buffer[WL_SOCKBUF], sniffer_device[6];
struct pcap_pkthdr header;
+ struct sockaddr_in saddr;
pcap_t *handletopcap;
@@ -57,6 +58,6 @@ int main(int argc, char **argv)
{
- wl_loginfo("Interface %s does not work in the correct 802.11 raw mode",
+ wl_logerr("Interface %s does not work in the correct 802.11 raw mode",
sniffer_device);
pcap_close(handletopcap);
- return 0;
+ exit(-1);;
}
@@ -66,3 +67,3 @@ int main(int argc, char **argv)
/* Setup socket for incoming commands */
- if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT)) < 0)
+ if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT, saddr)) < 0)
{
@@ -82,3 +83,5 @@ int main(int argc, char **argv)
FD_SET(pcap_fileno(handletopcap), &rset);
- maxfd=sock + pcap_fileno(handletopcap) + 1;
+
+ /* socket or pcap handle bigger? Will be cleaned up, have to check pcap */
+ maxfd = (sock > pcap_fileno(handletopcap) ? sock : pcap_fileno(handletopcap)) + 1;
@@ -94,3 +97,3 @@ int main(int argc, char **argv)
/* Receive data from socket */
- if((retval=wl_recv(&sock, buffer, sizeof(buffer))) < 0)
+ if((retval=wl_recv(&sock, saddr, buffer, sizeof(buffer))) < 0)
{
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.hh b/noncore/net/wellenreiter/daemon/source/daemon.hh
index c55e86c..1cc3c7c 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.hh
+++ b/noncore/net/wellenreiter/daemon/source/daemon.hh
@@ -17,2 +17,3 @@
#include <libwellenreiter/source/wl_log.hh>
+#include <libwellenreiter/source/wl_types.hh>
#include <libwellenreiter/source/wl_proto.hh>