[Javanetsim-cvs] IceScan/icesockets crawsocket.h, 1.9, 1.10 csocket.h, 1.14, 1.15 sock_types.h, 1.13, 1.14

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

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

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

Index: sock_types.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/sock_types.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** sock_types.h	16 Dec 2006 12:18:05 -0000	1.13
--- sock_types.h	16 Dec 2006 14:42:42 -0000	1.14
***************
*** 17,21 ****
  
  #ifndef __CYGWIN__
! #include <net/if_arp.h>
  #endif
  
--- 17,21 ----
  
  #ifndef __CYGWIN__
!     #include <net/if_arp.h>
  #endif
  
***************
*** 41,44 ****
--- 41,53 ----
  #endif
  
+     
+ #ifndef WIN32
+ 
+     #define INVALID_SOCKET -1
+     #define SOCKET_ERROR -1
+     typedef int SOCKET;
+ 
+ #endif    
+     
  #define my_uint16_t uint16_t
  #define my_uint32_t uint32_t

Index: crawsocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/crawsocket.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** crawsocket.h	15 Dec 2006 16:24:58 -0000	1.9
--- crawsocket.h	16 Dec 2006 14:42:42 -0000	1.10
***************
*** 13,17 ****
  	    this->domain = domain;
  	    this->type = type;
! 		this->protocol = protocol;
  	    
  	    sstate = -1;
--- 13,17 ----
  	    this->domain = domain;
  	    this->type = type;
!             this->protocol = protocol;
  	    
  	    sstate = -1;

Index: csocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/csocket.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** csocket.h	16 Dec 2006 10:02:50 -0000	1.14
--- csocket.h	16 Dec 2006 14:42:42 -0000	1.15
***************
*** 14,18 ****
  
   protected:
! 	int sid;
  	int domain;
  	int sstate;	
--- 14,18 ----
  
   protected:
! 	SOCKET sid;
  	int domain;
  	int sstate;	
***************
*** 31,53 ****
  	    struct hostent *hostpointer = gethostbyaddr((char *) &laddr, sizeof(laddr), AF_INET);
  	
!     	if (hostpointer == NULL)
!         	return 0;
!     	
! 		for (char **p = hostpointer->h_addr_list; *p != 0; p++) {
!         	(void) memcpy((char *) &in.s_addr, *p, sizeof(in.s_addr));
!         	if (hostpointer->h_name)
!                 return hostpointer->h_name;
!     	}
      	
! 		return 0;
  	}
  
      
   public:
! 	csocket(int domain = PF_INET, int type = SOCK_STREAM, int sid = -1){
  	    this->domain = domain;
  	    this->type = type;
  	    
! 		block = true;
  
  	    sstate = -1;
--- 31,53 ----
  	    struct hostent *hostpointer = gethostbyaddr((char *) &laddr, sizeof(laddr), AF_INET);
  	
!             if (hostpointer == NULL)
!                     return 0;
! 
!                     for (char **p = hostpointer->h_addr_list; *p != 0; p++) {
!                     (void) memcpy((char *) &in.s_addr, *p, sizeof(in.s_addr));
!                     if (hostpointer->h_name)
!                     return hostpointer->h_name;
!             }
      	
!             return 0;
  	}
  
      
   public:
! 	csocket(int domain = PF_INET, int type = SOCK_STREAM, SOCKET sid = -1){
  	    this->domain = domain;
  	    this->type = type;
  	    
!             block = true;
  
  	    sstate = -1;
***************
*** 55,59 ****
  	    if(sid == -1){
  		this->sid = socket(domain, type, 0);
! 		if(this->sid < 0) sockerror("socket");
  		else sstate = 0;		    
  	    }else{
--- 55,59 ----
  	    if(sid == -1){
  		this->sid = socket(domain, type, 0);
! 		if(this->sid == SOCKET_ERROR) sockerror("socket");
  		else sstate = 0;		    
  	    }else{
***************
*** 95,102 ****
  	    if(!timeout){
  			if(block){
! 				if(::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) < 0)
  		    		return sockerror("connect");
  			}else{
! 				 if(::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) >= 0)
  					return -1;
  				 else return errno;
--- 95,102 ----
  	    if(!timeout){
  			if(block){
! 				if(::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) == SOCKET_ERROR)
  		    		return sockerror("connect");
  			}else{
! 				 if(::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) != SOCKET_ERROR)
  					return -1;
  				 else return errno;
***************
*** 116,122 ****
  	        tv.tv_usec = 0;
  
! 	        int res = select(sid + 1, NULL, &sset, NULL, &tv);
  
! 		if (res < 0 && errno != EINTR){
                      nonblock(false); return ICESOCK_ERRNO;
  		} else if (res == 0){
--- 116,128 ----
  	        tv.tv_usec = 0;
  
!                 int ndfs = sid + 1;
!                                 
!                 #ifdef WIN32                    
!                     int res = select(0, NULL, &sset, NULL, &tv);
!                 #else
!                     int res = select(ndfs, NULL, &sset, NULL, &tv);
!                 #endif
  
! 		if (res == SOCKET_ERROR && errno != EINTR){
                      nonblock(false); return ICESOCK_ERRNO;
  		} else if (res == 0){
***************
*** 135,142 ****
  		return sockerror("sockname");
  	    
! 	    if(::bind(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) < 0)
  		return sockerror("bind");
  		
! 	    if(::listen(sid, size) < 0)
  		return sockerror("listen");
  		
--- 141,148 ----
  		return sockerror("sockname");
  	    
! 	    if(::bind(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) == SOCKET_ERROR)
  		return sockerror("bind");
  		
! 	    if(::listen(sid, size) == SOCKET_ERROR)
  		return sockerror("listen");