[Javanetsim-cvs] IceScan/icesockets sock_name.h,1.3,1.4
Status: Beta
Brought to you by:
darkkey
From: Alexander B. <da...@us...> - 2006-11-30 15:28:45
|
Update of /cvsroot/javanetsim/IceScan/icesockets In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3753 Modified Files: sock_name.h Log Message: no message Index: sock_name.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_name.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sock_name.h 30 Nov 2006 12:27:36 -0000 1.3 --- sock_name.h 30 Nov 2006 15:28:41 -0000 1.4 *************** *** 18,25 **** #include <netinet/in.h> #include <arpa/inet.h> - #include <pcrecpp.h> #include <iostream> #include <vector> #ifdef __CYGWIN__ #include "getaddrinfo.h" --- 18,26 ---- #include <netinet/in.h> #include <arpa/inet.h> #include <iostream> #include <vector> + #include "iceregex.h" + #ifdef __CYGWIN__ #include "getaddrinfo.h" *************** *** 44,53 **** bool is_domainname(char * nisname){ ! return ! #ifndef __CYGWIN__ //REGEXes don't work under windows? (segfault) ! !(pcrecpp::RE("\\d+\\.\\d+\\.\\d+\\.\\d+").FullMatch(nisname)); ! #else ! true; ! #endif } --- 45,50 ---- bool is_domainname(char * nisname){ ! IceRegex re("\\d+\\.\\d+\\.\\d+\\.\\d+"); ! return ! (re.match(nisname)); } |