javanetsim-cvs

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

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

Modified Files:
	iceoutput.h icescan.cc iceservice.h 
Log Message:
no message

Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** icescan.cc	30 Nov 2006 06:43:50 -0000	1.5
--- icescan.cc	30 Nov 2006 12:27:35 -0000	1.6
***************
*** 199,203 ****
  	
      ice_service_name_database isnd("services");
!     
      char version_string[255];
      
--- 199,203 ----
  	
      ice_service_name_database isnd("services");
! 
      char version_string[255];
      
***************
*** 238,241 ****
--- 238,242 ----
      
      out << "IceScan finished: " << ts.subtargets_count() << " IP address(es) (" << ts.up_subtargets_count() << " host(s) up) processed in " << timeb_diff(tp1, tp2) << " seconds." << iceoutput::endl;
+ 
      return 0;
  }

Index: iceservice.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/iceservice.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iceservice.h	30 Nov 2006 06:43:50 -0000	1.2
--- iceservice.h	30 Nov 2006 12:27:35 -0000	1.3
***************
*** 10,15 ****
  class ice_service_name_database{
  
! std::map <int, string> tcp_services;
! std::map <int, string> udp_services;
  
  public:
--- 10,15 ----
  class ice_service_name_database{
  
! std::map <int, icestring> tcp_services;
! std::map <int, icestring> udp_services;
  
  public:
***************
*** 23,35 ****
  			std::cout << "Can't open service names database!" << std::endl;
  		} else {
  			while(!in.eof()){
  				char tmpbuf[256];
  
  				in.getline(tmpbuf,256);
! 				
! 				if(! pcrecpp::RE("^(#.*|\\s*)$").FullMatch(tmpbuf) ){
  					pcrecpp::RE re("^([-a-z1-9]+)\\s*\\W*([0-9]+)/(tcp|udp)");
! 										
! 					string sname = "", protocol = "";
  					int port;
  				
--- 23,44 ----
  			std::cout << "Can't open service names database!" << std::endl;
  		} else {
+ #ifndef __CYGWIN__  //REGEXes don't work under windows? (segfault)
  			while(!in.eof()){
  				char tmpbuf[256];
  
  				in.getline(tmpbuf,256);
! 
! 				//DBGOUTPUT("!!!!");
! 
! 				pcrecpp::RE re1("^(#.*|\\s*)$");				
! 
! 				//DBGOUTPUT("&&&&&");
! 
! 				if(! re1.FullMatch(tmpbuf) ){
! 					//DBGOUTPUT("!!!!");
  					pcrecpp::RE re("^([-a-z1-9]+)\\s*\\W*([0-9]+)/(tcp|udp)");
! 				
! 					icestring sname = "", protocol = "";
! 						
  					int port;
  				
***************
*** 47,50 ****
--- 56,60 ----
  				}//else DBGOUTPUT("#comment");
  			}
+ #endif
  		}
  	}

Index: iceoutput.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/iceoutput.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iceoutput.h	28 Nov 2006 18:59:18 -0000	1.2
--- iceoutput.h	30 Nov 2006 12:27:35 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  
  #include <fstream>
+ #include <string>
  #include <iostream>
  #include <vector>
***************
*** 46,51 ****
          std::cout << buf;
      }
!     
!     iceoutput &operator<<(const string &str){
          std::cout << str;
      }
--- 47,52 ----
          std::cout << buf;
      }
! 
!     iceoutput &operator<<(const icestring &str){
          std::cout << str;
      }