javanetsim-cvs

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/IceScan
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18981

Modified Files:
	iceparams.h icescan.cc TODO csubtarget.h 
Log Message:
no message

Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** icescan.cc	14 Dec 2006 19:45:40 -0000	1.20
--- icescan.cc	15 Dec 2006 17:15:12 -0000	1.21
***************
*** 18,30 ****
                          "\t-r: no reverse-dns lookups\n"
  			"SCAN TYPES:\n"
! 			"\t-ST: tcp connect() scan\n"
                          "\t-SB: udp NetBIOS scan\n"
                          "\t-SI: IP Protocol scan\n"
!                         "\t-SN: Null scan\n"
!                         "\t-SF: Fin scan\n"
!                         "\t-SW: window scan\n"
!                         "\t-SA: ACK scan\n"
!                         "\t-SS: SYN scan\n"
!                         "\t-S0: skip scan\n"
                          "PORTS SPECIFICATION:\n"
  			"\t-p <port range>: specify port range to scan (default 1-1024).\n"
--- 18,27 ----
                          "\t-r: no reverse-dns lookups\n"
  			"SCAN TYPES:\n"
! 			"\t-ST/SA/SS/SW: tcp connect()/ACK/SYN/Window scan\n"
                          "\t-SB: udp NetBIOS scan\n"
                          "\t-SI: IP Protocol scan\n"
!                         "\t-SN/SF/SX: stealth Null/FIN/XMAS scan\n"
!                         "\t-S0: no scan\n"
!                         "\t--scanflags <flags>: Customize TCP scan flags (SF/SX/SN scans)"
                          "PORTS SPECIFICATION:\n"
  			"\t-p <port range>: specify port range to scan (default 1-1024).\n"
***************
*** 45,49 ****
                              if(strlen(argv[i]) >= 2){
                                      if(argv[i][1] == '-'){
!                                             //DBGOUTPUT("Long option is :" <<  argv[i]);
                                      }else{				
                                              //DBGOUTPUT("Option is :" <<  argv[i]);
--- 42,79 ----
                              if(strlen(argv[i]) >= 2){
                                      if(argv[i][1] == '-'){
!                                         //DBGOUTPUT("Long option is :" <<  argv[i]);
! 
!                                         if(!strcmp(argv[i], "--scanflags")){
!                                             if(i+1 < argc){
!                                                 IceRegex re1("(URG|ACK|PSH|RST|SYN|FIN)+");
!                                                 IceRegex re2("(\\d+)");
!                                                 if(re1.match(argv[i+1])){
!                                                     short int tcpflags = 0;
!                                                     icestring flags(argv[i+1]);
!                                                     
!                                                     if(flags.find("URG", 0) != icestring::npos) tcpflags |= TH_URG;
!                                                     if(flags.find("PSH", 0) != icestring::npos) tcpflags |= TH_PUSH;
!                                                     if(flags.find("ACK", 0) != icestring::npos) tcpflags |= TH_ACK;
!                                                     if(flags.find("SYN", 0) != icestring::npos) tcpflags |= TH_SYN;
!                                                     if(flags.find("RST", 0) != icestring::npos) tcpflags |= TH_RST;
!                                                     if(flags.find("FIN", 0) != icestring::npos) tcpflags |= TH_FIN;
!                                                     
!                                                     par->tcpflags = tcpflags;
! 
!                                                 }else if(re2.match(argv[i+1])){
!                                                     par->tcpflags = atoi(argv[i+1]);
!                                                 }else{
!                                                     std::cout << "Invalid option format: " << argv[i] << " " << argv[i+1] << std::endl;
!                                                                             print_help(argv[0]);
!                                                                             exit(1); 
!                                                 }
!                                                 
!                                                 i++;
!                                             }  else { 	std::cout << "Invalid option format: " << argv[i] << std::endl;
!                                                                             print_help(argv[0]);
!                                                                             exit(1); 
!                                                             }
!                                         }
! 
                                      }else{				
                                              //DBGOUTPUT("Option is :" <<  argv[i]);
***************
*** 155,163 ****
  
                                                      break;
! 
                                                  case 'p':
  
                                                      if(i+1 < argc){						
- //                                                        IceRegex re1("(\\d|\\,|\\-)+");
  							IceRegex re1("((\\d+(-\\d+)?),?)+");
                                                          if(! re1.match(argv[i+1]) ){
--- 185,192 ----
  
                                                      break;
!                                                     
                                                  case 'p':
  
                                                      if(i+1 < argc){						
  							IceRegex re1("((\\d+(-\\d+)?),?)+");
                                                          if(! re1.match(argv[i+1]) ){
***************
*** 228,232 ****
  
  int main(int argc, char *argv[]){
! 
      ice_service_name_database isnd("services");
      ice_mac_name_database ismd("ieee-oui.txt");
--- 257,261 ----
  
  int main(int argc, char *argv[]){
!    
      ice_service_name_database isnd("services");
      ice_mac_name_database ismd("ieee-oui.txt");

Index: iceparams.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/iceparams.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iceparams.h	14 Dec 2006 19:45:40 -0000	1.8
--- iceparams.h	15 Dec 2006 17:15:12 -0000	1.9
***************
*** 58,61 ****
--- 58,63 ----
          
          int netbios_port;
+         
+         unsigned char tcpflags;
      
      // Scan Port Range
***************
*** 91,94 ****
--- 93,98 ----
  	sim_connects = 25;
          netbios_port = NBT_PORT + 10000;
+         
+         tcpflags = 0;
      }
      

Index: TODO
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/TODO,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TODO	15 Dec 2006 16:24:58 -0000	1.10
--- TODO	15 Dec 2006 17:15:12 -0000	1.11
***************
*** 23,31 ****
      * do setting random window/seq(ack and seg) for raw scanning    
      + ARP Scan + Fingerprint (??)
-     + --tcpflags NUMBER || FLAGS -- set specific tcp flags when raw tcp scan + iceparams::check_right_params()
  
  -- Misc --
  
-     + add 'send_icmp_packet' function to crawsocket.
- 
  -- Bugs --
--- 23,28 ----

Index: csubtarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** csubtarget.h	15 Dec 2006 16:35:29 -0000	1.23
--- csubtarget.h	15 Dec 2006 17:15:12 -0000	1.24
***************
*** 205,217 ****
                                      switch(par->scan_type){
                                          case FIN_SCAN:
!                                             rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 0, 0, TH_FIN, 0, 0, 0);
                                          break;
                                          
                                          case NULL_SCAN:
!                                             rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 0, 0, 0, 0, 0, 0);
                                          break;
                                          
                                          case XMAS_SCAN:
!                                             rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 0, 0, TH_FIN | TH_URG | TH_PUSH, 0, 0, 0);
                                          break;
                                          
--- 205,217 ----
                                      switch(par->scan_type){
                                          case FIN_SCAN:
!                                             rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 0, 0, TH_FIN | par->tcpflags, 0, 0, 0);
                                          break;
                                          
                                          case NULL_SCAN:
!                                             rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 0, 0, par->tcpflags, 0, 0, 0);
                                          break;
                                          
                                          case XMAS_SCAN:
!                                             rawsend.send_tcp_raw(source, hostname, MAGIC_PORT, (*i).first, 0, 0, TH_FIN | TH_URG | TH_PUSH | par->tcpflags, 0, 0, 0);
                                          break;