Patched with rdp2tcp.patch.txt from Artur Zaprzała

(https://github.com/ArturZaprzala) as posted in
FreeRDP/FreeRDP#935.

Author: shaddybaddah

client/channel.c

@@ -95,7 +95,7 @@ int channel_read_event(void)
 {
 	ssize_t r;
 	char *ptr;
-	unsigned int msglen, avail;
+	unsigned int len, msglen, avail;
 
 	//trace_chan("");
 
@@ -113,10 +113,11 @@ int channel_read_event(void)
 	if (!ptr)
 		return error("failed to reserve channel memory");
 
+	len = msglen;
 	do {
 		r = read(RDP_FD_IN, ptr, msglen);
 		//trace_chan("r=%u/%u", r, msglen);
-		if (r < 0)
+		if (r <= 0)
 			goto chan_read_err;
 
 #ifdef DEBUG
@@ -133,7 +134,7 @@ int channel_read_event(void)
 		msglen -= r;
 	} while (msglen > 0);
 
-	iobuf_commit(&vc.ibuf, r);
+	iobuf_commit(&vc.ibuf, len);
 	commands_parse(&vc.ibuf);
 	time(&vc.ts);
 

client/controller.c

@@ -151,7 +151,7 @@ static int dump_sockets(netsock_t *cli)
 				break;
 
 			case NETSOCK_TUNCLI:
-				if (!ns->state != NETSTATE_CONNECTED) {
+				if (ns->state != NETSTATE_CONNECTED) {
 					ret = controller_answer(cli, "tuncli  %s tid=%hu",
 						host1, ns->tid);
 					break;

common/msgparser.c

@@ -43,6 +43,7 @@ int commands_parse(iobuf_t *ibuf)
 {
 	unsigned char cmd, *data;
 	unsigned int off, msg_len, avail;
+	int rc = 0;
 	static const unsigned char r2t_min_size[R2TCMD_MAX] = {
 		3, // R2TCMD_CONN
 		2, // R2TCMD_CLOSE
@@ -76,27 +77,35 @@ int commands_parse(iobuf_t *ibuf)
 		off += 4;
 
 		cmd = data[off];
-		if (cmd >= R2TCMD_MAX)
-			return error("invalid command id 0x%02x", cmd);
+		unsigned char *msg = data+off;
+		off += msg_len;
+		if (cmd >= R2TCMD_MAX) {
+			rc = error("invalid command id 0x%02x", cmd);
+			break;
+		}
 
-		if (msg_len < (unsigned int)r2t_min_size[cmd])
-			return error("command 0x%02x too short 0x%08x < 0x%08x", 
+		if (msg_len < (unsigned int)r2t_min_size[cmd]) {
+			rc = error("command 0x%02x too short 0x%08x < 0x%08x", 
 					cmd, msg_len, (unsigned int)r2t_min_size[cmd]);
+			break;
+		}
 
-		if (!cmd_handlers[cmd])
-			return error("command 0x%02x not supported", cmd);
+		if (!cmd_handlers[cmd]) {
+			rc = error("command 0x%02x not supported", cmd);
+			break;
+		}
 
 		// call specific command handler
-		if (cmd_handlers[cmd]((const r2tmsg_t*)(data+off), msg_len))
-			return -1;
-
-		off += msg_len;
+		if (cmd_handlers[cmd]((const r2tmsg_t*)msg, msg_len)) {
+			rc = -1;
+			break;
+		}
 	}
 
 	if (off > 0)
 		iobuf_consume(ibuf, off);
 
-	return 0;
+	return rc;
 }
 
 // R2TERR_xxx error strings

common/print.c

@@ -169,7 +169,7 @@ int error(const char *fmt, ...)
  */
 void print_xfer(const char *name, char rw, unsigned int size)
 {
-	info(1, (rw=='r'?"%-6s          < %-8u":"%-6s %8u >"), name, size);
+	debug(1, (rw=='r'?"%-6s          < %-8u":"%-6s %8u >"), name, size);
 }
 
 #ifdef DEBUG

server/Makefile.mingw32

@@ -1,5 +1,6 @@
 BIN=rdp2tcp.exe
-CC=i586-mingw32msvc-gcc
+# CC=i586-mingw32msvc-gcc
+CC=i686-w64-mingw32-gcc
 CFLAGS=-Wall -g \
 		 -D_WIN32_WINNT=0x0501 \
 		 -I../common

server/aio.c

@@ -61,7 +61,7 @@ int __aio_init_forward(aio_t *rio, aio_t *wio
 
 	rio->io.hEvent = evt1;
 	wio->io.hEvent = evt2;
-	rio->min_io_size = 1024;
+	rio->min_io_size = 2048;
 	wio->min_io_size = 0;
 
 	return 0;

server/channel.c

@@ -144,7 +144,7 @@ int channel_write_event(void)
 		vc.connected ^= 1;
 	}
 
-	return 0;
+	return ret;
 }
 
 /**

server/tunnel.c

@@ -67,11 +67,9 @@ static unsigned char wsa_to_r2t_error(int err)
  */
 static unsigned char tunnel_generate_id(void)
 {
-	int ok;
 	unsigned char tid;
 	static unsigned char last_tid = 0xff;
 
-	ok = 1;
 	for (tid=last_tid+1; tid!=last_tid; ++tid) {
 		if (!tunnel_lookup(tid)) {
 			last_tid = tid;
@@ -504,6 +502,8 @@ int tunnel_event(tunnel_t *tun, HANDLE h)
 			if ((ret >= 0) && (evt & FD_READ)) {
 				debug(0, "FD_READ");
 				ret = tunnel_sockrecv_event(tun);
+				if (evt & FD_CLOSE)
+				    while ((ret = tunnel_sockrecv_event(tun)) > 0);
 			}
 
 			if (evt & FD_CLOSE) {