[Javanetsim-cvs] IceScan icedbs.h, 1.7, 1.8 TODO, 1.15, 1.16 csubtarget.h, 1.51, 1.52

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

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

Modified Files:
	icedbs.h TODO csubtarget.h 
Log Message:
no message

Index: icedbs.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icedbs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** icedbs.h	18 Dec 2006 08:40:01 -0000	1.7
--- icedbs.h	19 Dec 2006 21:09:04 -0000	1.8
***************
*** 22,25 ****
--- 22,27 ----
  			std::cout << "Warning: Can't open service names database!" << std::endl;
  		} else {
+                         IceRegex re1("^(#.*|\\s*)$");
+                         IceRegex re("^([-a-z0-9*/._]+)\\s*\\W*([0-9]+)/(tcp|udp)");
  			while(!in.eof()){
  				char tmpbuf[256];
***************
*** 27,35 ****
  				in.getline(tmpbuf,256);
  
-                                 IceRegex re1("^(#.*|\\s*)$");
- 
  				if(! re1.match(tmpbuf) ){ 
!                                         IceRegex re("^([-a-z0-9*/._]+)\\s*\\W*([0-9]+)/(tcp|udp)");
!                                         
  					icestring sname = "", protocol = "", sport = "";
  						
--- 29,34 ----
  				in.getline(tmpbuf,256);
  
  				if(! re1.match(tmpbuf) ){ 
!                                        
  					icestring sname = "", protocol = "", sport = "";
  						
***************
*** 83,86 ****
--- 82,87 ----
  			std::cout << "Warning: Can't open MAC vendors database!" << std::endl;
  		} else {
+                         IceRegex re1("^(#.*|\\s*)$");
+                         IceRegex re("^([A-F0-9]+)\\s*\\W*([-a-z0-9A-Z. +]+)");
  			while(!in.eof()){
  				char tmpbuf[256];
***************
*** 88,95 ****
  				in.getline(tmpbuf,256);
  
-                                 IceRegex re1("^(#.*|\\s*)$");
- 
  				if(! re1.match(tmpbuf) ){
-                                         IceRegex re("^([A-F0-9]+)\\s*\\W*([-a-z0-9A-Z. +]+)");
                                          
  					icestring prefix = "", company = "";
--- 89,93 ----

Index: csubtarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** csubtarget.h	19 Dec 2006 18:59:16 -0000	1.51
--- csubtarget.h	19 Dec 2006 21:09:04 -0000	1.52
***************
*** 60,63 ****
--- 60,66 ----
          struct scan_socket* scan_sockets;
          
+         icestring source_ip;
+         icestring source_iface;
+         
          // *****scan parameters*****
  
***************
*** 80,83 ****
--- 83,88 ----
  			discovered = false;		
                          init_scan_sockets();
+                         
+                         source_ip = get_source_ip(hostname, source_iface);                        
  		}	
  
***************
*** 351,355 ****
                  int len;
                  int MAGIC_PORT = csocket::getMagicPort(SOCK_DGRAM, 100);
-                 char local_hostname[80];
  
                  if(par->verbose > 0)
--- 356,359 ----
***************
*** 365,369 ****
                  }
              
!                 pcap_t* p = init_pcap(par->source_iface); //check for NULL
                  
                  if(p == NULL){
--- 369,379 ----
                  }
              
!                 pcap_t* p;
!                                               
!                 if(par->source_iface)
!                     p = init_pcap(par->source_iface); 
!                 else
!                     p = init_pcap(getdev_pcap(source_iface));
!                               
                  
                  if(p == NULL){
***************
*** 374,381 ****
                  
  		len = make_sockname(saddress, hostname.c_str(), 0, domain);
! 	
!                 if(gethostname(local_hostname, 80)) exit(-1);
!                                         
!                 icestring source(local_hostname);
                  
                  init_scanning_ports(hostname, par, (int) SOCK_RAW, scanning_ports);
--- 384,389 ----
                  
  		len = make_sockname(saddress, hostname.c_str(), 0, domain);
!                                       
!                 icestring source(source_ip);
                  
                  init_scanning_ports(hostname, par, (int) SOCK_RAW, scanning_ports);

Index: TODO
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/TODO,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TODO	19 Dec 2006 18:59:16 -0000	1.15
--- TODO	19 Dec 2006 21:09:04 -0000	1.16
***************
*** 15,28 ****
  
      + Mainmon scan (-SM, FIN/ACK)
!     * Fix udp scan timeouts
!     * Fix Raw TCP scan timeouts
!     * Rewrite raw_tcp_scan to mak support ping.
      + IP Protocol Scan (-SI) 
      * do setting random window/seq(ack and seg) for raw scanning    
!     + --ttl option and ttl random generation
!     + --badchksum option
      + ARP Scan + Fingerprint
  
  -- Misc --
  
!     + automatically select right interface to scan
\ No newline at end of file
--- 15,30 ----
  
      + Mainmon scan (-SM, FIN/ACK)
!     * Fix udp scan timeouts.
!     * Fix Raw TCP scan timeouts.
!     * Rewrite raw_tcp_scan to make it support ping.
      + IP Protocol Scan (-SI) 
      * do setting random window/seq(ack and seg) for raw scanning    
!     + --ttl option and ttl random generation.
!     + --badchksum option.
!     + --source-port option.
!     + --source-ip option.
      + ARP Scan + Fingerprint
  
  -- Misc --
  
!     * test auto-selecting interface (to listen) and source ip to scan
\ No newline at end of file