summaryrefslogtreecommitdiff
authormjm <mjm>2002-12-31 12:38:28 (UTC)
committer mjm <mjm>2002-12-31 12:38:28 (UTC)
commit24fce03c32664c02e1acd547375d144260ec5cb7 (patch) (unidiff)
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
@@ -11,8 +11,9 @@
11int main(int argc, char **argv) 11int main(int argc, char **argv)
12{ 12{
13 int sock, maxfd, retval, card_type; 13 int sock, maxfd, retval, card_type;
14 char buffer[128], sniffer_device[6]; 14 char buffer[WL_SOCKBUF], sniffer_device[6];
15 struct pcap_pkthdr header; 15 struct pcap_pkthdr header;
16 struct sockaddr_in saddr;
16 pcap_t *handletopcap; 17 pcap_t *handletopcap;
17 const unsigned char *packet; 18 const unsigned char *packet;
18 19
@@ -55,16 +56,16 @@ int main(int argc, char **argv)
55 retval = pcap_datalink(handletopcap); 56 retval = pcap_datalink(handletopcap);
56 if (retval != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */ 57 if (retval != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
57 { 58 {
58 wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", 59 wl_logerr("Interface %s does not work in the correct 802.11 raw mode",
59 sniffer_device); 60 sniffer_device);
60 pcap_close(handletopcap); 61 pcap_close(handletopcap);
61 return 0; 62 exit(-1);;
62 } 63 }
63 wl_loginfo("Your successfully listen on %s in 802.11 raw mode", sniffer_device); 64 wl_loginfo("Your successfully listen on %s in 802.11 raw mode", sniffer_device);
64 //////////////////////////////////////// 65 ////////////////////////////////////////
65 66
66 /* Setup socket for incoming commands */ 67 /* Setup socket for incoming commands */
67 if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT)) < 0) 68 if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT, saddr)) < 0)
68 { 69 {
69 wl_logerr("Cannot setup socket"); 70 wl_logerr("Cannot setup socket");
70 exit(-1); 71 exit(-1);
@@ -80,7 +81,9 @@ int main(int argc, char **argv)
80 81
81 FD_SET(sock, &rset); 82 FD_SET(sock, &rset);
82 FD_SET(pcap_fileno(handletopcap), &rset); 83 FD_SET(pcap_fileno(handletopcap), &rset);
83 maxfd=sock + pcap_fileno(handletopcap) + 1; 84
85 /* socket or pcap handle bigger? Will be cleaned up, have to check pcap */
86 maxfd = (sock > pcap_fileno(handletopcap) ? sock : pcap_fileno(handletopcap)) + 1;
84 87
85 if(select(maxfd, &rset, NULL, NULL, NULL) < 0) 88 if(select(maxfd, &rset, NULL, NULL, NULL) < 0)
86 { 89 {
@@ -92,7 +95,7 @@ int main(int argc, char **argv)
92 if(FD_ISSET(sock, &rset)) 95 if(FD_ISSET(sock, &rset))
93 { 96 {
94 /* Receive data from socket */ 97 /* Receive data from socket */
95 if((retval=wl_recv(&sock, buffer, sizeof(buffer))) < 0) 98 if((retval=wl_recv(&sock, saddr, buffer, sizeof(buffer))) < 0)
96 { 99 {
97 wl_logerr("Error trying to read: %s", strerror(errno)); 100 wl_logerr("Error trying to read: %s", strerror(errno));
98 break; 101 break;
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
@@ -15,6 +15,7 @@
15 15
16#include <libwellenreiter/source/wl_sock.hh> 16#include <libwellenreiter/source/wl_sock.hh>
17#include <libwellenreiter/source/wl_log.hh> 17#include <libwellenreiter/source/wl_log.hh>
18#include <libwellenreiter/source/wl_types.hh>
18#include <libwellenreiter/source/wl_proto.hh> 19#include <libwellenreiter/source/wl_proto.hh>
19#include <libwellenreiter/source/cardmode.hh> 20#include <libwellenreiter/source/cardmode.hh>
20#include <libwellenreiter/source/sniff.hh> 21#include <libwellenreiter/source/sniff.hh>