summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index 7c3f8a8..51c2194 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -33,13 +33,13 @@ int main(int argc, char **argv)
33 card_type = atoi(argv[2]); 33 card_type = atoi(argv[2]);
34 if(card_type < 1 || card_type > 3) 34 if(card_type < 1 || card_type > 3)
35 usage(); 35 usage();
36 36
37 if(!card_into_monitormode(&handletopcap, sniffer_device, card_type)) 37 if(!card_into_monitormode(&handletopcap, sniffer_device, card_type))
38 { 38 {
39 wl_logerr("Cannot set card into mon mode, aborting"); 39 wl_logerr("Cannot initialize the wireless-card, aborting");
40 exit(-1); 40 exit(-1);
41 } 41 }
42 wl_loginfo("Set card into monitor mode"); 42 wl_loginfo("Set card into monitor mode");
43 43
44 /////// following line will be moved to lib as soon as possible //////////// 44 /////// following line will be moved to lib as soon as possible ////////////
45 if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL) 45 if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL)
@@ -49,22 +49,12 @@ int main(int argc, char **argv)
49 } 49 }
50 50
51#ifdef HAVE_PCAP_NONBLOCK 51#ifdef HAVE_PCAP_NONBLOCK
52 pcap_setnonblock(handletopcap, 1, NULL); 52 pcap_setnonblock(handletopcap, 1, NULL);
53#endif 53#endif
54 54
55 /* getting the datalink type */
56 retval = pcap_datalink(handletopcap);
57 if (retval != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
58 {
59 wl_logerr("Interface %s does not work in the correct 802.11 raw mode",
60 sniffer_device);
61 pcap_close(handletopcap);
62 exit(-1);;
63 }
64 wl_loginfo("Your successfully listen on %s in 802.11 raw mode", sniffer_device);
65 //////////////////////////////////////// 55 ////////////////////////////////////////
66 56
67 /* Setup socket for incoming commands */ 57 /* Setup socket for incoming commands */
68 if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT, saddr)) < 0) 58 if((sock=wl_setupsock(DAEMONADDR, DAEMONPORT, saddr)) < 0)
69 { 59 {
70 wl_logerr("Cannot setup socket"); 60 wl_logerr("Cannot setup socket");