summaryrefslogtreecommitdiff
authormjm <mjm>2002-11-23 21:42:41 (UTC)
committer mjm <mjm>2002-11-23 21:42:41 (UTC)
commitc93ded2c1256817b9c974c792cd143315b98fff7 (patch) (side-by-side diff)
tree7de5b3fc8eee930f72c4e3ef662f48948a60d935
parent4e24ece4607d3b2f9e3252fa561fabaa9cdddd63 (diff)
downloadopie-c93ded2c1256817b9c974c792cd143315b98fff7.zip
opie-c93ded2c1256817b9c974c792cd143315b98fff7.tar.gz
opie-c93ded2c1256817b9c974c792cd143315b98fff7.tar.bz2
implemented sniffer function in daemon.cc
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/Makefile7
-rw-r--r--noncore/net/wellenreiter/daemon/source/TODO1
-rw-r--r--noncore/net/wellenreiter/daemon/source/cardmode.cc1
-rw-r--r--noncore/net/wellenreiter/daemon/source/cardmode.hh4
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc50
-rw-r--r--noncore/net/wellenreiter/daemon/source/sniffer.cc41
-rw-r--r--noncore/net/wellenreiter/daemon/source/sniffer.hh8
7 files changed, 37 insertions, 75 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/Makefile b/noncore/net/wellenreiter/daemon/source/Makefile
index bcbc799..f3f41f0 100644
--- a/noncore/net/wellenreiter/daemon/source/Makefile
+++ b/noncore/net/wellenreiter/daemon/source/Makefile
@@ -7,5 +7,5 @@ WARNFLAGS = -Wall -pedantic -DDEBUG
LDFLAGS =
LIBS = -lpcap ../../libwellenreiter/source/libwellenreiter.a
-OBJ = daemon.o
+OBJ = daemon.o cardmode.o sniffer.o
.SUFFIXES:
@@ -21,9 +21,4 @@ wellenreiterd: $(OBJ)
@echo Build wellenreiterd
-sniffer: sniffer.o cardmode.o
- $(CPP) $(OPTIMFLAGS) $(WARNFLAGS) sniffer.o cardmode.o $(LDFLAGS) $(LIBS) -o $@
- @echo Build sniffer
-
-
clean distclean realclean:
@rm -rf wellenreiterd *~ *.o
diff --git a/noncore/net/wellenreiter/daemon/source/TODO b/noncore/net/wellenreiter/daemon/source/TODO
index 39b1a05..2d72ab7 100644
--- a/noncore/net/wellenreiter/daemon/source/TODO
+++ b/noncore/net/wellenreiter/daemon/source/TODO
@@ -1,5 +1,4 @@
implement communication protocol
security analysis
-implement sniffer (last step)
security analysis
code cleanup \ No newline at end of file
diff --git a/noncore/net/wellenreiter/daemon/source/cardmode.cc b/noncore/net/wellenreiter/daemon/source/cardmode.cc
index f84ce23..8069edc 100644
--- a/noncore/net/wellenreiter/daemon/source/cardmode.cc
+++ b/noncore/net/wellenreiter/daemon/source/cardmode.cc
@@ -1,4 +1,5 @@
/* $Id$ */
+#include "config.hh"
#include "cardmode.hh"
diff --git a/noncore/net/wellenreiter/daemon/source/cardmode.hh b/noncore/net/wellenreiter/daemon/source/cardmode.hh
index 87284a1..ecc97b1 100644
--- a/noncore/net/wellenreiter/daemon/source/cardmode.hh
+++ b/noncore/net/wellenreiter/daemon/source/cardmode.hh
@@ -14,6 +14,4 @@
#include <net/bpf.h>
-#endif /* CARDMODE_HH */
-
/* Defines, used for the card setup */
#define DEFAULT_PATH "/proc/driver/aironet/%s/Config"
@@ -34,3 +32,3 @@ int card_into_monitormode (char * device, int cardtype);
int card_set_promisc_up (char * device);
-
+#endif /* CARDMODE_HH */
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index b3a37b6..1f9e98a 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -7,18 +7,36 @@
#include "config.hh"
#include "daemon.hh"
+#include "cardmode.hh"
+#include "sniffer.hh"
/* Main function of wellenreiterd */
int main(int argc, char **argv)
{
- int sock, maxfd, guiport=GUIPORT;
- char guihost[]="127.0.0.1";
+ int sock, maxfd;
struct sockaddr_in *cliaddr;
socklen_t len=sizeof(struct sockaddr);
char buffer[128];
- FILE *fp=stdin; /* Will be replaced with sniffer */
+ pcap_t *handletopcap; /* The handle to the libpcap */
+ char errbuf[PCAP_ERRBUF_SIZE]; /* The errorbuffer of libpacap */
+ struct pcap_pkthdr header; /* The packet header from pcap*/
+ const u_char *packet; /* The actual packet content*/
+
fd_set rset;
fprintf(stderr, "wellenreiterd %s\n\n", VERSION);
+ /* will be replaced soon, just for max because max is lazy :-) */
+ if(card_into_monitormode (SNIFFER_DEVICE, CARD_TYPE_NG) < 0)
+ {
+ fprintf(stderr, "Cannot set card into mon mode, aborting\n");
+ exit(-1);
+ }
+
+ /* opening the pcap for sniffing */
+ handletopcap = pcap_open_live(SNIFFER_DEVICE, BUFSIZ, 1, 1000, errbuf);
+#ifdef HAVE_PCAP_NONBLOCK
+ pcap_setnonblock(handletopcap, 1, errstr);
+#endif
+
/* Setup socket for incoming commands */
if((sock=commsock(DAEMONADDR, DAEMONPORT)) < 0)
@@ -37,6 +55,6 @@ int main(int argc, char **argv)
FD_SET(sock, &rset);
- FD_SET(fileno(fp), &rset);
- maxfd=sock+fileno(fp)+1;
+ FD_SET(pcap_fileno(handletopcap), &rset);
+ maxfd=sock + pcap_fileno(handletopcap) + 1;
if(select(maxfd, &rset, NULL, NULL, NULL) < 0)
{
@@ -56,22 +74,18 @@ int main(int argc, char **argv)
wl_loginfo("Received command from '%s': %s", inet_ntoa(cliaddr->sin_addr), buffer);
- /* Pass string to analyze function */
- // sendcomm(guihost, guiport, buffer);
+ /* will be passed to analyze function */
+ fprintf(stderr, "Received command: %s\n", buffer);
}
- /* Will be replaced with sniffer ... later */
- if(FD_ISSET(fileno(fp), &rset))
+ /* Pcap stuff */
+ if(FD_ISSET(pcap_fileno(handletopcap), &rset))
{
- memset(buffer, 0, sizeof(buffer));
- if(fgets(buffer, sizeof(buffer) - 1, fp) == NULL)
- {
- wl_logerr("Cannot read from stdin: %s", strerror(errno));
- break;
- }
- wl_loginfo("Sending command to '%s': %s", GUIADDR, buffer);
- /* Send string to GUI */
- sendcomm(guihost, guiport, "%d: %s", 1234, buffer);
+ /* Grab one single packet */
+ packet = pcap_next(handletopcap, &header);
+
+ /* process the packet */
+ process_packets(NULL,&header,*&packet);
}
diff --git a/noncore/net/wellenreiter/daemon/source/sniffer.cc b/noncore/net/wellenreiter/daemon/source/sniffer.cc
index be64d67..66d5b6f 100644
--- a/noncore/net/wellenreiter/daemon/source/sniffer.cc
+++ b/noncore/net/wellenreiter/daemon/source/sniffer.cc
@@ -13,43 +13,4 @@
#include "extract.hh"
-int main(void)
-{
- if(card_into_monitormode (SNIFFER_DEVICE, CARD_TYPE_NG) < 0)
- return 0;
- start_sniffing (SNIFFER_DEVICE);
-
- return 1;
-}
-
-int start_sniffing (char * device)
-{
-
- pcap_t *handletopcap; /* The handle to the libpcap */
- char errbuf[PCAP_ERRBUF_SIZE]; /* The errorbuffer of libpacap */
- struct pcap_pkthdr header; /* The packet header from pcap*/
- const u_char *packet; /* The actual packet content*/
-
- /* opening the pcap for sniffing */
- handletopcap = pcap_open_live(device, BUFSIZ, 1, 1000, errbuf);
-
- #ifdef HAVE_PCAP_NONBLOCK
- pcap_setnonblock(handletopcap, 1, errstr);
- #endif
- /*start scanning */
-// pcap_loop(handletopcap,-1,process_packets,NULL);
- /* Loope endless */
- while(1)
- {
- /* Grab one single packet */
- packet = pcap_next(handletopcap, &header);
-
- /* process the packet */
- process_packets(NULL,&header,*&packet);
- }
-
- printf("\nDone processing packets... wheew!\n");
- return 1;
-}
-
void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_char* packet)
{
@@ -299,5 +260,5 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo)
-static int GetHeaderLength(u_int16_t fc)
+int GetHeaderLength(u_int16_t fc)
{
int iLength=0;
diff --git a/noncore/net/wellenreiter/daemon/source/sniffer.hh b/noncore/net/wellenreiter/daemon/source/sniffer.hh
index d262353..7e1e3be 100644
--- a/noncore/net/wellenreiter/daemon/source/sniffer.hh
+++ b/noncore/net/wellenreiter/daemon/source/sniffer.hh
@@ -14,8 +14,6 @@
#include <net/bpf.h>
-
#define NONBROADCASTING "non-broadcasting"
-
/* holds all the interresting data */
struct packetinfo
@@ -37,8 +35,4 @@ struct packetinfo
};
-
-/* Prototypes */
-int sniffer(void);
-int start_sniffing (char * device);
void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_char* packet);
int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo);
@@ -46,5 +40,5 @@ void etheraddr_string(register const u_char *ep,char * text);
int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo);
-static int GetHeaderLength(u_int16_t fc);
+int GetHeaderLength(u_int16_t fc);
/*