X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fhdw-sniff.git;a=blobdiff_plain;f=parse.c;h=647c1761751c895a7f56ba0c5c9eaf36b8d7f722;hp=f60dc044fd97c1ba73f539f5504e26319768524c;hb=9dbed1c13fcd9df91f6bad2654f1634d5628f72d;hpb=ce967f4d1e3dc10cda58062bc21aaf264e1a0f81

diff --git a/parse.c b/parse.c
index f60dc04..647c176 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
@@ -16,25 +15,56 @@
 
 void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,const unsigned char *package) {
 
- t_info *info;
- int i;
-
- info=(t_info *)ptr;
-
- info->count++;
-
- printf("---> package %d --- %s\n",
-	info->count,
-	ctime((const time_t*)&(pcap_header->ts.tv_sec)));
- if(info->mode&MODE_ASCIIOUT) {
-  puts("content in ascii:");
-  for(i=0;i<pcap_header->caplen;i++) printf("%c ",package[i]);
-  puts("");
- }
- if(info->mode&MODE_HEXOUT) {
-  puts("content in ascii:");
-  for(i=0;i<pcap_header->caplen;i++) printf("%x ",package[i]);
-  puts("");
- }
+  t_info *info;
+  int i;
+  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,"warning, pcap header write failed!");
+    ret=write(info->dump_fd,package,pcap_header->caplen);
+    if(ret!=pcap_header->caplen)
+      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) {
+    info->count_m++;
+    if(FCTL_STYPE(package[0])==FCTL_STYPE_BEACON) {
+      f3hdr=(t_frame3_hdr *)package;
+      beacon_fb=(t_beacon_fb *)(package+sizeof(t_frame3_hdr));
+      // new_sta.
+      /* debug output */
+      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: (len=%x) ",beacon_fb->ssid_length);
+      for(i=0;i<beacon_fb->ssid_length;i++)
+        dprintf(info->log_fd,"%c ",*(u8 *)(beacon_fb->ssid+i));
+      dprintf(info->log_fd,"\n");
+    }
+  }
+  else if(FCTL_TYPE(package[0])==FCTL_TYPE_CTRL) {
+    info->count_c++;
+  }
+  else if(FCTL_TYPE(package[0])==FCTL_TYPE_DATA) {
+    info->count_d++;
+  }
+
+  display_console(info,"");
 
 }