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 | 17 |
1 files changed, 9 insertions, 8 deletions
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 | |||
@@ -11,7 +11,7 @@ | |||
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[128], sniffer_device[5]; |
15 | struct pcap_pkthdr header; | 15 | struct pcap_pkthdr header; |
16 | pcap_t *handletopcap; | 16 | pcap_t *handletopcap; |
17 | const unsigned char *packet; | 17 | const unsigned char *packet; |
@@ -54,16 +54,17 @@ int main(int argc, char **argv) | |||
54 | /* getting the datalink type */ | 54 | /* getting the datalink type */ |
55 | retval = pcap_datalink(handletopcap); | 55 | retval = pcap_datalink(handletopcap); |
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); |
63 | //////////////////////////////////////// | 64 | //////////////////////////////////////// |
64 | 65 | ||
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 | { |
68 | wl_logerr("Cannot setup socket"); | 69 | wl_logerr("Cannot setup socket"); |
69 | exit(-1); | 70 | exit(-1); |
@@ -91,7 +92,7 @@ int main(int argc, char **argv) | |||
91 | if(FD_ISSET(sock, &rset)) | 92 | if(FD_ISSET(sock, &rset)) |
92 | { | 93 | { |
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 | { |
96 | wl_logerr("Error trying to read: %s", strerror(errno)); | 97 | wl_logerr("Error trying to read: %s", strerror(errno)); |
97 | break; | 98 | break; |
@@ -111,7 +112,7 @@ int main(int argc, char **argv) | |||
111 | wl_logerr("Received unknown command: %d", retval); | 112 | wl_logerr("Received unknown command: %d", retval); |
112 | break; | 113 | break; |
113 | } | 114 | } |
114 | } | 115 | } |
115 | } /* FD_ISSET */ | 116 | } /* FD_ISSET */ |
116 | 117 | ||
117 | /* Check pcap lib for packets */ | 118 | /* Check pcap lib for packets */ |
@@ -126,7 +127,7 @@ int main(int argc, char **argv) | |||
126 | } | 127 | } |
127 | 128 | ||
128 | } /* while(1) */ | 129 | } /* while(1) */ |
129 | 130 | ||
130 | close(sock); | 131 | close(sock); |
131 | exit(0); | 132 | exit(0); |
132 | } | 133 | } |