javanetsim-cvs

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

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

Modified Files:
	nbt_wrapper.h icediscover.h csubtarget.h 
Log Message:
no message

Index: csubtarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** csubtarget.h	12 Dec 2006 20:33:24 -0000	1.8
--- csubtarget.h	12 Dec 2006 20:40:19 -0000	1.9
***************
*** 111,115 ****
                      
                      cprotocol_scan cps(par, out);
!                     cps.test(hostname.c_str());
                      
                  }
--- 111,115 ----
                      
                      cprotocol_scan cps(par, out);
!                     //cps.test(hostname.c_str());
                      
                  }

Index: icediscover.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** icediscover.h	29 Nov 2006 12:51:01 -0000	1.3
--- icediscover.h	12 Dec 2006 20:40:19 -0000	1.4
***************
*** 21,25 ****
  };
  
! bool tcp_ack_ping(char *hostname, iceparams *par, iceoutput *out){	
  	
  	csocket s(AF_INET, (int) SOCK_STREAM);
--- 21,25 ----
  };
  
! bool tcp_ack_ping(const char *hostname, iceparams *par, iceoutput *out){	
  	
  	csocket s(AF_INET, (int) SOCK_STREAM);
***************
*** 77,81 ****
  }
  
! bool icmp_echo_ping(char *hostname, iceparams *par, iceoutput *out){	
  	
  	if(!getuid()){
--- 77,82 ----
  }
  
! bool icmp_echo_ping(const char *hostname, iceparams *par, iceoutput *out){	
!         char *t_hostname = (char *) malloc(strlen(hostname) + 1);
  	
  	if(!getuid()){
***************
*** 94,98 ****
  		struct discover_thread_params dtp;
  		
! 		dtp.hostname = hostname;
  		dtp.par = par;
  		dtp.out = out;
--- 95,99 ----
  		struct discover_thread_params dtp;
  		
! 		dtp.hostname = t_hostname;
  		dtp.par = par;
  		dtp.out = out;
***************
*** 118,122 ****
  			if(icmp -> icmp_type == ICMP_ECHOREPLY && icmp->icmp_id == getpid() && icmplen > 16){				
  				if(par->verbose>0)
! 					out->line("Recieved icmp ping host discovery reply (echo_reply)...");			
  				return true;
  			}		
--- 119,124 ----
  			if(icmp -> icmp_type == ICMP_ECHOREPLY && icmp->icmp_id == getpid() && icmplen > 16){				
  				if(par->verbose>0)
! 					out->line("Recieved icmp ping host discovery reply (echo_reply)...");	
!                                 free(t_hostname);
  				return true;
  			}		
***************
*** 129,132 ****
--- 131,136 ----
  		out->line("UID isn't 0, so can't create raw socket => no ICMP ping...");	
  	
+         free(t_hostname);
+         
  	return false;
  }
***************
*** 134,138 ****
  
  
! bool host_discover(char *hostname, iceparams *par, iceoutput *out){
      
      if(par->verbose>0)
--- 138,142 ----
  
  
! bool host_discover(const char *hostname, iceparams *par, iceoutput *out){
      
      if(par->verbose>0)

Index: nbt_wrapper.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/nbt_wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nbt_wrapper.h	28 Nov 2006 17:57:54 -0000	1.1
--- nbt_wrapper.h	12 Dec 2006 20:40:19 -0000	1.2
***************
*** 198,202 ****
      }
  
!     int test(char *hostname, int port){
          char message[NBT_MSGSIZE];
          char local_hostname[80];
--- 198,202 ----
      }
  
!     int test(const char *hostname, int port){
          char message[NBT_MSGSIZE];
          char local_hostname[80];
***************
*** 255,259 ****
  
  
! int v_print_hostinfo(char *hostname, const struct nb_host_info* hostinfo, int v) {
    int i, unique;
    my_uint8_t service; 
--- 255,259 ----
  
  
! int v_print_hostinfo(const char *hostname, const struct nb_host_info* hostinfo, int v) {
    int i, unique;
    my_uint8_t service; 
***************
*** 291,295 ****
  }
  
!     int send_query(csocket &sock, char *hostname, int port, my_uint32_t rtt_base) {
      
  	struct nbname_request request;
--- 291,295 ----
  }
  
!     int send_query(csocket &sock, const char *hostname, int port, my_uint32_t rtt_base) {
      
  	struct nbname_request request;