summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/Makefile5
-rw-r--r--noncore/net/wellenreiter/daemon/source/cardmode.cc89
-rw-r--r--noncore/net/wellenreiter/daemon/source/cardmode.hh36
-rw-r--r--noncore/net/wellenreiter/daemon/source/sniffer.cc95
-rw-r--r--noncore/net/wellenreiter/daemon/source/sniffer.hh13
5 files changed, 137 insertions, 101 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/Makefile b/noncore/net/wellenreiter/daemon/source/Makefile
index f6efa3d..bcbc799 100644
--- a/noncore/net/wellenreiter/daemon/source/Makefile
+++ b/noncore/net/wellenreiter/daemon/source/Makefile
@@ -20,6 +20,11 @@ wellenreiterd: $(OBJ)
$(CPP) $(OPTIMFLAGS) $(WARNFLAGS) $(OBJ) $(LDFLAGS) $(LIBS) -o $@
@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
@echo All dependent files have been removed.
diff --git a/noncore/net/wellenreiter/daemon/source/cardmode.cc b/noncore/net/wellenreiter/daemon/source/cardmode.cc
new file mode 100644
index 0000000..ae32af4
--- a/dev/null
+++ b/noncore/net/wellenreiter/daemon/source/cardmode.cc
@@ -0,0 +1,89 @@
+/* $Id$ */
+
+#include "cardmode.hh"
+
+int card_into_monitormode (char *device, int cardtype)
+{
+
+ int datalink; /* used for getting the pcap datalink type */
+ char CiscoRFMON[35] = "/proc/driver/aironet/";
+ FILE *CISCO_CONFIG_FILE;
+ char errbuf[PCAP_ERRBUF_SIZE];
+ pcap_t *handle;
+
+ /* Checks if we have a device to sniff on */
+ if(device == NULL)
+ {
+ printf ("Fatal error i did not have any interfaces to sniff on\n");
+ return 0;
+ }
+
+ /* Setting the prmiscous and up flag to the interface */
+ if (card_set_promisc_up (device) == 0)
+ {
+ printf ("Interface flags correctly set using ifconfig\n");
+ }
+
+ /* Check the cardtype and executes the commands to go into monitor mode */
+ if (cardtype == CARD_TYPE_CISCO) /* I got a cisco card */
+ {
+ /* bring the sniffer into rfmon mode */
+ snprintf(CiscoRFMON, sizeof(CiscoRFMON),DEFAULT_PATH, device);
+ CISCO_CONFIG_FILE = fopen(CiscoRFMON,"w");
+ fputs ("Mode: r",CISCO_CONFIG_FILE);
+ fputs ("Mode: y",CISCO_CONFIG_FILE);
+ fputs ("XmitPower: 1",CISCO_CONFIG_FILE);
+ fclose(CISCO_CONFIG_FILE);
+ }
+ else if (cardtype == CARD_TYPE_NG)
+ {
+ char wlanngcmd[62];
+ snprintf(wlanngcmd, sizeof(wlanngcmd),"%s %s lnxreq_wlansniff channel=1 enable=true",WLANCTL_PATH,device);
+ if (system (wlanngcmd) != 0)
+ {
+ printf ("\n Fatal error could not set %s in raw mode, check cardtype\n",device);
+ return 0;
+ }
+ }
+ else if (cardtype == CARD_TYPE_HOSTAP)
+ {
+ printf ("Got a host-ap card, nothing is implemented now\n");
+ }
+
+
+ /* Check the interface if it is in the correct raw mode */
+ handle = pcap_open_live(device, BUFSIZ, 1, 0, errbuf);
+
+ /* getting the datalink type */
+ datalink = pcap_datalink(handle);
+
+ if (datalink == DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
+ {
+ printf ("Your successfully listen on %s in 802.11 raw mode\n",device);
+ pcap_close(handle);
+ return 0;
+
+ }
+ else
+ {
+ printf ("Fatal error, cannot continue, your interface %s does not work in the correct 802.11 raw mode, check you driver please\n",device);
+ pcap_close(handle);
+ return 0;
+ }
+}
+
+
+
+int card_set_promisc_up (char * device)
+{
+ int ret;
+ char ifconfigcmd[32];
+ snprintf(ifconfigcmd,sizeof(ifconfigcmd),SBIN_PATH, device);
+ ret = system (ifconfigcmd);
+ if (ret > 0)
+ {
+ printf ("\nFatal error, could not execute %s please check your card,binary location and permission\n",ifconfigcmd);
+ return 0;
+ }
+ return 1;
+}
diff --git a/noncore/net/wellenreiter/daemon/source/cardmode.hh b/noncore/net/wellenreiter/daemon/source/cardmode.hh
new file mode 100644
index 0000000..87284a1
--- a/dev/null
+++ b/noncore/net/wellenreiter/daemon/source/cardmode.hh
@@ -0,0 +1,36 @@
+/* $Id$ */
+
+#ifndef CARDMODE_HH
+#define CARDMODE_HH
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <pcap.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/bpf.h>
+
+#endif /* CARDMODE_HH */
+
+/* Defines, used for the card setup */
+#define DEFAULT_PATH "/proc/driver/aironet/%s/Config"
+#define CARD_TYPE_CISCO 1
+#define CARD_TYPE_NG 2
+#define CARD_TYPE_HOSTAP 3
+
+/* only for now, until we have the daemon running */
+/*the config file should provide these information */
+#define SNIFFER_DEVICE "wlan0"
+#define CARD_TYPE CARD_TYPE_CISCO
+#define SBIN_PATH "/sbin/ifconfig %s promisc up"
+#define WLANCTL_PATH "/sbin/wlanctl-ng"
+
+/* Prototypes */
+
+int card_into_monitormode (char * device, int cardtype);
+int card_set_promisc_up (char * device);
+
+
diff --git a/noncore/net/wellenreiter/daemon/source/sniffer.cc b/noncore/net/wellenreiter/daemon/source/sniffer.cc
index c837505..65c8579 100644
--- a/noncore/net/wellenreiter/daemon/source/sniffer.cc
+++ b/noncore/net/wellenreiter/daemon/source/sniffer.cc
@@ -7,11 +7,12 @@
*/
#include "config.hh"
+#include "cardmode.hh"
#include "sniffer.hh"
#include "ieee802_11.hh"
#include "extract.hh"
-int sniffer(void)
+int main(void)
{
if(card_into_monitormode (SNIFFER_DEVICE, CARD_TYPE_NG) < 0)
return 0;
@@ -20,90 +21,6 @@ int sniffer(void)
return 1;
}
-int card_into_monitormode (char *device, int cardtype)
-{
-
- int datalink; /* used for getting the pcap datalink type */
- char CiscoRFMON[35] = "/proc/driver/aironet/";
- FILE *CISCO_CONFIG_FILE;
- char errbuf[PCAP_ERRBUF_SIZE];
- pcap_t *handle;
-
- /* Checks if we have a device to sniff on */
- if(device == NULL)
- {
- printf ("Fatal error i did not have any interfaces to sniff on\n");
- return 0;
- }
-
- /* Setting the prmiscous and up flag to the interface */
- if (card_set_promisc_up (device) == 0)
- {
- printf ("Interface flags correctly set using ifconfig\n");
- }
-
- /* Check the cardtype and executes the commands to go into monitor mode */
- if (cardtype == CARD_TYPE_CISCO) /* I got a cisco card */
- {
- /* bring the sniffer into rfmon mode */
- snprintf(CiscoRFMON, sizeof(CiscoRFMON),DEFAULT_PATH, device);
- CISCO_CONFIG_FILE = fopen(CiscoRFMON,"w");
- fputs ("Mode: r",CISCO_CONFIG_FILE);
- fputs ("Mode: y",CISCO_CONFIG_FILE);
- fputs ("XmitPower: 1",CISCO_CONFIG_FILE);
- fclose(CISCO_CONFIG_FILE);
- }
- else if (cardtype == CARD_TYPE_NG)
- {
- char wlanngcmd[62];
- snprintf(wlanngcmd, sizeof(wlanngcmd),"%s %s lnxreq_wlansniff channel=1 enable=true",WLANCTL_PATH,device);
- if (system (wlanngcmd) != 0)
- {
- printf ("\n Fatal error could not set %s in raw mode, check cardtype\n",device);
- return 0;
- }
- }
- else if (cardtype == CARD_TYPE_HOSTAP)
- {
- printf ("Got a host-ap card, nothing is implemented now\n");
- }
-
-
- /* Check the interface if it is in the correct raw mode */
- handle = pcap_open_live(device, BUFSIZ, 1, 0, errbuf);
-
- /* getting the datalink type */
- datalink = pcap_datalink(handle);
-
- if (datalink == DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
- {
- printf ("Your successfully listen on %s in 802.11 raw mode\n",device);
- pcap_close(handle);
- return 0;
-
- }
- else
- {
- printf ("Fatal error, cannot continue, your interface %s does not work in the correct 802.11 raw mode, check you driver please\n",device);
- pcap_close(handle);
- return 0;
- }
-}
-
-int card_set_promisc_up (char * device)
-{
- int ret;
- char ifconfigcmd[32];
- snprintf(ifconfigcmd,sizeof(ifconfigcmd),SBIN_PATH, device);
- ret = system (ifconfigcmd);
- if (ret > 0)
- {
- printf ("\nFatal error, could not execute %s please check your card,binary location and permission\n",ifconfigcmd);
- return 0;
- }
- return 1;
-}
-
int start_sniffing (char * device)
{
@@ -113,11 +30,9 @@ int start_sniffing (char * device)
/* opening the pcap for sniffing */
handletopcap = pcap_open_live(device, BUFSIZ, 1, 1000, errbuf);
- /* Next few lines a taken out of kismet */
#ifdef HAVE_PCAP_NONBLOCK
pcap_setnonblock(handletopcap, 1, errstr);
#endif
-
/*start scanning */
pcap_loop(handletopcap,-1,process_packets,NULL);
@@ -139,6 +54,7 @@ void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_ch
pinfoptr->isvalid = 0;
pinfoptr->pktlen = pkthdr->len;
+
if (caplen < IEEE802_11_FC_LEN)
{
/* This is a garbage packet, because is does not long enough
@@ -182,6 +98,7 @@ void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_ch
case ST_BEACON:
if (handle_beacon(fc, packet,pinfoptr) ==0)
{
+ printf ("\n\tOn network : %s",pinfoptr->ssid);
if (!strcmp(pinfoptr->desthwaddr,"ff:ff:ff:ff:ff:ff") == 0)
{
/* Every beacon must have the broadcast as destination
@@ -189,6 +106,7 @@ void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_ch
pinfoptr->isvalid = 0;
return;
}
+
if (pinfoptr->cap_ESS == pinfoptr->cap_IBSS)
{
/* Only one of both are possible, so must be
@@ -328,6 +246,7 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo)
ppinfo->ssid_len = pbody.ssid.length;
}
break;
+
case E_CHALLENGE:
memcpy(&(pbody.challenge),p+offset,2); offset += 2;
if (pbody.challenge.length > 0)
@@ -364,7 +283,7 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo)
break;
} /* end of switch*/
} /* end of for loop */
- return 1;
+ return 0;
} /* End of handle_beacon */
diff --git a/noncore/net/wellenreiter/daemon/source/sniffer.hh b/noncore/net/wellenreiter/daemon/source/sniffer.hh
index 7f45be6..d262353 100644
--- a/noncore/net/wellenreiter/daemon/source/sniffer.hh
+++ b/noncore/net/wellenreiter/daemon/source/sniffer.hh
@@ -13,19 +13,9 @@
#include <arpa/inet.h>
#include <net/bpf.h>
-#define DEFAULT_PATH "/proc/driver/aironet/%s/Config"
-#define CARD_TYPE_CISCO 1
-#define CARD_TYPE_NG 2
-#define CARD_TYPE_HOSTAP 3
#define NONBROADCASTING "non-broadcasting"
-/* only for now, until we have the daemon running */
-/*the config file should provide these information */
-#define SNIFFER_DEVICE "wlan0"
-#define CARD_TYPE CARD_TYPE_CISCO
-#define SBIN_PATH "/sbin/ifconfig %s promisc up"
-#define WLANCTL_PATH "/sbin/wlanctl-ng"
/* holds all the interresting data */
struct packetinfo
@@ -48,10 +38,7 @@ struct packetinfo
/* Prototypes */
-
int sniffer(void);
-int card_into_monitormode (char * device, int cardtype);
-int card_set_promisc_up (char * device);
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);