fixed signal quality output

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

diff --git a/parse.c b/parse.c
index 151c9f5..3dc4301 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -13,6 +13,18 @@
  * different protocols should get to seperated files though ...
  */
 
+unsigned int int_s(unsigned int val) {
+
+  unsigned int swapped;
+
+  swapped=(val&0x000000ff)<<24;
+  swapped|=(val&0x0000ff00)<<8;
+  swapped|=(val&0x00ff0000)>>8;
+  swapped|=(val&0xff000000)>>24;
+
+  return swapped;
+}
+
 int switch_active_state(char *state) {
 
   switch(*state) {
@@ -33,17 +45,19 @@ int switch_active_state(char *state) {
   return 23;
 }
 
-void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,const unsigned char *package) {
+void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,const unsigned char *pkg) {
 
   t_info *info;
   int i;
   t_sta new_sta;
   t_sta *sta;
+  unsigned char *package=NULL;
   //t_frame4_hdr *f4hdr;
   t_frame3_hdr *f3hdr;
   //t_frame2_hdr *f2hdr;
   //t_frame1_hdr *f1hdr;
   t_beacon_fb *beacon_fb;
+  t_prism_hdr *prismhdr=NULL;
   int ret;
   char string[MESSAGE_MAX];
   char sc[MAX_SYSCALL_CHARS];
@@ -68,6 +82,14 @@ void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,cons
   /* maybe there is offset to the actual ieee802.11 frame,
      for example prism header ...
      in that case, hack the source! */
+  if(info->mode&MODE_IEEE80211) {
+    package=(unsigned char *)pkg;
+    prismhdr=NULL;
+  }
+  else if(info->mode&MODE_PRISM) {
+    package=(unsigned char *)pkg+sizeof(t_prism_hdr);
+    prismhdr=(t_prism_hdr *)pkg;
+  }
 
   /* management */
   if(FCTL_TYPE(package[0])==FCTL_TYPE_MGMT) {
@@ -93,6 +115,9 @@ void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,cons
       if(CAP_INFO_PRIVACY(beacon_fb->cap_info)) sta->wep=WEP;
       sta->count_mgmt++;
       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);
       strncpy(string,"last: beacon, source: ",MESSAGE_MAX);
       for(i=0;i<ADDR_LEN;i++)
         snprintf(&string[22+3*i],4,"%02x%c",sta->addr[i],