--- sourceforge.net/trunk/rdesktop/tcp.c	2000/05/10 07:36:34	4
+++ sourceforge.net/trunk/rdesktop/tcp.c	2002/07/30 07:18:48	82
@@ -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-2001
    
    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,107 +18,136 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "includes.h"
-
-/* Establish a connection on the TCP layer */
-HCONN tcp_connect(char *server)
+#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)
 {
-	struct hostent *nslookup;
-	struct sockaddr_in servaddr;
-	struct connection *conn;
-	int sock;
-	int true = 1;
-
-	if ((nslookup = gethostbyname(server)) != NULL)
-	{
-		memcpy(&servaddr.sin_addr, nslookup->h_addr, sizeof(servaddr.sin_addr));
-	}
-	else if (!inet_aton(server, &servaddr.sin_addr))
-	{
-		fprintf(stderr, "%s: unable to resolve host\n", server);
-		return NULL;
-	}
-
-	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-	{
-		fprintf(stderr, "socket: %s\n", strerror(errno));
-		return NULL;
-	}
-
-	servaddr.sin_family = AF_INET;
-	servaddr.sin_port = htons(TCP_PORT_RDP);
-
-	if (connect(sock, (struct sockaddr *)&servaddr, sizeof(struct sockaddr)) < 0)
+	if (maxlen > out.size)
 	{
-		fprintf(stderr, "connect: %s\n", strerror(errno));
-		close(sock);
-		return NULL;
+		out.data = xrealloc(out.data, maxlen);
+		out.size = maxlen;
 	}
 
-	setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &true, sizeof(true));
-
-	conn = xmalloc(sizeof(struct connection));
-	STREAM_INIT(conn->in,  False);
-	STREAM_INIT(conn->out, True);
-
-	conn->tcp_socket = sock;
-	return conn;
-}
-
-/* Disconnect on the TCP layer */
-void tcp_disconnect(HCONN conn)
-{
-	close(conn->tcp_socket);
-	free(conn);
+	out.p = out.data;
+	out.end = out.data + out.size;
+	return &out;
 }
 
 /* Send TCP transport data packet */
-BOOL tcp_send(HCONN conn)
+void
+tcp_send(STREAM s)
 {
-	int length = conn->out.end;
+	int length = s->end - s->data;
 	int sent, total = 0;
 
 	while (total < length)
 	{
-		sent = write(conn->tcp_socket, conn->out.data + total,
-			     length - total);
-
+		sent = send(sock, s->data + total, length - total, 0);
 		if (sent <= 0)
 		{
-			fprintf(stderr, "write: %s\n", strerror(errno));
-			return False;
+			error("send: %s\n", strerror(errno));
+			return;
 		}
 
 		total += sent;
 	}
-
-	conn->out.offset = 0;
-	conn->out.end = conn->out.size;
-	return True;
 }
 
 /* Receive a message on the TCP layer */
-BOOL tcp_recv(HCONN conn, int length)
+STREAM
+tcp_recv(int length)
 {
-	int rcvd;
+	int rcvd = 0;
+
+	if (length > in.size)
+	{
+		in.data = xrealloc(in.data, length);
+		in.size = length;
+	}
 
-	STREAM_SIZE(conn->in, length);
-	conn->in.end = conn->in.offset = 0;
+	in.end = in.p = in.data;
 
 	while (length > 0)
 	{
-		rcvd = read(conn->tcp_socket, conn->in.data + conn->in.end,
-			    length);
+		ui_select(sock);
 
-		if (rcvd <= 0)
+		rcvd = recv(sock, in.end, length, 0);
+		if (rcvd == -1)
 		{
-			fprintf(stderr, "read: %s\n", strerror(errno));
-			return False;
+			error("recv: %s\n", strerror(errno));
+			return NULL;
 		}
 
-		conn->in.end += rcvd;
+		in.end += rcvd;
 		length -= rcvd;
 	}
 
+	return &in;
+}
+
+/* Establish a connection on the TCP layer */
+BOOL
+tcp_connect(char *server)
+{
+	struct hostent *nslookup;
+	struct sockaddr_in servaddr;
+	int true = 1;
+
+	if ((nslookup = gethostbyname(server)) != NULL)
+	{
+		memcpy(&servaddr.sin_addr, nslookup->h_addr, sizeof(servaddr.sin_addr));
+	}
+	else if (!(servaddr.sin_addr.s_addr = inet_addr(server)))
+	{
+		error("%s: unable to resolve host\n", server);
+		return False;
+	}
+
+	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+	{
+		error("socket: %s\n", strerror(errno));
+		return False;
+	}
+
+	servaddr.sin_family = AF_INET;
+	servaddr.sin_port = htons(tcp_port_rdp);
+
+	if (connect(sock, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) < 0)
+	{
+		error("connect: %s\n", strerror(errno));
+		close(sock);
+		return False;
+	}
+
+	setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *) &true, sizeof(true));
+
+	in.size = 4096;
+	in.data = xmalloc(in.size);
+
+	out.size = 4096;
+	out.data = xmalloc(out.size);
+
 	return True;
 }
+
+/* Disconnect on the TCP layer */
+void
+tcp_disconnect()
+{
+	close(sock);
+}