X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fhdw-sniff.git;a=blobdiff_plain;f=main.c;h=fda8c45b18a393bf96824712b812e005967001fe;hp=2c5a41f7e437928566cd4a02b10878b235084f46;hb=9dbed1c13fcd9df91f6bad2654f1634d5628f72d;hpb=c9575c4e105d074120e573587cbf7e7de9a0b5ab

diff --git a/main.c b/main.c
index 2c5a41f..fda8c45 100644
--- a/main.c
+++ b/main.c
@@ -13,21 +13,49 @@
 
 int display_console(t_info *info,char *string) {
 
-  int x,y;
+  int x,y,size;
   t_display *display;
+  char help[32];
 
   display=(t_display *)&(info->display);
 
   x=display->max_x-1;
   y=display->max_y-1;
 
+  size=strlen(string);
+
   display_line(display,0,0,2,0,'-');
-  display_string(display,4,0,"essid",5);
-  display_line(display,10,0,x,0,'-');
+  display_string(display,4,0,"sta",3);
+  display_line(display,8,0,12,0,'-');
+
+  display_string(display,13,0,"bssid",5);
+  display_line(display,19,0,23,0,'-');
+
+  display_string(display,25,0,"M",1);
+  display_line(display,27,0,x,0,'-');
 
   //display_line(display,0,0,0,y,'|');
   //display_line(display,x,0,x,y,'|');
 
+  /* footer */
+  display_line(display,0,y-3,x,y-3,'-');
+
+  memset(help,0,32);
+  snprintf(help,32,"total: %06d",info->count);
+  display_string(display,3,y-2,help,13);
+
+  memset(help,0,32);
+  snprintf(help,32,"management: %06d",info->count_m);
+  display_string(display,18,y-2,help,18);
+
+  memset(help,0,32);
+  snprintf(help,32,"control: %06d",info->count_c);
+  display_string(display,38,y-2,help,15);
+
+  memset(help,0,32);
+  snprintf(help,32,"data: %06d",info->count_d);
+  display_string(display,55,y-2,help,12);
+
   display_line(display,0,y-1,x,y-1,'-');
 
   display_draw(display);
@@ -103,6 +131,7 @@ int usage(void) {
   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-h \tdisplay this help message");
   puts("");
 
@@ -116,7 +145,8 @@ int hop_channel(t_event *event,void *ptr) {
 
   info=(t_info *)ptr;
 
-  if(info->current_channel>=CHANNEL_MAX) info->current_channel=1;
+  if((info->current_channel>CHANNEL_MAX)|(info->current_channel==0))
+    info->current_channel=1;
   memset(&iwreq,0,sizeof(iwreq));
   strcpy(iwreq.ifr_name,info->device);
   iwreq.u.freq.e=0;
@@ -126,15 +156,15 @@ int hop_channel(t_event *event,void *ptr) {
     perror("ioctl");
     return -23;
   }
- ++(info->current_channel);
- return 23;
+  ++(info->current_channel);
+
+  return 23;
 }
 
 int main(int argc, char **argv) {
 
   t_info info;
   int pcap_fd;
-  int logfd;
   int i;
   char sys_call[MAX_SYSCALL_CHARS];
   char pcap_error[PCAP_ERRBUF_SIZE];
@@ -142,12 +172,9 @@ int main(int argc, char **argv) {
   memset(&info,0,sizeof(t_info));
  
  /* parse arguments */
- for(i=1;i<argc;i++)
- {
-  if(argv[i][0]=='-')
-  {
-   switch(argv[i][1])
-   {
+ for(i=1;i<argc;i++) {
+  if(argv[i][0]=='-') {
+   switch(argv[i][1]) {
     case 'h':
      usage();
     case 'm':
@@ -166,12 +193,19 @@ int main(int argc, char **argv) {
      ++i;
      break;
     case 'l':
-     if ((info.logfile_fd=open(argv[i+1],O_RDWR|O_CREAT))!=0)
+     if((info.log_fd=open(argv[i+1],O_RDWR|O_CREAT))!=0)
       printf("logfile -> %s\n",argv[i+1]);
      else
       puts("warning: can't write to logfile.");
      ++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.");
+     ++i;
+     break;
     case 'd':
      strncpy(info.device,argv[i+1],MAX_DEV_CHARS);
      ++i;
@@ -192,12 +226,18 @@ int main(int argc, char **argv) {
   puts("set monitoring mode ...");
   system(sys_call);
  }
- sprintf(sys_call,"ifconfig %s up",info.device);
+ sprintf(sys_call,"/sbin/ifconfig %s up",info.device);
  puts("setting up device ...");
  system(sys_call);
 
- // todo
- logfd=open("/tmp/hdw-sniff.log",O_WRONLY|O_CREAT);
+ if(info.log_fd==0) {
+   if((info.log_fd=open("/tmp/hdw-sniff.log",O_RDWR|O_CREAT))!=0)
+     puts("using logfile /tmp/hdw-sniff.log ...");
+   else {
+     puts("failed to open logfile ...");
+     return -23;
+   }
+ }
 
  /* pcap */
  if((info.pcap_handle=pcap_open_live(info.device,BUFSIZ,1,-1,pcap_error))==NULL)
@@ -211,18 +251,20 @@ int main(int argc, char **argv) {
  /* socket fd for channel hopping */
  info.channel_hop_fd=socket(AF_INET,SOCK_DGRAM,0);
 
- display_init(&(info.display),logfd);
+ display_init(&(info.display),info.log_fd);
 
- input_init(&(info.input),logfd);
+ input_init(&(info.input),info.log_fd);
  //input.mode=CONTENT_BUFFER;
  input_ios_init(&info.input);
 
- event_init(&(info.event),logfd);
+ event_init(&(info.event),info.log_fd);
  event_set_timeout(&(info.event),HOP_SEC,HOP_USEC);
 
  event_math(0,&(info.event),READ,ADD);
  event_math(pcap_fd,&(info.event),READ,ADD);
 
+ list_init(&(info.sniffed_sta),info.log_fd);
+
  display_console(&info,"foo");
 
  event_start(&(info.event),&info,react_on_event,hop_channel);
@@ -237,5 +279,4 @@ int main(int argc, char **argv) {
  puts("bugreports: hackbard@hackdaworld.org");
 
  return 23;
-
 }