--- sourceforge.net/trunk/rdesktop/tcp.c	2000/08/15 10:23:24	10
+++ sourceforge.net/trunk/rdesktop/tcp.c	2003/01/30 11:57:10	303
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - TCP layer
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,24 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <unistd.h>	/* select read write close */
-#include <sys/socket.h>	/* socket connect setsockopt */
-#include <sys/time.h>	/* timeval */
-#include <netdb.h>	/* gethostbyname */
-#include <netinet/tcp.h> /* TCP_NODELAY */
-#include <arpa/inet.h>	/* inet_aton */
-#include <errno.h>	/* errno */
+#include <unistd.h>		/* select read write close */
+#include <sys/socket.h>		/* socket connect setsockopt */
+#include <sys/time.h>		/* timeval */
+#include <netdb.h>		/* gethostbyname */
+#include <netinet/in.h>		/* sockaddr_in */
+#include <netinet/tcp.h>	/* TCP_NODELAY */
+#include <arpa/inet.h>		/* inet_addr */
+#include <errno.h>		/* errno */
 #include "rdesktop.h"
 
 static int sock;
 static struct stream in;
 static struct stream out;
+extern int tcp_port_rdp;
 
 /* Initialise TCP transport data packet */
-STREAM tcp_init(int maxlen)
+STREAM
+tcp_init(int maxlen)
 {
 	if (maxlen > out.size)
 	{
@@ -46,18 +49,18 @@
 }
 
 /* Send TCP transport data packet */
-void tcp_send(STREAM s)
+void
+tcp_send(STREAM s)
 {
-	int length = s->end - s->data; 
+	int length = s->end - s->data;
 	int sent, total = 0;
 
 	while (total < length)
 	{
-		sent = write(sock, s->data + total, length - total);
-
+		sent = send(sock, s->data + total, length - total, 0);
 		if (sent <= 0)
 		{
-			STATUS("write: %s\n", strerror(errno));
+			error("send: %s\n", strerror(errno));
 			return;
 		}
 
@@ -66,11 +69,10 @@
 }
 
 /* Receive a message on the TCP layer */
-STREAM tcp_recv(int length)
+STREAM
+tcp_recv(int length)
 {
-	int ret, rcvd = 0;
-	struct timeval tv;
-	fd_set rfds;
+	int rcvd = 0;
 
 	if (length > in.size)
 	{
@@ -82,35 +84,27 @@
 
 	while (length > 0)
 	{
-		ui_process_events();
-
-		FD_ZERO(&rfds);
-		FD_SET(sock, &rfds);
-		tv.tv_sec = 0;
-		tv.tv_usec = 100;
-
-		ret = select(sock+1, &rfds, NULL, NULL, &tv);
+		if (!ui_select(sock))
+			/* User quit */
+			return NULL;
 
-		if (ret)
+		rcvd = recv(sock, in.end, length, 0);
+		if (rcvd == -1)
 		{
-			rcvd = read(sock, in.end, length);
-
-			if (rcvd <= 0)
-			{
-				STATUS("read: %s\n", strerror(errno));
-				return NULL;
-			}
-
-			in.end += rcvd;
-			length -= rcvd;
+			error("recv: %s\n", strerror(errno));
+			return NULL;
 		}
+
+		in.end += rcvd;
+		length -= rcvd;
 	}
 
 	return &in;
 }
 
 /* Establish a connection on the TCP layer */
-BOOL tcp_connect(char *server)
+BOOL
+tcp_connect(char *server)
 {
 	struct hostent *nslookup;
 	struct sockaddr_in servaddr;
@@ -120,29 +114,29 @@
 	{
 		memcpy(&servaddr.sin_addr, nslookup->h_addr, sizeof(servaddr.sin_addr));
 	}
-	else if (!inet_aton(server, &servaddr.sin_addr))
+	else if ((servaddr.sin_addr.s_addr = inet_addr(server)) == INADDR_NONE)
 	{
-		STATUS("%s: unable to resolve host\n", server);
+		error("%s: unable to resolve host\n", server);
 		return False;
 	}
 
 	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
 	{
-		STATUS("socket: %s\n", strerror(errno));
+		error("socket: %s\n", strerror(errno));
 		return False;
 	}
 
 	servaddr.sin_family = AF_INET;
-	servaddr.sin_port = htons(TCP_PORT_RDP);
+	servaddr.sin_port = htons(tcp_port_rdp);
 
-	if (connect(sock, (struct sockaddr *)&servaddr, sizeof(struct sockaddr)) < 0)
+	if (connect(sock, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) < 0)
 	{
-		STATUS("connect: %s\n", strerror(errno));
+		error("connect: %s\n", strerror(errno));
 		close(sock);
 		return False;
 	}
 
-	setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &true, sizeof(true));
+	setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *) &true, sizeof(true));
 
 	in.size = 4096;
 	in.data = xmalloc(in.size);
@@ -154,7 +148,8 @@
 }
 
 /* Disconnect on the TCP layer */
-void tcp_disconnect()
+void
+tcp_disconnect(void)
 {
 	close(sock);
 }