javanetsim-cvs

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

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

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


Index: crawsocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/crawsocket.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** crawsocket.h	16 Dec 2006 20:44:18 -0000	1.11
--- crawsocket.h	16 Dec 2006 21:05:28 -0000	1.12
***************
*** 146,151 ****
          int slen, dlen;
  
!         slen == make_sockname(saddress, source.c_str(), 0, domain);
!         dlen == make_sockname(daddress, destination.c_str(), 0, domain);
  
          Bzero(packet, sizeof(iphdr) + sizeof(tcphdr));
--- 146,151 ----
          int slen, dlen;
  
!         slen = make_sockname(saddress, source.c_str(), 0, domain);
!         dlen = make_sockname(daddress, destination.c_str(), 0, domain);
  
          Bzero(packet, sizeof(iphdr) + sizeof(tcphdr));

Index: csocket.h
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icesockets/csocket.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** csocket.h	16 Dec 2006 20:44:18 -0000	1.17
--- csocket.h	16 Dec 2006 21:05:28 -0000	1.18
***************
*** 103,113 ****
  	    int len;
  	    
! 	    if((len == make_sockname(saddress, hostname, port, domain)))
  			return sockerror("sockname");
  	    
  	    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)
--- 103,118 ----
  	    int len;
  	    
! 	    if(!(len = make_sockname(saddress, hostname, port, domain)))
  			return sockerror("sockname");
  	    
  	    if(!timeout){
  			if(block){
+ 
  				if(::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) == SOCKET_ERROR)
! 				#ifndef WIN32 //UGLY!!!!
! 		    		return sockerror("connect");  
! 				#else
! 					;
! 				#endif
  			}else{
  				 if(::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr)) != SOCKET_ERROR)
***************
*** 116,123 ****
  			}
  	    }else{
!                 fd_set sset;
  		struct timeval tv;
  		
!                 nonblock(true);
  		
  		::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr));
--- 121,128 ----
  			}
  	    }else{
!         fd_set sset;
  		struct timeval tv;
  		
!         nonblock(true);
  		
  		::connect(sid, (struct sockaddr *) &saddress, sizeof(struct sockaddr));
***************
*** 151,155 ****
  	    int len;
  	    
! 	    if((len == make_sockname(saddress, hostname, port, domain)))
  		return sockerror("sockname");
  	    
--- 156,160 ----
  	    int len;
  	    
! 	    if(!(len = make_sockname(saddress, hostname, port, domain)))
  		return sockerror("sockname");
  	    
***************
*** 167,171 ****
  	    int len;
  	    
! 	    if((len == make_sockname(saddress, hostname, port, domain)))
  		return sockerror("sockname");
  	    
--- 172,176 ----
  	    int len;
  	    
! 	    if(!(len = make_sockname(saddress, hostname, port, domain)))
  		return sockerror("sockname");
  	    
***************
*** 214,218 ****
                 struct sockaddr_in saddress;
                 int slen;
!                if((slen == make_sockname(saddress, hostname, port, domain)))
                      return sockerror("sockname");
                  
--- 219,223 ----
                 struct sockaddr_in saddress;
                 int slen;
!                if(!(slen = make_sockname(saddress, hostname, port, domain)))
                      return sockerror("sockname");