--- sourceforge.net/trunk/rdesktop/tcp.c	2003/06/06 10:44:20	408
+++ sourceforge.net/trunk/rdesktop/tcp.c	2004/06/27 19:17:24	728
@@ -35,7 +35,7 @@
 static int sock;
 static struct stream in;
 static struct stream out;
-extern int tcp_port_rdp;
+int g_tcp_port_rdp = TCP_PORT_RDP;
 
 /* Initialise TCP transport data packet */
 STREAM
@@ -74,17 +74,36 @@
 
 /* Receive a message on the TCP layer */
 STREAM
-tcp_recv(uint32 length)
+tcp_recv(STREAM s, uint32 length)
 {
+	unsigned int new_length, end_offset, p_offset;
 	int rcvd = 0;
 
-	if (length > in.size)
+	if (s == NULL)
 	{
-		in.data = (uint8 *) xrealloc(in.data, length);
-		in.size = length;
+		/* read into "new" stream */
+		if (length > in.size)
+		{
+			in.data = (uint8 *) xrealloc(in.data, length);
+			in.size = length;
+		}
+		in.end = in.p = in.data;
+		s = ∈
+	}
+	else
+	{
+		/* append to existing stream */
+		new_length = (s->end - s->data) + length;
+		if (new_length > s->size)
+		{
+			p_offset = s->p - s->data;
+			end_offset = s->end - s->data;
+			s->data = (uint8 *) xrealloc(s->data, new_length);
+			s->size = new_length;
+			s->p = s->data + p_offset;
+			s->end = s->data + end_offset;
+		}
 	}
-
-	in.end = in.p = in.data;
 
 	while (length > 0)
 	{
@@ -92,27 +111,75 @@
 			/* User quit */
 			return NULL;
 
-		rcvd = recv(sock, in.end, length, 0);
-		if (rcvd == -1)
+		rcvd = recv(sock, s->end, length, 0);
+		if (rcvd < 0)
 		{
 			error("recv: %s\n", strerror(errno));
 			return NULL;
 		}
+		else if (rcvd == 0)
+		{
+			error("Connection closed\n");
+			return NULL;
+		}
 
-		in.end += rcvd;
+		s->end += rcvd;
 		length -= rcvd;
 	}
 
-	return &in;
+	return s;
 }
 
 /* Establish a connection on the TCP layer */
 BOOL
 tcp_connect(char *server)
 {
+	int true_value = 1;
+
+#ifdef IPv6
+
+	int n;
+	struct addrinfo hints, *res, *ressave;
+	char tcp_port_rdp_s[10];
+
+	snprintf(tcp_port_rdp_s, 10, "%d", g_tcp_port_rdp);
+
+	memset(&hints, 0, sizeof(struct addrinfo));
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+
+	if ((n = getaddrinfo(server, tcp_port_rdp_s, &hints, &res)))
+	{
+		error("getaddrinfo: %s\n", gai_strerror(n));
+		return False;
+	}
+
+	ressave = res;
+	sock = -1;
+	while (res)
+	{
+		sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (!(sock < 0))
+		{
+			if (connect(sock, res->ai_addr, res->ai_addrlen) == 0)
+				break;
+			close(sock);
+			sock = -1;
+		}
+		res = res->ai_next;
+	}
+	freeaddrinfo(ressave);
+
+	if (sock == -1)
+	{
+		error("%s: unable to connect\n", server);
+		return False;
+	}
+
+#else /* no IPv6 support */
+
 	struct hostent *nslookup;
 	struct sockaddr_in servaddr;
-	int true_value = 1;
 
 	if ((nslookup = gethostbyname(server)) != NULL)
 	{
@@ -131,7 +198,7 @@
 	}
 
 	servaddr.sin_family = AF_INET;
-	servaddr.sin_port = htons(tcp_port_rdp);
+	servaddr.sin_port = htons(g_tcp_port_rdp);
 
 	if (connect(sock, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) < 0)
 	{
@@ -140,6 +207,8 @@
 		return False;
 	}
 
+#endif /* IPv6 */
+
 	setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *) &true_value, sizeof(true_value));
 
 	in.size = 4096;
@@ -157,3 +226,19 @@
 {
 	close(sock);
 }
+
+char *
+tcp_get_address()
+{
+	static char ipaddr[32];
+	struct sockaddr_in sockaddr;
+	size_t len = sizeof(sockaddr);
+	if (getsockname(sock, (struct sockaddr *) &sockaddr, &len) == 0)
+	{
+		unsigned char *ip = (unsigned char *) &sockaddr.sin_addr;
+		sprintf(ipaddr, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+	}
+	else
+		strcpy(ipaddr, "127.0.0.1");
+	return ipaddr;
+}