javanetsim-cvs

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

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

Modified Files:
	sock_name.h sock_time.h 
Log Message:
no message

Index: sock_name.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_name.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sock_name.h	28 Nov 2006 17:57:54 -0000	1.1
--- sock_name.h	30 Nov 2006 06:43:50 -0000	1.2
***************
*** 2,5 ****
--- 2,7 ----
  #define ICESOCK_SOCK_NAME_H
  
+ #define ICEMAXHOSTNAME NI_MAXHOST
+ 
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 32,36 ****
  
  bool is_domainname(char * nisname){
!     return !(pcrecpp::RE("\\d+\\.\\d+\\.\\d\\.\\d+").FullMatch(nisname));
  }
  
--- 34,38 ----
  
  bool is_domainname(char * nisname){
!     return !(pcrecpp::RE("\\d+\\.\\d+\\.\\d+\\.\\d+").FullMatch(nisname));
  }
  
***************
*** 91,115 ****
  
  short int get_host_byip(const char * nisname, char * retname, int retlen){
!     char rname[1025];
!     char temp[32];
!     int rc;        
      struct sockaddr_in saddr;
-     struct addrinfo hints, *res;
      
      int len = make_sockname(saddr, nisname, 53, AF_INET);
      
!     bzero(&hints, sizeof(hints));
!     
!     hints.ai_flags = AI_CANONNAME;
!     hints.ai_family = AF_INET;
!     
!     if( (rc = getnameinfo((sockaddr *) &saddr, len, rname, 1024, temp, 32, 0)) < 0) {	
  	perror("getnameinfo");	
  	return -1;
      }
      
!     retlen = (retlen >= strlen(rname) + 1) ? strlen(rname) + 1 : retlen;
      
!     strncpy(retname, rname, retlen);     
      
      return 0;    
--- 93,110 ----
  
  short int get_host_byip(const char * nisname, char * retname, int retlen){
!     int rc;
!     char hbuf[ICEMAXHOSTNAME];
      struct sockaddr_in saddr;
      
      int len = make_sockname(saddr, nisname, 53, AF_INET);
      
!     if( (rc = getnameinfo((sockaddr *) &saddr, len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD)) < 0) {	
  	perror("getnameinfo");	
  	return -1;
      }
      
!     retlen = (retlen >= strlen(hbuf) + 1) ? strlen(hbuf) + 1 : retlen;    
      
!     strncpy(retname, hbuf, retlen);     
      
      return 0;    

Index: sock_time.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_time.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sock_time.h	28 Nov 2006 17:57:54 -0000	1.1
--- sock_time.h	30 Nov 2006 06:43:50 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  
  #include <time.h>
+ #include <sys/timeb.h>
  
  void icesleep(int secs, int nsecs){
***************
*** 12,14 ****
--- 13,32 ----
  
  }
+ 
+ float timeb_diff(timeb &tp1, timeb &tp2){
+     float dt;
+     
+     int secs = tp2.time - tp1.time;
+     int msecs = tp2.millitm - tp1.millitm;
+ 
+     if(msecs < 0){
+         secs--;
+         msecs = 1000 + msecs;
+     }
+                         
+     dt = secs + 0.001*msecs;
+     
+     return dt;
+ }
+ 
  #endif