Added more tcp functions

src/include/net_lowlevel.h

@@ -140,6 +140,10 @@ extern int NetOpenTCP(int port);
 extern void NetCloseUDP(int sockfd);
     /// Close a TCP socket port.
 extern void NetCloseTCP(int sockfd);
+    /// Set socket to non-blocking
+extern int NetSetNonBlocking(int sockfd);
+    /// Open a TCP connection.
+extern int NetConnectTCP(int sockfd,unsigned long addr,int port);
     /// Send through a UPD socket to a host:port.
 extern int NetSendUDP(int sockfd,unsigned long host,int port
 	,const void* buf,int len);
@@ -151,6 +155,10 @@ extern int NetSocketReady(int sockfd,int timeout);
 extern int NetRecvUDP(int sockfd,void* buf,int len);
     /// Receive from a TCP socket.
 extern int NetRecvTCP(int sockfd,void* buf,int len);
+    /// Listen for connections on a TCP socket
+extern int NetListenTCP(int sockfd);
+    /// Accept a connection on a TCP socket
+extern int NetAcceptTCP(int sockfd);
 
 //@}
 

src/network/lowlevel.cpp

@@ -210,6 +210,31 @@ global void NetCloseTCP(int sockfd)
 
 #endif	// } !USE_SDL_NET && !USE_WINSOCK
 
+/**
+**	Set socket to non-blocking.
+**
+**	@param sockfd	Socket
+**
+**	@return		0 for success, -1 for error
+*/
+#ifdef USE_WINSOCK
+global int NetSetNonBlocking(int sockfd)
+{
+    unsigned long opt;
+
+    opt = 1;
+    return ioctlsocket(sockfd,FIONBIO,&opt);
+}
+#else
+global int NetSetNonBlocking(int sockfd)
+{
+    int flags;
+
+    flags = fcntl(sockfd,F_GETFL,0);
+    return fcntl(sockfd,F_SETFL,flags|O_NONBLOCK);
+}
+#endif
+
 /**
 **	Resolve host in name or dotted quad notation.
 **
@@ -458,15 +483,14 @@ global int NetOpenTCP(int port)
 **	Open a TCP connection
 **
 **	@param sockfd	An open socket to use
-**	@param host	Host to connect to
+**	@param addr	Address returned from NetResolveHost
 **	@param port	Port on remote host to connect to
 **
 **	@return		0 if success, -1 if failure
 */
-global int NetConnectTCP(int sockfd,char* host,int port)
+global int NetConnectTCP(int sockfd,unsigned long addr,int port)
 {
     struct sockaddr_in sa;
-    unsigned long addr;
 #ifndef __BEOS__
     int opt;
 
@@ -476,7 +500,6 @@ global int NetConnectTCP(int sockfd,char* host,int port)
     setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (void*)&opt, sizeof(opt));
 #endif
 
-    addr=NetResolveHost(host);
     if( addr==INADDR_NONE ) {
 	return -1;
     }
@@ -487,7 +510,8 @@ global int NetConnectTCP(int sockfd,char* host,int port)
     sa.sin_port=htons(port);
 
     if( connect(sockfd,(struct sockaddr*)&sa,sizeof(sa)) < 0 ) {
-	fprintf(stderr,"connect to %s:%d failed\n", host, port);
+	fprintf(stderr,"connect to %d.%d.%d.%d:%d failed\n",
+	    NIPQUAD(ntohl(addr)), port);
 	return -1;
     }
 
@@ -623,7 +647,7 @@ global int NetSendUDP(int sockfd,unsigned long host,int port
 }
 
 /**
-**	Send through a TCP socket
+**	Send through a TCP socket.
 **
 **	@param sockfd	Socket
 **	@param buf	Send message buffer.
@@ -636,6 +660,34 @@ global int NetSendTCP(int sockfd,const void* buf,int len)
     return send(sockfd,buf,len,0);
 }
 
+/**
+**	Listen for connections on a TCP socket.
+**
+**	@param sockfd	Socket
+**
+**	@return		0 for success, -1 for error
+*/
+global int NetListenTCP(int sockfd)
+{
+    return listen(sockfd,PlayerMax);
+}
+
+/**
+**	Accept a connection on a TCP socket.
+**
+**	@param sockfd	Socket
+**
+**	@return		If success the new socket fildes, -1 otherwise.
+*/
+global int NetAcceptTCP(int sockfd)
+{
+    struct sockaddr_in sa;
+    int len;
+
+    len = sizeof(struct sockaddr_in);
+    return accept(sockfd,(struct sockaddr*)&sa,&len);
+}
+
 //@}
 
 //@}