Diffstat (limited to 'noncore/net/wellenreiter/daemon/source/daemon.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/daemon/source/daemon.cc | 15 |
1 files changed, 9 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 @@ | |||
11 | int main(int argc, char **argv) | 11 | int 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; |