completed management support.

[my-code/hdw-sniff.git] / hdw-sniff.c

diff --git a/hdw-sniff.c b/hdw-sniff.c
index bd7c54d..816e778 100644 (file)
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -120,6 +120,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
                        const u_char *package) {
        
        /* local variables */
+       char tmp_buf[20];
        struct linux_wlan_ng_prism_hdr *prism_hdr;
        struct ieee802_11_hdr *w_hdr;
        struct ethhdr *e_hdr;
@@ -136,12 +137,15 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
        e_o=sizeof(struct ethhdr);
        i_o=sizeof(struct iphdr);
 
+       /* new package */
        printf("\n");
        printf("---> package %d ---- %s",my_info_struct->count,
                        ctime((const time_t*)&(pcap_header->ts.tv_sec)));
-       printf("pcap header:\n");
-       printf("capture_length: %d (dec.)\t",pcap_header->caplen);
-       printf("length(off wire): %d (dec.)\n",pcap_header->len);
+       
+       /* pcap header */
+       printf("pcap header: ");
+       printf("capture_length(dec): %d\t",pcap_header->caplen);
+       printf("off_wire_length(dec): %d\n",pcap_header->len);
 
        /* wireless stuff */
        /* prism wlan ng headers */
@@ -149,9 +153,9 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
                (strncmp(my_info_struct->dev,"wlan",4)==0)) {
        printf("prism header: (%d bytes)\n",p_o);
        prism_hdr=(struct linux_wlan_ng_prism_hdr *)package;
-       printf("message code/length: %d/%d\n",ntohs(prism_hdr->msgcode),
-                                               ntohs(prism_hdr->msglen));
-       printf("device: %s\n",prism_hdr->devname);
+       printf("| message code/length: %d/%d |\t",prism_hdr->msgcode,
+                                               prism_hdr->msglen);
+       printf("device: %s |\n",prism_hdr->devname);
        /* ieee802.11 header */
        printf("ieee802.11 header: (%d bytes)\n",w_o);
        w_hdr=(struct ieee802_11_hdr *)(package+p_o);
@@ -159,17 +163,50 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
        printf("fc: ");
        for(i=0;i<16;i++)
                printf("%s%d%s",(i==0?"|":""),
-                               ((ntohs(w_hdr->frame_ctl) & (1<<i))>0?1:0),
+                               (((w_hdr->frame_ctl) & (1<<i))>0?1:0),
                                (i==15?"|\n":"|"));
+       printf("    | v | t |  s-t  |t|f|m|r|p|m|w|o|\n");
+       /* frame type */
+       /* management */
+       if(!(w_hdr->frame_ctl & 0x0c)) {
+       if((w_hdr->frame_ctl & IEEE802_11_STYPE_ASSOC_REQ)>0)
+               strcpy(tmp_buf,"association request");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_ASSOC_RESP)>0)
+               strcpy(tmp_buf,"association response");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_REASSOC_REQ)>0)
+               strcpy(tmp_buf,"reassociation request");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_REASSOC_RESP)>0)
+               strcpy(tmp_buf,"reassociation response");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_PROBE_REQ)>0)
+               strcpy(tmp_buf,"probe request");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_PROBE_RESP)>0)
+               strcpy(tmp_buf,"probe response");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_BEACON)>0)
+               strcpy(tmp_buf,"beacon");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_ATIM)>0)
+               strcpy(tmp_buf,"announcement traffic indication message");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_DISASSOC)>0)
+               strcpy(tmp_buf,"disassociation");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_AUTH)>0)
+               strcpy(tmp_buf,"authentification");
+       else if((w_hdr->frame_ctl & IEEE802_11_STYPE_DEAUTH)>0)
+               strcpy(tmp_buf,"deauthentification");
+       else strcpy(tmp_buf,"impossible situation \%) - go mail the author.");
+       }
+       else strcpy(tmp_buf,"control & monitor frame types not supported yet");
+       /* print out frame type */
+       printf("=> %s\n",tmp_buf);
        
-       printf("ion_id: %x\n",ntohs(w_hdr->duration_id));
+       printf("duration/id: 0x%x\n",w_hdr->duration_id);
        printf("version check ... %s\n",
-       ((ntohs(w_hdr->frame_ctl) & IEEE802_11_FCTL_VERS)==0x00)?
+       ((w_hdr->frame_ctl & IEEE802_11_FCTL_VERS)==0x00)?
                                                        "ok":"unknown");
        }
 
        /* ieee802.3 */
        /* ethernet */
+       if((strncmp(my_info_struct->dev,"eth",3)==0) | 
+               ((w_hdr->frame_ctl & IEEE802_11_FTYPE_DATA)>0)) {
        printf("ethernet: (%d bytes)\n",e_o);
        e_hdr=(struct ethhdr *)(package+p_o+w_o);
        /* what types ? */
@@ -208,6 +245,9 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
                                                ntohs(ip_hdr->protocol));
                // printf("chksum: %x\n",ntohs(ip_hdr->ip_sum));
        }
+       }
+
+       /* check what we have ... */
        printf("all dump: (hex)\n");
        for(i=p_o+w_o;i<pcap_header->caplen;i++)
                printf("%x ",*(package+i));