javanetsim-cvs

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

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

Modified Files:
	csocket.h sock_types.h sock_time.h 
Log Message:
no message

Index: sock_types.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_types.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sock_types.h	16 Dec 2006 03:24:16 -0000	1.10
--- sock_types.h	16 Dec 2006 10:02:50 -0000	1.11
***************
*** 32,35 ****
--- 32,36 ----
  #include <netinet/ip.h>
  #include <netinet/ip_icmp.h>
+ #include <netinet/udp.h>
  #define __FAVOR_BSD	
  #include <netinet/tcp.h>

Index: csocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/csocket.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** csocket.h	16 Dec 2006 00:29:16 -0000	1.13
--- csocket.h	16 Dec 2006 10:02:50 -0000	1.14
***************
*** 259,263 ****
  	
  	static int getMagicPort(){
! 	    return 0;
  	}
  	
--- 259,263 ----
  	
  	static int getMagicPort(){
! 	    return 33333;
  	}
  	

Index: sock_time.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_time.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sock_time.h	16 Dec 2006 00:29:16 -0000	1.6
--- sock_time.h	16 Dec 2006 10:02:50 -0000	1.7
***************
*** 42,52 ****
      int mins = t/1000/60 % (60);
      
!     int hours = t/1000/60/60 % (24);
      
!     int days = t/(1000*60*60*24);
!         
!     float fsecs = secs + msecs/1000;
      
!     sprintf(buf, "%d days %d hours %d minutes %f seconds", days, hours, mins, fsecs);
      
      icestring ret(buf);
--- 42,50 ----
      int mins = t/1000/60 % (60);
      
!     int hours = t/1000/60/60;
      
!     double fsecs = secs + (double) msecs/1000;
      
!     sprintf(buf, "%d hours %d minutes %.3f seconds", hours, mins, fsecs);
      
      icestring ret(buf);