[Javanetsim-cvs] IceScan/icesockets crawsocket.h, 1.14, 1.15 csocket.h, 1.20, 1.21

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

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

Modified Files:
	crawsocket.h csocket.h 
Log Message:


Index: crawsocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/crawsocket.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** crawsocket.h	17 Dec 2006 11:00:20 -0000	1.14
--- crawsocket.h	17 Dec 2006 11:14:00 -0000	1.15
***************
*** 31,35 ****
  		const int on = incl ? 1 : 0;
  				
! 		return setsockopt(IPPROTO_IP, IP_HDRINCL, &on, sizeof(on));
  	}
  
--- 31,35 ----
  		const int on = incl ? 1 : 0;
  				
! 		return setsockopt(IPPROTO_IP, IP_HDRINCL, (sockbuf_type *) &on, sizeof(on));
  	}
  
***************
*** 78,82 ****
  	}	
  
! 	int setsockopt(int level, int opname, const void *optval, socklen_t optlen){
  		int rc = 0;
  
--- 78,82 ----
  	}	
  
! 	int setsockopt(int level, int opname, const sockbuf_type *optval, socklen_t optlen){
  		int rc = 0;
  
***************
*** 91,95 ****
  	}
  
! 	int recvfrom(void *buf, int len, unsigned int flags, char *srchostname){
  		return csocket::recvfrom(buf, len, flags, srchostname, NULL);
  	}
--- 91,95 ----
  	}
  
! 	int recvfrom(sockbuf_type *buf, int len, unsigned int flags, char *srchostname){
  		return csocket::recvfrom(buf, len, flags, srchostname, NULL);
  	}

Index: csocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/csocket.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** csocket.h	17 Dec 2006 11:00:20 -0000	1.20
--- csocket.h	17 Dec 2006 11:14:00 -0000	1.21
***************
*** 10,16 ****
  
  #ifdef WIN32
!       typedef char* sockbuf_type;
  #else
!        typedef void* sockbuf_type;
  #endif
   
--- 10,16 ----
  
  #ifdef WIN32
!       typedef char sockbuf_type;
  #else
!        typedef void sockbuf_type;
  #endif
   
***************
*** 201,205 ****
  	}
  
! 	int getsockopt(int level, int opname, void *optval, socklen_t *optlen){
  		int rc = 0;
  
--- 201,205 ----
  	}
  
! 	int getsockopt(int level, int opname, sockbuf_type *optval, socklen_t *optlen){
  		int rc = 0;
  
***************
*** 210,217 ****
  	}
  
!         int recvfrom(void *buf, int len, int flags, char *srchostname, int *srchostport){
  		int rsize;
  		struct sockaddr_in from;
!                 int fromlen;
                  
  		rsize = ::recvfrom(sid, buf, len, flags, (struct sockaddr *) &from, (socklen_t*) &fromlen); 
--- 210,217 ----
  	}
  
! 	int recvfrom(sockbuf_type *buf, int len, int flags, char *srchostname, int *srchostport){
  		int rsize;
  		struct sockaddr_in from;
!         int fromlen;
                  
  		rsize = ::recvfrom(sid, buf, len, flags, (struct sockaddr *) &from, (socklen_t*) &fromlen); 
***************
*** 225,229 ****
  	}
  
! 	int sendto(const char *hostname, int port, const void *msg, int len, unsigned int flags){
  
                 struct sockaddr_in saddress;
--- 225,229 ----
  	}
  
! 	int sendto(const char *hostname, int port, const sockbuf_type *msg, int len, unsigned int flags){
  
                 struct sockaddr_in saddress;