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

diff --git a/main.c b/main.c
index b7d0b53..1542621 100644
--- a/main.c
+++ b/main.c
@@ -14,7 +14,7 @@ int display_console(t_info *info,char *string) {
   int x,y,size,count,cnt,i,s;
   t_display *display;
   t_sta *sta;
-  char help[32];
+  char help[128];
 
   display=(t_display *)&(info->display);
 
@@ -105,14 +105,17 @@ int display_console(t_info *info,char *string) {
     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);
+    display_string(display,1,9,help,24);
+    if(sta->wep==WEP) {
+      snprintf(help,67,"iv + keynr | crypted snap: %02x %02x %02x %02x | %02x %02x %02x %02x %02x %02x",
+               sta->snap[0],sta->snap[1],sta->snap[2],sta->snap[3],
+               sta->snap[4],sta->snap[5],sta->snap[6],sta->snap[7],
+               sta->snap[8],sta->snap[9]);
+      display_string(display,1,10,help,66);
+    }
   }
 
   /* footer */
@@ -213,8 +216,8 @@ int usage(void) {
   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)");
-  puts("\t\t-D <file> \t(dump packages to file)");
+  //puts("\t\t-k <key> \t(string)");
+  puts("\t\t-D <file> \t(dump packages to file (pcap format))");
   puts("\t\t-h \tdisplay this help message");
   puts("");
 
@@ -283,10 +286,8 @@ int main(int argc, char **argv) {
      ++i;
      break;
     case 'D':
-     if((info.dump_fd=open(argv[i+1],O_RDWR|O_CREAT))!=0)
-      printf("dump file -> %s\n",argv[i+1]);
-     else
-      puts("warning: can't dump to file.");
+     printf("dump file -> %s\n",argv[i+1]);
+     strncpy(info.dump_file,argv[i+1],128);
      ++i;
      break;
     case 'd':
@@ -334,6 +335,14 @@ int main(int argc, char **argv) {
  pcap_fd=pcap_fileno(info.pcap_handle);
  /* -> non blocking? */
 
+ /* pcap dump */
+ if(strcmp(info.dump_file,"")) {
+  if((info.dump_handle=pcap_dump_open(info.pcap_handle,info.dump_file))==NULL) {
+   puts("pcap open dump file failed");
+   return -23;
+  }
+ }
+
  /* socket fd for channel hopping */
  info.channel_hop_fd=socket(AF_INET,SOCK_DGRAM,0);
 
@@ -378,6 +387,8 @@ int main(int argc, char **argv) {
  list_shutdown(&(info.sniffed_sta));
  input_shutdown(&(info.input));
  display_shutdown(&(info.display));
+
+ if(info.dump_handle!=NULL) pcap_dump_close(info.dump_handle);
  
  puts("");
  puts("");