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

diff --git a/parse.c b/parse.c
index f60dc04..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
@@ -16,25 +15,50 @@
 
 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) {
+    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");
+  }
+
+  else {
+    dprintf(info->log_fd,"other: ");
+    for(i=0;i<16;i++) dprintf(info->log_fd,"%02x ",package[i]);
+    dprintf(info->log_fd,"\n");
+  }
 
 }