1 files changed, 2 insertions, 5 deletions

diff --git a/noncore/net/wellenreiter/daemon/source/sniffer.c b/noncore/net/wellenreiter/daemon/source/sniffer.c
index 6f40503..31a5d13 100644
--- a/noncore/net/wellenreiter/daemon/source/sniffer.c
+++ b/noncore/net/wellenreiter/daemon/source/sniffer.c
@@ -1,76 +1,73 @@
 /* Its just a simple rfmon mode sniffer
    i hope my C is at last a bit better then in my 
    early days :-).
    This works only with cisco wireless cards with an rfmon
    able driver and not with wifi stuff.
    Btw. did i mention that i hate C?
    
    To compile use:
-   gcc wlan-sniffer.c -o wlan-sniffer -lpcap
-
-        use it like this:
-                wlan-sniffer interface
+   gcc sniffer.c -o wlan-sniffer -lpcap
 
 */
 #include "sniffer.h"
 
 int main(int argc, char **argv)
 {
                 int ret;   /* return code */
         ret = card_into_monitormode (SNIFFER_DEVICE, CARD_TYPE_NG);
         if (ret == -1)
         {
                 exit(-1);
         }
                 start_sniffing (SNIFFER_DEVICE);
 
   return 0;
 }
 
 int card_into_monitormode (char * device, int cardtype)
 {
         int ret = -1;
         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");
                 exit(1);
     }
 
         /* 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 (ret = (system (wlanngcmd)) != 0)
                 {
                         printf ("\n Fatal error could not set %s in raw mode, check cardtype\n",device);
                         exit(1);
             }
         }
         else if (cardtype == CARD_TYPE_HOSTAP)
         {
                 printf ("Got a host-ap card, nothing is implemented now\n");
         }
@@ -154,129 +151,129 @@ void process_packets(u_char *useless,const struct pcap_pkthdr* pkthdr,const u_ch
         {
                 /* This is a garbage packet, because is does not long enough
                    to hold a 802.11b header */
                 pinfoptr->isvalid = 0;
                 return;
         }
 
         /* Gets the framecontrol bits (2bytes long) */
         fc = EXTRACT_LE_16BITS(packet);
 
         HEADER_LENGTH = GetHeaderLength(fc);
 
         if (caplen < HEADER_LENGTH) 
         {
                 /* This is a garbage packet, because it is not long enough
                    to hold a correct header of its type */
                 pinfoptr->isvalid = 0;
                 return;
         }
 
         /* Decode 802.11b header out of the packet */
         if (decode_80211b_hdr(packet,pinfoptr) == 0)
         {
                 /* Justification of the ofset to further process the packet */
                 length -= HEADER_LENGTH;
                 caplen -= HEADER_LENGTH;
                 packet += HEADER_LENGTH;
         }
         else
         {   /* Something is wrong,could not be a correct packet */
                 return;
         }
         
         switch (FC_TYPE(fc)) 
         {
                 /* Is it a managemnet frame? */
                 case T_MGMT:
                         switch (FC_SUBTYPE(fc))
                         {   /* Is it a beacon frame? */
                                 case ST_BEACON:
                                         if (handle_beacon(fc, packet,pinfoptr) ==0)
                                         {
                                                 if (!strcmp(pinfoptr->desthwaddr,"ff:ff:ff:ff:ff:ff") == 0)
                                                 {
                                                         /* Every beacon must have the broadcast as destination
                                                            so it must be a shitti packet */
                                                         pinfoptr->isvalid = 0;
                                                         return;
                                                 } 
                                                 if (pinfoptr->cap_ESS == pinfoptr->cap_IBSS)
                                                 {
                                                         /* Only one of both are possible, so must be 
                                                            a noise packet, if this comes up */
                                                         pinfoptr->isvalid = 0;
                                                         return;
                                                 }
                                                 if (pinfoptr->channel < 1 || pinfoptr->channel > 14)
                                                 {
                                                         /* Only channels between 1 and 14 are possible
                                                            others must be noise packets */
                                                         pinfoptr->isvalid = 0;
                                                         return;
                                                 }
                                                            
-                                                /* Decoding successfull of beacon frame */
+                                                /* Here should be the infos to the gui issued */
                                                 if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0)
                                                 {
                                                         printf ("\nHave found an accesspoint:");
                                                 }
                                                 else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 1) 
                                                 {
                                                         printf ("\nHave found an AD-HOC station:");
                                                         
                                                 }
                                                 if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0)
                                                 {
                                                         printf ("\n\tOn a non-broadcasting network");
                                                 }
                                                 else
                                                 {
                                                         printf ("\n\tOn network : %s",pinfoptr->ssid);
                                                 }
                                                         printf ("\n\tLen SSID   : %d",pinfoptr->ssid_len);
                                                         printf ("\n\tOn Channel : %d",pinfoptr->channel);
                                                         printf ("\n\tEncryption : %s", pinfoptr->cap_WEP ? "ON" : "OFF");
                                                         printf ("\n\tMacaddress : %s",pinfoptr->sndhwaddr);
                                                         printf ("\n\tBssid      : %s",pinfoptr->bssid);
                                                                 printf ("\n\tDest   : %s\n",pinfoptr->desthwaddr);
                                         }
                                         break;
                                 default:
                                         printf("Unknown IEEE802.11 frame subtype (%d)",FC_SUBTYPE(fc));
                                         break;
                         } /* End of switch over different mgt frame types */
                                                 
                         break;
                 case T_CTRL:
                                 //decode_control_frames(fc, packet);
                         printf ("Its a control frame");
                         break;
                 case T_DATA:
                         //decode_data_frames(fc, packet);
                         printf ("Its a date frame");
                         break;
                 default:
                         printf("Unknown IEEE802.11 frame type (%d)",FC_TYPE(fc));
                 break;
         }
 }
 
 
 /* This decodes the 802.11b frame header out of the 802.11b packet 
            all the infos is placed into the packetinfo structure                 */
 int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo)
 {
         char * ret;
         char testme[16];
         const struct mgmt_header_t *mgthdr = (const struct mgmt_header_t *) p;
         ppinfo->fcsubtype = FC_SUBTYPE(mgthdr->fc);
         
         /* Get the sender, bssid and dest mac address */
         etheraddr_string(mgthdr->bssid,ppinfo->bssid);
         etheraddr_string(mgthdr->da,ppinfo->desthwaddr);
         etheraddr_string(mgthdr->sa,ppinfo->sndhwaddr);
         ppinfo->fc_wep = FC_WEP(mgthdr->fc);
         return(0);
 }