X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fhdw-sniff.git;a=blobdiff_plain;f=parse.c;fp=parse.c;h=0da5e6fc9d6efe6ece0e71bd87bd810ae400a833;hp=3dc430116248ba11415528851e34ed28d56daaa6;hb=0f2d363e4506da5d761c082fd20d450544539bbc;hpb=e50628262f7c057bde544019c12b2d06d286903d

diff --git a/parse.c b/parse.c
index 3dc4301..0da5e6f 100644
--- a/parse.c
+++ b/parse.c
@@ -52,16 +52,18 @@ void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,cons
   t_sta new_sta;
   t_sta *sta;
   unsigned char *package=NULL;
-  //t_frame4_hdr *f4hdr;
+  t_frame4_hdr *f4hdr;
   t_frame3_hdr *f3hdr;
   //t_frame2_hdr *f2hdr;
   //t_frame1_hdr *f1hdr;
   t_beacon_fb *beacon_fb;
+  unsigned char *data;
   t_prism_hdr *prismhdr=NULL;
   int ret;
   char string[MESSAGE_MAX];
   char sc[MAX_SYSCALL_CHARS];
   unsigned char new;
+  unsigned char foo;
 
   info=(t_info *)ptr;
 
@@ -69,6 +71,7 @@ void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,cons
 
   memset(&new_sta,0,sizeof(t_sta));
   new=0;
+  foo=0;
 
   if(info->dump_fd!=0) {
     ret=write(info->dump_fd,pcap_header,sizeof(struct pcap_pkthdr));
@@ -79,9 +82,7 @@ void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,cons
       display_console(info,"warning, package write failed!");
   }
   
-  /* maybe there is offset to the actual ieee802.11 frame,
-     for example prism header ...
-     in that case, hack the source! */
+  /* prism or ieee802.11 header ? */
   if(info->mode&MODE_IEEE80211) {
     package=(unsigned char *)pkg;
     prismhdr=NULL;
@@ -146,6 +147,55 @@ void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,cons
   /* data */
   else if(FCTL_TYPE(package[0])==FCTL_TYPE_DATA) {
     info->count_d++;
+
+    //if(FCTL_STYPE(package[0])==FCTL_STYPE_DATA) {
+      if(FCTL_TODS(package[0])&FCTL_FROMDS(package[0])) {
+        f4hdr=(t_frame4_hdr *)package;
+        data=package+sizeof(t_frame4_hdr);
+        memcpy(new_sta.addr,f4hdr->addr4,ADDR_LEN);
+        foo=1;
+      }
+      else {
+        f3hdr=(t_frame3_hdr *)package;
+        data=package+sizeof(t_frame3_hdr);
+        if(FCTL_TODS(package[0])) {
+          memcpy(new_sta.addr,f3hdr->addr2,ADDR_LEN);
+          memcpy(new_sta.bssid,f3hdr->addr1,ADDR_LEN);
+        }
+        else if(FCTL_FROMDS(package[0])) {
+          memcpy(new_sta.addr,f3hdr->addr3,ADDR_LEN);
+          memcpy(new_sta.bssid,f3hdr->addr2,ADDR_LEN);
+        }
+        else {
+          memcpy(new_sta.addr,f3hdr->addr2,ADDR_LEN);
+          memcpy(new_sta.bssid,f3hdr->addr3,ADDR_LEN);
+        }
+      }
+      ret=list_search_data(&(info->sniffed_sta),&new_sta,ADDR_LEN);
+      if((ret==L_EMPTY_LIST)|(ret==L_NO_SUCH_ELEMENT)) {
+        list_add_element(&(info->sniffed_sta),&new_sta,sizeof(t_sta));
+        sta=(t_sta *)info->sniffed_sta.current->data;
+        new=1;
+      }
+      else sta=(t_sta *)info->sniffed_sta.current->data;
+      // fill in stuff ...
+      sta->count_data++;
+      switch_active_state(&(sta->active));
+      if(info->mode&MODE_IEEE80211) sta->sq=0;
+      else if(info->mode&MODE_PRISM)
+        sta->sq=(prismhdr->signal.data)-(prismhdr->noise.data);
+      if(new) {
+        strcpy(sc,"flite 'new station. data package'");
+        system(sc);
+      }
+      if(foo) {
+        sta->wds=1;
+        strcpy(sc,"flite 'wds package'");
+        system(sc);
+      }
+      memcpy(sta->snap,data,6);
+    //}
+
     display_console(info,"last: got data frame");
   }