X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fhdw-sniff.git;a=blobdiff_plain;f=parse.c;h=b325728ad47eb638ec7ae6bcd83283bcfab02f06;hp=bae6cd9c3cac35f5838ee6f42d1ac1a53f25ffd1;hb=c191ef245532c978ebdfbcb25056500fab9eb638;hpb=e0585c09c6eca4aa0af0a5a658e6e711fb76d3a5

diff --git a/parse.c b/parse.c
index bae6cd9..b325728 100644
--- a/parse.c
+++ b/parse.c
@@ -6,7 +6,6 @@
  */
 
 #include "parse.h"
-//#include "802.11b.h"
 #include "main.h"
 
 /* all the parsing stuff will go here
@@ -18,28 +17,48 @@ void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,cons
 
   t_info *info;
   int i;
-  t_sta sniffed_sta;
+  t_sta new_sta;
+  t_frame4_hdr *f4hdr;
+  t_frame3_hdr *f3hdr;
+  t_frame2_hdr *f2hdr;
+  t_frame1_hdr *f1hdr;
+  t_beacon_fb *beacon_fb;
   int ret;
 
   info=(t_info *)ptr;
 
   info->count++;
 
+  memset(&new_sta,0,sizeof(t_sta));
+
   if(info->dump_fd!=0) {
     ret=write(info->dump_fd,pcap_header,sizeof(struct pcap_pkthdr));
     if(ret!=sizeof(struct pcap_pkthdr))
-      display_console(info->display,"warning, pcap header write failed!");
+      display_console(info,"warning, pcap header write failed!");
     ret=write(info->dump_fd,package,pcap_header->caplen);
     if(ret!=pcap_header->caplen)
-      display_console(info->display,"warning, package write failed!");
+      display_console(info,"warning, package write failed!");
   }
   
   /* maybe there is offset to the actual ieee802.11 frame,
      for example prism header ... */
 
+  if(FCTL_TYPE(package[0])==FCTL_TYPE_MGMT) {
+    if(FCTL_STYPE(package[0])==FCTL_STYPE_BEACON)
+      f3hdr=(t_frame3_hdr *)package;
+      beacon_fb=(t_beacon_fb *)package+sizeof(t_frame3_hdr);
+    dprintf(info->log_fd,"beacon: ");
+    for(i=0;i<ADDR_LEN;i++) dprintf(info->log_fd,"%02x ",*((f3hdr->addr2)+i));
+    dprintf(info->log_fd,"  essid: ");
+    for(i=0;i<beacon_fb->ssid_length;i++)
+      dprintf(info->log_fd,"%c ",(beacon_fb->ssid)+i);
+    dprintf(info->log_fd,"\n");
+  }
 
-  /* go on parsing frame ctl header here ... */
-
-  return 23;
+  else {
+    dprintf(info->log_fd,"other: ");
+    for(i=0;i<16;i++) dprintf(info->log_fd,"%02x ",package[i]);
+    dprintf(info->log_fd,"\n");
+  }
 
 }