[Javanetsim-cvs] IceScan icescan.cc,1.30,1.31 udpscan.h,1.10,1.11

[QweR <qw...@us...>]

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

Modified Files:
	icescan.cc udpscan.h 
Log Message:


Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** icescan.cc	16 Dec 2006 17:29:16 -0000	1.30
--- icescan.cc	16 Dec 2006 20:25:13 -0000	1.31
***************
*** 41,45 ****
  bool parse_ports(int i, int argc, char *argv[], std::vector <port_range>& ports, bool isexit){
      if(i+1 < argc){
! 	IceRegex re1("$((\\d+(-\\d+)?),?)+^");
  	if(! re1.match(argv[i+1]) ){
  	    if(isexit){
--- 41,45 ----
  bool parse_ports(int i, int argc, char *argv[], std::vector <port_range>& ports, bool isexit){
      if(i+1 < argc){
! 	IceRegex re1("^((\\d+(-\\d+)?),?)+$");
  	if(! re1.match(argv[i+1]) ){
  	    if(isexit){

Index: udpscan.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/udpscan.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** udpscan.h	16 Dec 2006 16:06:06 -0000	1.10
--- udpscan.h	16 Dec 2006 20:25:13 -0000	1.11
***************
*** 76,80 ****
  	if(gethostname(hostname,79)) exit(-1);
  	
! 	sudp.bind(hostname, 0, 0);
  	sudp.nonblock(true);
  	sicmp.nonblock(true);
--- 76,81 ----
  	if(gethostname(hostname,79)) exit(-1);
  	
! 	int pppp = sudp.getMagicPort(SOCK_DGRAM, 100);
! 	sudp.bind(hostname, pppp, 0);
  	sudp.nonblock(true);
  	sicmp.nonblock(true);
***************
*** 140,143 ****
--- 141,148 ----
  	    }
  	}
+ 	sudp.shutdown();
+ 	sicmp.shutdown();
+ 	sudp.close();
+ 	sicmp.close();
      }
      else{