[Javanetsim-cvs] IceScan icescan.cc, 1.24, 1.25 udpscan.h, 1.2, 1.3 icediscover.h, 1.17, 1.18 csubtarget.h, 1.27, 1.28

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

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

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

Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** icescan.cc	16 Dec 2006 00:29:16 -0000	1.24
--- icescan.cc	16 Dec 2006 10:02:50 -0000	1.25
***************
*** 26,29 ****
--- 26,30 ----
                          "\t-SI: IP Protocol scan\n"
                          "\t-SN/SF/SX: stealth tcp Null/FIN/XMAS scan\n"
+                         "\t-SU: udp scan.\n"
                          "\t-S0: no scan\n"
                          "\t--scanflags <flags>: Customize TCP scan flags (SF/SX/SN scans)\n"

Index: csubtarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** csubtarget.h	16 Dec 2006 03:24:16 -0000	1.27
--- csubtarget.h	16 Dec 2006 10:02:50 -0000	1.28
***************
*** 415,419 ****
  			sudp.nonblock(true);
  			sicmp.nonblock(true);
! 			sicmp.setsockopt(SOL_SOCKET, SO_RCVBUF, &recvsize, sizeof(recvsize));
  //			sicmp.setsockopt(SOL_SOCKET, SO_RCVBUF, &recvsize, sizeof(recvsize));
  			for(repeats = 0; repeats < UDP_SCAN_REPEATS; repeats++){
--- 415,419 ----
  			sudp.nonblock(true);
  			sicmp.nonblock(true);
! 			//sicmp.setsockopt(SOL_SOCKET, SO_RCVBUF, &recvsize, sizeof(recvsize));
  //			sicmp.setsockopt(SOL_SOCKET, SO_RCVBUF, &recvsize, sizeof(recvsize));
  			for(repeats = 0; repeats < UDP_SCAN_REPEATS; repeats++){
***************
*** 421,427 ****
  			    for(std::map <int, scanning_port>::iterator i = scanning_ports.begin(); i!= scanning_ports.end(); ++i){
  				if(! (*i).second.done ){
! //				    DBGOUTPUT((*i).first);
  				    sudp.sendto(destname.c_str(), (*i).first, zmsg, UDP_SCAN_ZSIZE, 0);
  				    iceusleep(100000);
  				}
  //				alreadyscan = false;
--- 421,428 ----
  			    for(std::map <int, scanning_port>::iterator i = scanning_ports.begin(); i!= scanning_ports.end(); ++i){
  				if(! (*i).second.done ){
! 				    //DBGOUTPUT((*i).first);
  				    sudp.sendto(destname.c_str(), (*i).first, zmsg, UDP_SCAN_ZSIZE, 0);
  				    iceusleep(100000);
+                                     //recvbytes = sicmp.recvfrom(recvmsg, UDP_SCAN_RECVSIZE, 0, NULL);
  				}
  //				alreadyscan = false;
***************
*** 443,448 ****
  					}
  				    }
! 				    else{			    
! 					recvbytes = sicmp.recvfrom(recvmsg, UDP_SCAN_RECVSIZE, 0, NULL);
  					
  //					if((*i).first == 444 && !alreadyscan){
--- 444,453 ----
  					}
  				    }
! 				    else{
!                                         int att = 0;
!                                         while(att++ < 5 && recvbytes <= 0){
!                                             recvbytes = sicmp.recvfrom(recvmsg, UDP_SCAN_RECVSIZE, 0, NULL);
!                                             iceusleep(100000);
!                                         }
  					
  //					if((*i).first == 444 && !alreadyscan){
***************
*** 455,461 ****
  					if(recvbytes > 0){
  					    port = parse_icmp_udp_packet(recvmsg, recvbytes, par, out);
- //					    DBGOUTPUT(port);
  					    if(port!=0 && !scanning_ports[port].done && scanning_ports.find(port) != scanning_ports.end()){
! 						scanning_ports[port].done = true;
  						set_port_status(port, PORT_CLOSED, "udp");
  					    }
--- 460,465 ----
  					if(recvbytes > 0){
  					    port = parse_icmp_udp_packet(recvmsg, recvbytes, par, out);
  					    if(port!=0 && !scanning_ports[port].done && scanning_ports.find(port) != scanning_ports.end()){
!                                                 scanning_ports[port].done = true;
  						set_port_status(port, PORT_CLOSED, "udp");
  					    }
***************
*** 463,468 ****
  					}
  					else if(recvbytes != -1){
! //					    DBGOUTPUT("NO DATA...");
! //					    DBGOUTPUT(recvbytes);
  					}
  					if(!p) rep2++;
--- 467,472 ----
  					}
  					else if(recvbytes != -1){
! 					    //DBGOUTPUT("NO DATA...");
! 					    //DBGOUTPUT(recvbytes);
  					}
  					if(!p) rep2++;

Index: icediscover.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** icediscover.h	16 Dec 2006 03:24:16 -0000	1.17
--- icediscover.h	16 Dec 2006 10:02:50 -0000	1.18
***************
*** 103,116 ****
                                  }else if(icmp -> icmp_type == ICMP_TSTAMPREPLY && icmp_type == TIMESTAMP){
                                      result = true;
!                                     if(par->verbose>0)
!                                             out->line("Recieved icmp timestamp host discovery reply.");	
!                                     
!                                     char *buf;
!                                                                        
!                                     uint32_t t = ntohl(icmp->icmp_rtime);
!                                     
!                                     DBGOUTPUT(t);
!                                     
!                                     DBGOUTPUT(make_uptime(t));
                                  }
                                  if(result){
--- 103,110 ----
                                  }else if(icmp -> icmp_type == ICMP_TSTAMPREPLY && icmp_type == TIMESTAMP){
                                      result = true;
!                                     if(par->verbose>0){
!                                         uint32_t t = ntohl(icmp->icmp_rtime);
!                                         *out << "Recieved icmp timestamp host discovery reply: "  << make_uptime(t) << ".\n";
!                                     }
                                  }
                                  if(result){

Index: udpscan.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/udpscan.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** udpscan.h	16 Dec 2006 03:24:16 -0000	1.2
--- udpscan.h	16 Dec 2006 10:02:50 -0000	1.3
***************
*** 157,161 ****
                  free(t_hostname);
  		
! 	}else out->line("UID isn't 0, so can't create raw socket => no ICMP ping...");	
          
          
--- 157,161 ----
                  free(t_hostname);
  		
! 	}else out->line("UID isn't 0, so can't create raw socket => no UDP scan...");