Update of /cvsroot/javanetsim/IceScan
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18111
Modified Files:
icedbs.h csubtarget.h
Log Message:
no message
Index: icedbs.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icedbs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** icedbs.h 15 Dec 2006 15:27:57 -0000 1.3
--- icedbs.h 15 Dec 2006 15:48:51 -0000 1.4
***************
*** 27,37 ****
in.getline(tmpbuf,256);
- //DBGOUTPUT("!!!!");
-
IceRegex re1("^(#.*|\\s*)$");
! //DBGOUTPUT("&&&&&");
!
! if(! re1.match(tmpbuf) ){ //FullMatch
IceRegex re("^([-a-z1-9]+)\\s*\\W*([0-9]+)/(tcp|udp)");
--- 27,33 ----
in.getline(tmpbuf,256);
IceRegex re1("^(#.*|\\s*)$");
! if(! re1.match(tmpbuf) ){
IceRegex re("^([-a-z1-9]+)\\s*\\W*([0-9]+)/(tcp|udp)");
***************
*** 54,58 ****
else
udp_services[port] = sname;
! }//else DBGOUTPUT("#comment");
}
}
--- 50,54 ----
else
udp_services[port] = sname;
! }
}
}
***************
*** 89,99 ****
in.getline(tmpbuf,256);
- //DBGOUTPUT("!!!!");
-
IceRegex re1("^(#.*|\\s*)$");
! //DBGOUTPUT("&&&&&");
!
! if(! re1.match(tmpbuf) ){ //FullMatch
IceRegex re("^([A-F0-9]+)\\s*\\W*([-a-z0-9A-Z. +]+)");
--- 85,91 ----
in.getline(tmpbuf,256);
IceRegex re1("^(#.*|\\s*)$");
! if(! re1.match(tmpbuf) ){
IceRegex re("^([A-F0-9]+)\\s*\\W*([-a-z0-9A-Z. +]+)");
***************
*** 109,113 ****
vendors[prefix] = company;
! }//else DBGOUTPUT("#comment");
}
}
--- 101,105 ----
vendors[prefix] = company;
! }
}
}
Index: csubtarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** csubtarget.h 14 Dec 2006 19:45:40 -0000 1.21
--- csubtarget.h 15 Dec 2006 15:48:51 -0000 1.22
***************
*** 7,11 ****
#include <vector>
#include <errno.h>
- #include <pthread.h>
#include "iceoutput.h"
#include "iceparams.h"
--- 7,10 ----
|
