[Javanetsim-cvs] IceScan icescan.cc, 1.36, 1.37 icediscover.h, 1.30, 1.31

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	icescan.cc icediscover.h 
Log Message:
no message

Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** icescan.cc	17 Dec 2006 21:03:17 -0000	1.36
--- icescan.cc	18 Dec 2006 07:51:56 -0000	1.37
***************
*** 9,27 ****

  void print_help(char *name){
! 	printf("\nUSAGE:  %s [options] [scan type] target\n"
! 			"\t target can be hostname or IP address.\n"
! 			"WHOLE PROGRAM:\n"
! 			"\t-v[v[v[v]]]]: verbose levels\n"
! 			"HOST DISCOVERY:\n"
              "\t default is PA and PE.\n"
! 			"\t-P0: skip host discovery\n"
! 			"\t-PA: ACK Ping host discovery\n"
              "\t-PR: ARP host discovery\n"
! 			"\t-PE/PT/PM: ICMP Echo/Timestamp/Mask host discovery\n"
! 			"\t-PU: UDP Ping discovery\n"
!             "\t-r: no reverse-dns lookups\n"
! 			"SCAN TYPES:\n"
              "\t default id tcp connect()\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"
--- 9,27 ----

  void print_help(char *name){
!     printf("\nUSAGE:  %s [options] [scan type] target\n"
!             "\t target can be hostname or IP address.\n"
!             "WHOLE PROGRAM:\n"
!             "\t-v[v[v[v]]]]: verbose levels\n"
!             "HOST DISCOVERY:\n"
              "\t default is PA and PE.\n"
!             "\t-P0: skip host discovery\n"
!             "\t-PA: ACK Ping host discovery\n"
              "\t-PR: ARP host discovery\n"
!             "\t-PE/PT/PM: ICMP Echo/Timestamp/Mask host discovery\n"
!             "\t-PU: UDP Ping discovery\n"
!             "\t-n: disable reverse-dns lookups\n"
!             "SCAN TYPES:\n"
              "\t default id tcp connect()\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"
***************
*** 31,45 ****
              "\t--scanflags <flags>: Customize TCP scan flags (SF/SX/SN scans)\n"
              "PORTS SPECIFICATION:\n"
! 			"\t-p <port range>: specify port range to scan (default 1-1024).\n"
! 			"\t   You can use: 1-10; 1; 1-10,12-14; etc.\n"
! 			"INTERFACES AND SPOOFING:\n"
! 			"\t--list-interfaces: list all interfaces\n"
! 			"\t-i <iface-number>: use interface <iface-number> for pcap/source interface.\n"
!                         "\t--send-eth: use channel(2) level to send raw packets.\n"
!                         "\t--send-ip: use network(3) level to send raw packets.\n"
! 			"MISC:\n"
!             "\t--uid0: assume that the current user is fully privileged.\n"                        
! 			"\t-V: print version and exit\n"
! 			"\t-?: this message\n\n", name);
  }

--- 31,45 ----
              "\t--scanflags <flags>: Customize TCP scan flags (SF/SX/SN scans)\n"
              "PORTS SPECIFICATION:\n"
!             "\t-p <port range>: specify port range to scan (default 1-1024)\n"
!             "\t   You can use: 1-10; 1; 1-10,12-14; etc.\n"
!             "INTERFACES AND SPOOFING:\n"
!             "\t--list-interfaces: list all interfaces\n"
!             "\t-i <iface-number>: use interface <iface-number> for pcap/source interface\n"
!             "\t--send-eth: use channel(2) level to send raw packets\n"
!             "\t--send-ip: use network(3) level to send raw packets\n"
!             "MISC:\n"
!             "\t--uid0: assume that the current user is fully privileged\n"                        
!             "\t-V: print version and exit\n"
!             "\t-?: this message\n\n", name);
  }

***************
*** 165,169 ****
                                                      break;

!                                                 case 'r':
                                                      par->reverse_dns = false;
                                                      break;
--- 165,169 ----
                                                      break;

!                                                 case 'n':
                                                      par->reverse_dns = false;
                                                      break;
***************
*** 174,183 ****
                                                      break;

! 												case 'i':
! 													if(i+1 < argc){ //UGLY, need more check!!!
! 														par->source_iface = atoi(argv[i+1]);
! 													}
! 													i++;
! 													break;

                                                  case 'S':
--- 174,183 ----
                                                      break;

!                                                 case 'i':
!                                                         if(i+1 < argc){ //UGLY, need more check!!!
!                                                                 par->source_iface = atoi(argv[i+1]);
!                                                         }
!                                                         i++;
!                                                         break;

                                                  case 'S':

Index: icediscover.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** icediscover.h	17 Dec 2006 19:52:23 -0000	1.30
--- icediscover.h	18 Dec 2006 07:51:56 -0000	1.31
***************
*** 23,42 ****

  	csocket s(AF_INET, (int) SOCK_STREAM);

  	if(par->verbose>0)
  		*out << "Starting ack host discovery (aka ACK ping)..." << iceoutput::endl;	

! 	int rc = s.connect(hostname, ACK_PING_STANDART_PORT, 4);

! 	s.shutdown();

! #ifdef WIN32
! 	if(rc != SOCKET_ERROR && rc != ICESOCK_TIMEOUT){
! #else
! 	if(!rc){
! #endif
! 		if(par->verbose>0) *out << "Ack host discovery successfull!" << iceoutput::endl;	
! 		return true;		 
! 	}

  	return false;
--- 23,56 ----

  	csocket s(AF_INET, (int) SOCK_STREAM);
+         int rc = 0;

  	if(par->verbose>0)
  		*out << "Starting ack host discovery (aka ACK ping)..." << iceoutput::endl;	

!         if(!par->pa_ports.size()){
!             struct port_range pr;
!             pr.lower_port = ACK_PING_STANDART_PORT;
!             pr.upper_port = pr.lower_port;
!             par->pa_ports.push_back(pr);
!         }        
!         
!         for(int i = 0; i < par->pa_ports.size(); i++){
!             for(int j = par->pa_ports[i].lower_port; j<=par->pa_ports[i].upper_port; j++){
!                 rc = 0;
!                 rc = s.connect(hostname, j, 4);
!                 DBGOUTPUT(j);

!                 s.shutdown();

!                 #ifdef WIN32
!                     if(rc != SOCKET_ERROR && rc != ICESOCK_TIMEOUT){
!                 #else
!                     if(!rc){
!                 #endif
!                         if(par->verbose>0) *out << "Ack host discovery successfull!" << iceoutput::endl;	
!                         return true;		 
!                     }
!              }
!         }

  	return false;
***************
*** 180,184 ****
      std::map <int, scanning_port> scanning_ports;

! 	//add priv checking!

      if(par->pu_ports.size() > 0){
--- 194,198 ----
      std::map <int, scanning_port> scanning_ports;

!     //add privileges checking!!!

      if(par->pu_ports.size() > 0){
***************
*** 225,228 ****
--- 239,243 ----

      if(par->arp_discovery) if( arp_discovery(hostname, par, out) ) return true;
+     
      if(par->udp_ping_discovery) if( udp_discovery(hostname, par, out) ) return true;