X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/c1cb7bae1a56520c8bc58c1753faddacb16ac646..b0f6943a5dc83eaaaba15ebce897e162c1624033:/clientloop.c

diff --git a/clientloop.c b/clientloop.c
index c136dae3..9398dc98 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.160 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.169 2006/07/17 01:31:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -65,14 +65,17 @@
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
+#include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include <ctype.h>
+#include <errno.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
 #include <signal.h>
 #include <termios.h>
+#include <unistd.h>
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -131,7 +134,7 @@ static volatile sig_atomic_t received_signal = 0;
 static int in_non_blocking_mode = 0;
 
 /* Common data for the client loop code. */
-static int quit_pending;	/* Set to non-zero to quit the client loop. */
+static volatile sig_atomic_t quit_pending; /* Set non-zero to quit the loop. */
 static int escape_char;		/* Escape character. */
 static int escape_pending;	/* Last character was the escape character */
 static int last_was_cr;		/* Last character was a newline. */
@@ -582,7 +585,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
 }
 
 static void
-client_process_net_input(fd_set * readset)
+client_process_net_input(fd_set *readset)
 {
 	int len;
 	char buf[8192];
@@ -690,7 +693,7 @@ client_extra_session2_setup(int id, void *arg)
 }
 
 static void
-client_process_control(fd_set * readset)
+client_process_control(fd_set *readset)
 {
 	Buffer m;
 	Channel *c;
@@ -844,6 +847,7 @@ client_process_control(fd_set * readset)
 
 	debug2("%s: accepted tty %d, subsys %d, cmd %s", __func__,
 	    cctx->want_tty, cctx->want_subsys, cmd);
+	xfree(cmd);
 
 	/* Gather fds from client */
 	new_fd[0] = mm_receive_fd(client_fd);
@@ -924,12 +928,16 @@ process_cmdline(void)
 
 	if (*s == 'h' || *s == 'H' || *s == '?') {
 		logit("Commands:");
-		logit("      -Lport:host:hostport    Request local forward");
-		logit("      -Rport:host:hostport    Request remote forward");
-		logit("      -KRhostport             Cancel remote forward");
+		logit("      -L[bind_address:]port:host:hostport    "
+		    "Request local forward");
+		logit("      -R[bind_address:]port:host:hostport    "
+		    "Request remote forward");
+		logit("      -KR[bind_address:]port                 "
+		    "Cancel remote forward");
 		if (!options.permit_local_command)
 			goto out;
-		logit("      !args                   Execute local command");
+		logit("      !args                                  "
+		    "Execute local command");
 		goto out;
 	}
 
@@ -990,9 +998,12 @@ process_cmdline(void)
 				goto out;
 			}
 		} else {
-			channel_request_remote_forwarding(fwd.listen_host,
+			if (channel_request_remote_forwarding(fwd.listen_host,
 			    fwd.listen_port, fwd.connect_host,
-			    fwd.connect_port);
+			    fwd.connect_port) < 0) {
+				logit("Port forwarding failed.");
+				goto out;
+			}
 		}
 
 		logit("Forwarding port.");
@@ -1184,7 +1195,7 @@ Supported escape sequences:\r\n\
 }
 
 static void
-client_process_input(fd_set * readset)
+client_process_input(fd_set *readset)
 {
 	int len;
 	char buf[8192];
@@ -1237,7 +1248,7 @@ client_process_input(fd_set * readset)
 }
 
 static void
-client_process_output(fd_set * writeset)
+client_process_output(fd_set *writeset)
 {
 	int len;
 	char buf[100];