X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fhdw-sniff.git;a=blobdiff_plain;f=main.c;h=b7d0b53b7c4825a25db6763b24ec414560d616fa;hp=dee4596808cbb6b0856a3301f55eba20aa385f00;hb=0f2d363e4506da5d761c082fd20d450544539bbc;hpb=80bdf766cc69d2e685a2633b2aaa028448fbb8b3

diff --git a/main.c b/main.c
index dee4596..b7d0b53 100644
--- a/main.c
+++ b/main.c
@@ -7,8 +7,6 @@
 
 #include "main.h"
 
-// void parse_package(unsigned char *ptr,const struct pcap_pkthdr *pcap_header,const unsigned char *package);
-
 /* functions */
 
 int display_console(t_info *info,char *string) {
@@ -38,6 +36,7 @@ int display_console(t_info *info,char *string) {
     display_string(display,GUI_OFFSET_CTRL,1,"| ctrl",6);
     display_string(display,GUI_OFFSET_DATA,1,"| data",6);
     display_string(display,GUI_OFFSET_ACTIVE,1,"| act",5);
+    display_string(display,GUI_OFFSET_SIGNAL,1,"| sq",4);
     display_line(display,0,2,x,2,'-');
 
     list_reset(&(info->sniffed_sta));
@@ -57,16 +56,13 @@ int display_console(t_info *info,char *string) {
       display_string(display,GUI_OFFSET_AP,3+i,help,3);
       snprintf(help,5,"|  %c",sta->wep?'y':'n');
       display_string(display,GUI_OFFSET_WEP,3+i,help,4);
-/*
-      snprintf(help,21,"| %04d | %04d | %04d",
-               sta->count_mgmt,sta->count_ctrl,
-               sta->count_data);
-*/
-      snprintf(help,21,"| %04d | n.a. | n.a.",
-               sta->count_mgmt);
+      snprintf(help,21,"| %04d | n.a. | %04d",
+               sta->count_mgmt,sta->count_data);
       display_string(display,GUI_OFFSET_MGMT,3+i,help,20);
       snprintf(help,5,"|  %c",sta->active);
       display_string(display,GUI_OFFSET_ACTIVE,3+i,help,4);
+      snprintf(help,5,"| %02u",sta->sq);
+      display_string(display,GUI_OFFSET_SIGNAL,3+i,help,4);
       list_next(&(info->sniffed_sta));
     }
   }
@@ -80,13 +76,43 @@ int display_console(t_info *info,char *string) {
              sta->addr[0],sta->addr[1],sta->addr[2],
              sta->addr[3],sta->addr[4],sta->addr[5]);
     display_string(display,1,1,help,21);
+    if(sta->ap) strcpy(help,"(access point)");
+    else strcpy(help,"(station)");
+    s=strlen(help);
+    display_string(display,23,1,help,s);
+    if(sta->wds) {
+      strcpy(help,"wds link");
+      display_string(display,60,1,help,8);
+    }
+    snprintf(help,2,"%c",sta->active);
+    display_string(display,x-1,1,help,1);
+    snprintf(help,7,"sq: %02d",sta->sq);
+    display_string(display,x-8,1,help,6);
     display_line(display,0,2,x,2,'-');
-    display_string(display,1,3,info->clean_line,x);
     display_string(display,1,3,"ssid: ",6);
     s=strlen(sta->ssid);
     memcpy(help,sta->ssid,s);
     display_string(display,7,3,help,s);
-    display_string(display,1,5,"more specific info soon ...",27);
+    if(sta->wep) strcpy(help,"crypted");
+    else strcpy(help,"not crypted");
+    s=strlen(help);
+    display_string(display,x-s-1,3,help,s);
+
+    snprintf(help,13,"mgmt: %06d",sta->count_mgmt);
+    display_string(display,1,5,help,12);
+    snprintf(help,13,"ctrl: %06d",sta->count_ctrl);
+    display_string(display,1,6,help,12);
+    snprintf(help,13,"data: %06d",sta->count_data);
+    display_string(display,1,7,help,12);
+
+    snprintf(help,33,"ethernet snap: %02x %02x %02x %02x %02x %02x",
+             sta->snap[0],sta->snap[1],sta->snap[2],
+             sta->snap[3],sta->snap[4],sta->snap[5]);
+    display_string(display,1,9,help,32);
+    snprintf(help,25,"bssid: %02x:%02x:%02x:%02x:%02x:%02x",
+             sta->bssid[0],sta->bssid[1],sta->bssid[2],
+             sta->bssid[3],sta->bssid[4],sta->bssid[5]);
+    display_string(display,1,10,help,24);
   }
 
   /* footer */
@@ -131,17 +157,8 @@ int get_user_interaction(t_info *info) {
 
   input_get_event(&(info->input),noop,info);
 
-  /*
-  if(info->input.content[0]=='h') {
-    display_console(info,"hdw-sniff help:");
-    display_console(info,"h - print this help");
-    display_console(info,"x - enable/disable hex output");
-    display_console(info,"a - enable/disable ascii output");
-    display_console(info,"q - quit");
-    display_console(info,"console navigation: arrow up/down");
-    display_console(info,"network list navigation: page up/down");
-  }
-  */
+  /* clear display */
+  display_clear_screen(&(info->display));
 
   if(info->input.content[0]=='x') {
     info->mode^=MODE_HEXOUT;
@@ -193,7 +210,7 @@ int react_on_event(t_event *event,void *ptr) {
 int usage(void) {
   puts("usage: hdw-sniff <options>");
   puts("\toptions:");
-  puts("\t\t-m <mode> \tmonitor and/or wlanng");
+  puts("\t\t-m <mode> \tieee80211 or prism");
   puts("\t\t-d <device> \twlan0,eth0");
   puts("\t\t-l <logfile>");
   puts("\t\t-k <key> \t(string)");
@@ -244,13 +261,13 @@ int main(int argc, char **argv) {
     case 'h':
      usage();
     case 'm':
-     if(!strncmp(argv[i+1],"monitor",7)) {
-      info.mode|=MODE_MONITOR;
-      puts("will go to monitor mode.");
+     if(!strncmp(argv[i+1],"ieee80211",9)) {
+      info.mode|=MODE_IEEE80211;
+      puts("expecting ieee802.11 header in package");
      }
-     else if(!strncmp(argv[i+1],"wlanng",6)) {
-      info.mode|=MODE_WLANNG;
-      puts("expecting wlanng header in package.");
+     else if(!strncmp(argv[i+1],"prism",5)) {
+      info.mode|=MODE_PRISM;
+      puts("expecting prism header in package.");
      }
      else {
       printf("unknown mode: %s\n",argv[1]);
@@ -287,11 +304,14 @@ int main(int argc, char **argv) {
  }
 
  /* setting up device */
- if(info.mode&MODE_MONITOR) {
-  sprintf(sys_call,"iwconfig %s mode monitor",info.device);
-  puts("set monitoring mode ...");
-  system(sys_call);
- }
+ if(info.mode&MODE_IEEE80211)
+  sprintf(sys_call,"iwpriv %s monitor 2",info.device);
+ else if(info.mode&MODE_PRISM)
+  sprintf(sys_call,"iwpriv %s monitor 3",info.device);
+
+ puts("set monitoring mode ...");
+ system(sys_call);
+ 
  sprintf(sys_call,"ifconfig %s up",info.device);
  puts("setting up device ...");
  system(sys_call);