summaryrefslogtreecommitdiff
authormjm <mjm>2002-12-27 16:57:37 (UTC)
committer mjm <mjm>2002-12-27 16:57:37 (UTC)
commit66b657ed956fecdfeb82956b444d75b0c028a060 (patch) (unidiff)
tree147b135b6510a9caf9b68490d64cff717dbcedd2
parent3cb928900ffb1d2799bd7e8e1871aaf8d89b56cf (diff)
downloadopie-66b657ed956fecdfeb82956b444d75b0c028a060.zip
opie-66b657ed956fecdfeb82956b444d75b0c028a060.tar.gz
opie-66b657ed956fecdfeb82956b444d75b0c028a060.tar.bz2
upgraded to new libfunctions
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/Makefile20
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc17
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.hh10
3 files changed, 23 insertions, 24 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/Makefile b/noncore/net/wellenreiter/daemon/source/Makefile
index 238dcce..fb897bf 100644
--- a/noncore/net/wellenreiter/daemon/source/Makefile
+++ b/noncore/net/wellenreiter/daemon/source/Makefile
@@ -1,27 +1,25 @@
1# $Id$ 1# $Id$
2 2
3 CPP = g++ 3 CPP = g++
4 4 CPPFLAGS= -g -Wall -pedantic -DDEBUG -I ../../
5 OPTIMFLAGS= -g
6 WARNFLAGS= -Wall -pedantic -DDEBUG
7 LDFLAGS =
8 LIBS = -lpcap ../../libwellenreiter/source/libwellenreiter.a 5 LIBS = -lpcap ../../libwellenreiter/source/libwellenreiter.a
9 OBJ = daemon.o 6 OBJ = daemon.o
10 7
11.SUFFIXES: 8.SUFFIXES:
12 .PHONY: all clean distclean realclean 9 .PHONY: all wellenreiterd clean distclean realclean
13 10
14%.o : %.cc 11%.o : %.cc
15 $(CPP) $(WARNFLAGS) $(OPTIMFLAGS) -c $< -o $@ 12 $(CPP) $(CPPFLAGS) -c $< -o $@
16 13
17 all:wellenreiterd 14 all:wellenreiterd
18 15
19 wellenreiterd:$(OBJ) 16 wellenreiterd:$(OBJ)
20 $(CPP) $(OPTIMFLAGS) $(WARNFLAGS) $(OBJ) $(LDFLAGS) $(LIBS) -o $@ 17 $(CPP) $(CPPFLAGS) $(OBJ) $(LIBS) -o $@
21 @echo Built wellenreiterd 18 @echo Build wellenreiterd
22 19
23clean distclean realclean: 20clean distclean realclean:
24 @rm -rf wellenreiterd *~ *.o 21 @rm -f wellenreiterd *~ *.o
25 @echo All dependent files have been removed. 22 @echo All dependent files have been removed.
26 23
27 daemon.o:config.hh daemon.cc daemon.hh 24 daemon.o:config.hh
25
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
@@ -1,142 +1,143 @@
1/* 1/*
2 * Startup functions of wellenreiter 2 * Startup functions of wellenreiter
3 * 3 *
4 * $Id$ 4 * $Id$
5 */ 5 */
6 6
7#include "config.hh" 7#include "config.hh"
8#include "daemon.hh" 8#include "daemon.hh"
9 9
10/* Main function of wellenreiterd */ 10/* Main function of wellenreiterd */
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[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;
18 18
19 fd_set rset; 19 fd_set rset;
20 20
21 fprintf(stderr, "wellenreiterd %s\n\n", VERSION); 21 fprintf(stderr, "wellenreiterd %s\n\n", VERSION);
22 fprintf(stderr, "(c) 2002 by M-M-M\n\n"); 22 fprintf(stderr, "(c) 2002 by M-M-M\n\n");
23 23
24 if(argc < 3) 24 if(argc < 3)
25 usage(); 25 usage();
26 26
27 /* Set sniffer device */ 27 /* Set sniffer device */
28 memset(sniffer_device, 0, sizeof(sniffer_device)); 28 memset(sniffer_device, 0, sizeof(sniffer_device));
29 strncpy(sniffer_device, (char *)argv[1], sizeof(sniffer_device) - 1); 29 strncpy(sniffer_device, (char *)argv[1], sizeof(sniffer_device) - 1);
30 30
31 /* Set card type */ 31 /* Set card type */
32 card_type = atoi(argv[2]); 32 card_type = atoi(argv[2]);
33 if(card_type < 1 || card_type > 3) 33 if(card_type < 1 || card_type > 3)
34 usage(); 34 usage();
35 35
36 if(!card_into_monitormode(&handletopcap, sniffer_device, card_type)) 36 if(!card_into_monitormode(&handletopcap, sniffer_device, card_type))
37 { 37 {
38 wl_logerr("Cannot set card into mon mode, aborting"); 38 wl_logerr("Cannot set card into mon mode, aborting");
39 exit(-1); 39 exit(-1);
40 } 40 }
41 wl_loginfo("Set card into monitor mode"); 41 wl_loginfo("Set card into monitor mode");
42 42
43 /////// following line will be moved to lib as soon as possible //////////// 43 /////// following line will be moved to lib as soon as possible ////////////
44 if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL) 44 if((handletopcap = pcap_open_live(sniffer_device, BUFSIZ, 1, 0, NULL)) == NULL)
45 { 45 {
46 wl_logerr("pcap_open_live() failed: %s", strerror(errno)); 46 wl_logerr("pcap_open_live() failed: %s", strerror(errno));
47 exit(-1); 47 exit(-1);
48 } 48 }
49 49
50#ifdef HAVE_PCAP_NONBLOCK 50#ifdef HAVE_PCAP_NONBLOCK
51 pcap_setnonblock(handletopcap, 1, NULL); 51 pcap_setnonblock(handletopcap, 1, NULL);
52#endif 52#endif
53 53
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);
70 } 71 }
71 wl_loginfo("Set up socket '%d' for GUI communication", sock); 72 wl_loginfo("Set up socket '%d' for GUI communication", sock);
72 73
73 FD_ZERO(&rset); 74 FD_ZERO(&rset);
74 75
75 /* Start main loop */ 76 /* Start main loop */
76 wl_loginfo("Starting main loop"); 77 wl_loginfo("Starting main loop");
77 while(1) 78 while(1)
78 { 79 {
79 80
80 FD_SET(sock, &rset); 81 FD_SET(sock, &rset);
81 FD_SET(pcap_fileno(handletopcap), &rset); 82 FD_SET(pcap_fileno(handletopcap), &rset);
82 maxfd=sock + pcap_fileno(handletopcap) + 1; 83 maxfd=sock + pcap_fileno(handletopcap) + 1;
83 84
84 if(select(maxfd, &rset, NULL, NULL, NULL) < 0) 85 if(select(maxfd, &rset, NULL, NULL, NULL) < 0)
85 { 86 {
86 wl_logerr("Error calling select: %s", strerror(errno)); 87 wl_logerr("Error calling select: %s", strerror(errno));
87 break; 88 break;
88 } 89 }
89 90
90 /* Got data on local socket from GUI */ 91 /* Got data on local socket from GUI */
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;
98 } 99 }
99 else 100 else
100 { 101 {
101 /* check type of packet and start function according to it */ 102 /* check type of packet and start function according to it */
102 switch(retval) 103 switch(retval)
103 { 104 {
104 case 98: 105 case 98:
105 wl_loginfo("Received STARTSNIFF command"); 106 wl_loginfo("Received STARTSNIFF command");
106 break; 107 break;
107 case 99: 108 case 99:
108 wl_loginfo("Received STOPSNIFF command"); 109 wl_loginfo("Received STOPSNIFF command");
109 break; 110 break;
110 default: 111 default:
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 */
118 if(FD_ISSET(pcap_fileno(handletopcap), &rset)) 119 if(FD_ISSET(pcap_fileno(handletopcap), &rset))
119 { 120 {
120 121
121 /* Grab one single packet */ 122 /* Grab one single packet */
122 packet = pcap_next(handletopcap, &header); 123 packet = pcap_next(handletopcap, &header);
123 124
124 /* process the packet */ 125 /* process the packet */
125 process_packets(&header,*&packet, GUIADDR, GUIPORT); 126 process_packets(&header,*&packet, GUIADDR, GUIPORT);
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}
133 134
134void usage(void) 135void usage(void)
135{ 136{
136 fprintf(stderr, "Usage: wellenreiter <device> <cardtype>\n" \ 137 fprintf(stderr, "Usage: wellenreiter <device> <cardtype>\n" \
137 "\t<device> = Wirelessdevice (e.g. wlan0)\n" \ 138 "\t<device> = Wirelessdevice (e.g. wlan0)\n" \
138 "\t<cardtype> = Cardtype:\t Cisco\t= 1\n" \ 139 "\t<cardtype> = Cardtype:\t Cisco\t= 1\n" \
139 "\t\t\t\tNG\t= 2\n" \ 140 "\t\t\t\tNG\t= 2\n" \
140 "\t\t\t\tHOSTAP\t= 3\n"); 141 "\t\t\t\tHOSTAP\t= 3\n");
141 exit(-1); 142 exit(-1);
142} 143}
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.hh b/noncore/net/wellenreiter/daemon/source/daemon.hh
index 8d03b97..c55e86c 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.hh
+++ b/noncore/net/wellenreiter/daemon/source/daemon.hh
@@ -1,24 +1,24 @@
1/* $Id$ */ 1/* $Id$ */
2 2
3#ifndef DAEMON_HH 3#ifndef DAEMON_HH
4#define DAEMON_HH 4#define DAEMON_HH
5 5
6#include <stdio.h> 6#include <stdio.h>
7#include <string.h> 7#include <string.h>
8#include <sys/types.h> 8#include <sys/types.h>
9#include <sys/time.h> 9#include <sys/time.h>
10#include <sys/socket.h> 10#include <sys/socket.h>
11#include <netinet/in.h> 11#include <netinet/in.h>
12#include <arpa/inet.h> 12#include <arpa/inet.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <errno.h> 14#include <errno.h>
15 15
16#include "../../libwellenreiter/source/sock.hh" 16#include <libwellenreiter/source/wl_sock.hh>
17#include "../../libwellenreiter/source/log.hh" 17#include <libwellenreiter/source/wl_log.hh>
18#include "../../libwellenreiter/source/proto.hh" 18#include <libwellenreiter/source/wl_proto.hh>
19#include "../../libwellenreiter/source/cardmode.hh" 19#include <libwellenreiter/source/cardmode.hh>
20#include "../../libwellenreiter/source/sniff.hh" 20#include <libwellenreiter/source/sniff.hh>
21 21
22void usage(void); 22void usage(void);
23 23
24#endif /* DAEMON_HH */ 24#endif /* DAEMON_HH */