javanetsim-cvs

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

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

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

Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** icescan.cc	12 Dec 2006 19:59:15 -0000	1.7
--- icescan.cc	12 Dec 2006 20:34:03 -0000	1.8
***************
*** 169,175 ****
                              }				
                      }else{				
!                            // DBGOUTPUT("Target is: " <<  argv[i]);		
!                             par->target = (char *) malloc( strlen(argv[i]) );
!                             strcpy(par->target, argv[i]);
                      }
  
--- 169,175 ----
                              }				
                      }else{				
!                            //DBGOUTPUT("Target is: " <<  argv[i]);		
!                             par->target.assign(argv[i]);
!                             DBGOUTPUT(par->target);		
                      }
  
***************
*** 218,222 ****
      par.by_default_init();	
  
!     if(par.target == NULL){
          out << "No target hosts/networks specified!" << iceoutput::endl;
          return 1;
--- 218,222 ----
      par.by_default_init();	
  
!     if(par.target.empty()){
          out << "No target hosts/networks specified!" << iceoutput::endl;
          return 1;

Index: iceparams.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/iceparams.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** iceparams.h	12 Dec 2006 19:59:15 -0000	1.4
--- iceparams.h	12 Dec 2006 20:34:03 -0000	1.5
***************
*** 27,31 ****
      // Target
  
!     char *target;
  
      // PreScan settings
--- 27,31 ----
      // Target
  
!     icestring target;
  
      // PreScan settings
***************
*** 92,96 ****
      }
  
!     ~iceparams(){ delete target; }
  
      void by_default_init(){
--- 92,96 ----
      }
  
!     ~iceparams(){ }
  
      void by_default_init(){

Index: ctarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/ctarget.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ctarget.h	12 Dec 2006 19:59:15 -0000	1.4
--- ctarget.h	12 Dec 2006 20:34:03 -0000	1.5
***************
*** 35,40 ****
      }
      
!     int add_subtargets(char *hostname){
! 		int st = get_ips_byhost(hostname, subtargets_addresses);
                  
                  icestring rev_hostname(hostname);
--- 35,40 ----
      }
      
!     int add_subtargets(icestring hostname){
! 		int st = get_ips_byhost(hostname.c_str(), subtargets_addresses);
                  
                  icestring rev_hostname(hostname);