Merge pull request #3 from shaddybaddah/2-rtun-stall

Fix #2 reverse tunnel server side stall by recv() on rconn ack

Author: shaddybaddah

server/commands.c

@@ -102,6 +102,7 @@ static int cmd_data(const r2tmsg_t *msg, unsigned int len)
 
 static int cmd_rconn(const r2tmsg_t *msg, unsigned int len)
 {
+	int ret = 0;
 	tunnel_t *tun;
 
 	trace_chan("len=%u, id=0x%02x", len, msg->id);
@@ -110,9 +111,12 @@ static int cmd_rconn(const r2tmsg_t *msg, unsigned int len)
 		error("invalid tunnel id 0x%02x", msg->id);
 		return 0;
 	}
+	if (tun->connected < 0) {
+		while ((ret = tunnel_sockrecv_event(tun)) > 0);
+	}
 	tun->connected = 1;
 
-	return 0;
+	return ret;
 }
 
 const cmdhandler_t cmd_handlers[R2TCMD_MAX] = {

server/r2twin.h

@@ -47,7 +47,7 @@ typedef struct _vchannel {
 typedef struct _tunnel {
 	struct list_head list;   /**< double-linked list */
 	sock_t sock;             /**< tunnel socket */
-	unsigned char connected; /**< 1 if tunnel is connected */
+	char connected; /**< 1 if tunnel is connected */
 	unsigned char server;    /**< 1 for reverse-connect tunnel */
 	unsigned char id;        /**< tunnel identifier */
 	HANDLE proc;     /**< child process HANDLE */
@@ -104,6 +104,7 @@ int tunnel_event(tunnel_t *, HANDLE);
 int tunnel_write(tunnel_t *tun, const void *, unsigned int);
 void tunnel_close(tunnel_t *);
 void tunnels_kill(void);
+int tunnel_sockrecv_event(tunnel_t *tun);
 
 /* errors.c ***/
 int wsaerror(const char *);

server/tunnel.c

@@ -331,7 +331,7 @@ void tunnel_close(tunnel_t *tun)
 	free(tun);
 }
 
-static int tunnel_sockrecv_event(tunnel_t *tun)
+int tunnel_sockrecv_event(tunnel_t *tun)
 {
 	int ret;
 	unsigned int r;
@@ -501,8 +501,10 @@ int tunnel_event(tunnel_t *tun, HANDLE h)
 
 			if ((ret >= 0) && (evt & FD_READ)) {
 				debug(0, "FD_READ");
-				if (tun->connected)
+				if (tun->connected > 0)
 				    ret = tunnel_sockrecv_event(tun);
+				else
+				    tun->connected = -1;
 				if (evt & FD_CLOSE)
 				    while ((ret = tunnel_sockrecv_event(tun)) > 0);
 			}