[Javanetsim-cvs] IceScan icescan.cc,1.15,1.16

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

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

Modified Files:
	icescan.cc 
Log Message:


Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** icescan.cc	13 Dec 2006 20:06:32 -0000	1.15
--- icescan.cc	13 Dec 2006 22:40:30 -0000	1.16
***************
*** 153,157 ****
  
                                                      if(i+1 < argc){						
!                                                         IceRegex re1("(\\d|\\,|\\-)+");
                                                          if(! re1.match(argv[i+1]) ){
                                                              std::cout << "Invalid port range definition format." << std::endl;
--- 153,158 ----
  
                                                      if(i+1 < argc){						
! //                                                        IceRegex re1("(\\d|\\,|\\-)+");
! 							IceRegex re1("((\\d+(-\\d+)?),?)+");
                                                          if(! re1.match(argv[i+1]) ){
                                                              std::cout << "Invalid port range definition format." << std::endl;
***************
*** 159,184 ****
                                                              exit(1);
                                                          }else{
!                                                             IceRegex re("(\\d+(-\\d+)*),*");
                                                              
!                                                             string var, var2 = "";      
                                                              
                                                              re.match(argv[i+1]);
  							    re.findReset();
! 
!                                                             while(! re.findNext()){
! 								
! 								if( re.group(1,var) && re.group(2,var2) ){
! 								
!                                                                 struct port_range pr;
! 
!                                                                 if(var2 == ""){
!                                                                         sscanf(var.c_str(), "%d", &pr.lower_port);
!                                                                         pr.upper_port = pr.lower_port;
!                                                                 }else{
!                                                                         sscanf(var.c_str(), "%d-%d", &pr.lower_port, &pr.upper_port);
!                                                                 }
! 
!                                                                 par->ports.push_back(pr);
  								}
                                                              }
                                                              i++;
--- 160,183 ----
                                                              exit(1);
                                                          }else{
!                                                             IceRegex re("(\\d+(-\\d+)?),?");
                                                              
!                                                             icestring var="", var2 = "";
                                                              
                                                              re.match(argv[i+1]);
  							    re.findReset();
!                                                             //re.Consume(&input, &var, &var2)
!                                                             while(re.findNext()){
! //                                                                DBGOUTPUT(v.size());
! //                                                                DBGOUTPUT(v[0]);
! 								re.group(1,var);
! 								if(re.groups() > 2) re.group(2,var2);
! 								struct port_range pr;
! 								if(var2 == ""){
! 								    sscanf(var.c_str(), "%d", &pr.lower_port);
! 								    pr.upper_port = pr.lower_port;
! 								}else{
! 								    sscanf(var.c_str(), "%d-%d", &pr.lower_port, &pr.upper_port);
  								}
+ 								par->ports.push_back(pr);
                                                              }
                                                              i++;