fc

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

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 1773b99..3aa657b 100644 (file)
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -60,7 +60,7 @@ int main(int argc, char *argv[]) {
        if(atoi(argv[2])==1) {
                printf("setting to monitor mode\n");
                if(strncmp(argv[1],"wlan",4)==0)
-                       sprintf(sys_call,"iwpriv %s monitor 2",argv[1]);
+                       sprintf(sys_call,"iwpriv %s monitor 3",argv[1]);
                if(strncmp(argv[1],"eth",3)==0)
                        sprintf(sys_call,"ifconfig %s promisc",argv[1]);
        system(sys_call);
@@ -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;
@@ -142,39 +143,42 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
        printf("pcap header:\n");
        printf("capture_length: %d (dec.)\t",pcap_header->caplen);
        printf("length(off wire): %d (dec.)\n",pcap_header->len);
-       
+
+       /* wireless stuff */
        /* prism wlan ng headers */
        if((my_info_struct->mmode-0x30==1) && 
                (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);
-       /* skip wlan_ng_prism header */
-       // package=package+p_o;
-
+       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);
        
-       printf("debug:\n");
-       for(i=0;i<16;i++) {
-               printf("%x -> ",1<<i);
-               printf("%x\n",(ntohs(w_hdr->frame_ctl) & (1<<i)));
-       }
-       printf("frame_control: %x duration_id: %x\n",ntohs(w_hdr->frame_ctl),
-                                               ntohs(w_hdr->duration_id));
+       printf("fc: ");
+       for(i=0;i<16;i++)
+               printf("%s%d%s",(i==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");
+       printf("debug: %d\n",(w_hdr->frame_ctl)<<15);
+       if((w_hdr->frame_ctl & IEEE802_11_STYPE_BEACON)>0) strcpy(tmp_buf,"beacon");
+       else strcpy(tmp_buf,"unknown");
+
+       printf("=> %s\n",tmp_buf);
+       
+       printf("duration/id: %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");
-       // printf("type: 
-       /* skip ieee802.11 header */
-       // package=package+w_o;
        }
 
        /* 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 ? */
@@ -207,21 +211,21 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
                        ip_hdr->daddr&0xff<<i,
                        (i==0?"\n":"."));
                }
-               // printf("ip_addresses: source = ");
-               // printf("%s\tdestination = %s\n",inet_ntoa(ip_hdr->saddr),
-               //                              inet_ntoa(ip_hdr->daddr));
                printf("ip_id = %x ",ntohs(ip_hdr->id));
                printf("ip_offset = %x \n",ntohs(ip_hdr->frag_off));
                printf("time2live = %x ip_proto = %x\n",ntohs(ip_hdr->ttl),
                                                ntohs(ip_hdr->protocol));
                // printf("chksum: %x\n",ntohs(ip_hdr->ip_sum));
        }
-       printf("all ethernet dump: (hex)\n");
-       for(i=p_o+w_o+e_o;i<pcap_header->caplen;i++)
+       }
+
+       /* check what we have ... */
+       printf("all dump: (hex)\n");
+       for(i=p_o+w_o;i<pcap_header->caplen;i++)
                printf("%x ",*(package+i));
        printf("\n");
-       printf("all ethernet dump: (char)\n");
-       for(i=p_o+w_o+e_o;i<pcap_header->caplen;i++)
+       printf("all dump: (char)\n");
+       for(i=p_o+w_o;i<pcap_header->caplen;i++)
                printf("%c ",*(package+i));
        printf("\n");
 }