javanetsim-cvs

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

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

Modified Files:
	icediscover.h csubtarget.h 
Log Message:
no message

Index: csubtarget.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/csubtarget.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** csubtarget.h	15 Dec 2006 15:48:51 -0000	1.22
--- csubtarget.h	15 Dec 2006 16:35:29 -0000	1.23
***************
*** 231,239 ****
                                      (*i).second.attempt++;
  
!                                     usleep(1000);
                                  }
                              }
                              
!                             usleep(500000);
                              
                              int bytes;
--- 231,239 ----
                                      (*i).second.attempt++;
  
!                                     iceusleep(1000);
                                  }
                              }
                              
!                             iceusleep(500000);
                              
                              int bytes;
***************
*** 313,317 ****
                                  bzero(response, 65534);
                              }                            
!                             usleep(1000);
                              }
                          }
--- 313,317 ----
                                  bzero(response, 65534);
                              }                            
!                             iceusleep(1000);
                              }
                          }
***************
*** 354,358 ****
  			int j = initiate_connect(scanning_ports);
  			//DBGOUTPUT(j);
!                         while( ! do_select_round_connect(scanning_ports, subtarget_ports) ) usleep(1000);
  
  			show_ports();
--- 354,358 ----
  			int j = initiate_connect(scanning_ports);
  			//DBGOUTPUT(j);
!                         while( ! do_select_round_connect(scanning_ports, subtarget_ports) ) iceusleep(1000);
  
  			show_ports();
***************
*** 539,543 ****
  				//DBGOUTPUT("Connecting to " << prt << " using socket id " << scanning_ports[prt].c->get_socketid());
  				//DBGOUTPUT("!!!");
! 				//usleep(10000);
  			}
  		}
--- 539,543 ----
  				//DBGOUTPUT("Connecting to " << prt << " using socket id " << scanning_ports[prt].c->get_socketid());
  				//DBGOUTPUT("!!!");
! 				//iceusleep(10000);
  			}
  		}
***************
*** 622,626 ****
                                                          }else{
                                                              //DBGOUTPUT("WRITE");
!                                                             usleep(20000);
                                                              res = c.write("", 0, 0);
                                                              //DBGOUTPUT("/WRITE" << res);
--- 622,626 ----
                                                          }else{
                                                              //DBGOUTPUT("WRITE");
!                                                             iceusleep(20000);
                                                              res = c.write("", 0, 0);
                                                              //DBGOUTPUT("/WRITE" << res);

Index: icediscover.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icediscover.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** icediscover.h	15 Dec 2006 16:24:58 -0000	1.12
--- icediscover.h	15 Dec 2006 16:35:29 -0000	1.13
***************
*** 71,78 ****
                                  r.send_icmp_packet(hostname, ICMP_ECHO, 0, getpid(), at, 0, buf, sizeof(struct timeval));
  
!                                 usleep(200000);
                          }
                          
!                 	char hostname[1024];
  			char buf[1500]; //1500 == standart IP Packet size
  			
--- 71,78 ----
                                  r.send_icmp_packet(hostname, ICMP_ECHO, 0, getpid(), at, 0, buf, sizeof(struct timeval));
  
!                                 iceusleep(200000);
                          }
                          
!                 	char hostname[ICEMAXHOSTNAME];
  			char buf[1500]; //1500 == standart IP Packet size
  			
***************
*** 97,101 ****
                              }	
                          
!                         }else usleep(50000);
  		}
  
--- 97,101 ----
                              }	
                          
!                         }else iceusleep(50000);
  		}