X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/3d88e64dfcf5dc0fd361ce0c504c67a9196ce44c..0f0a25075f6e788462506686cf538bc13a5beedb:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index e71e6446..5d3efb29 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -237,6 +237,13 @@ void sigwinch(int signum)
 }
 
 /*
+ * In Plink our selects are synchronous, so these functions are
+ * empty stubs.
+ */
+int uxsel_input_add(int fd, int rwx) { return 0; }
+void uxsel_input_remove(int id) { }
+
+/*
  * Short description of parameters.
  */
 static void usage(void)
@@ -256,6 +263,7 @@ static void usage(void)
     printf("  -batch    disable all interactive prompts\n");
     printf("The following options only apply to SSH connections:\n");
     printf("  -pw passw login with specified password\n");
+    printf("  -D listen-port   Dynamic SOCKS-based port forwarding\n");
     printf("  -L listen-port:host:port   Forward local port to "
 	   "remote address\n");
     printf("  -R listen-port:host:port   Forward remote port to"
@@ -273,9 +281,9 @@ int main(int argc, char **argv)
 {
     int sending;
     int portnumber = -1;
-    int *sklist;
-    int socket;
-    int i, skcount, sksize, socketstate;
+    int *fdlist;
+    int fd;
+    int i, fdcount, fdsize, fdstate;
     int connopen;
     int exitcode;
     int errors;
@@ -283,8 +291,8 @@ int main(int argc, char **argv)
 
     ssh_get_line = console_get_line;
 
-    sklist = NULL;
-    skcount = sksize = 0;
+    fdlist = NULL;
+    fdcount = fdsize = 0;
     /*
      * Initialise port and protocol to sensible defaults. (These
      * will be overridden by more or less anything.)
@@ -559,13 +567,14 @@ int main(int argc, char **argv)
     putty_signal(SIGWINCH, sigwinch);
 
     sk_init();
+    uxsel_init();
 
     /*
      * Start up the connection.
      */
     logctx = log_init(NULL, &cfg);
     {
-	char *error;
+	const char *error;
 	char *realhost;
 	/* nodelay is only useful if stdin is a terminal device */
 	int nodelay = cfg.tcp_nodelay && isatty(0);
@@ -623,31 +632,31 @@ int main(int argc, char **argv)
 	    FD_SET_MAX(2, maxfd, wset);
 	}
 
-	/* Count the currently active sockets. */
+	/* Count the currently active fds. */
 	i = 0;
-	for (socket = first_socket(&socketstate, &rwx); socket >= 0;
-	     socket = next_socket(&socketstate, &rwx)) i++;
+	for (fd = first_fd(&fdstate, &rwx); fd >= 0;
+	     fd = next_fd(&fdstate, &rwx)) i++;
 
-	/* Expand the sklist buffer if necessary. */
-	if (i > sksize) {
-	    sksize = i + 16;
-	    sklist = sresize(sklist, sksize, int);
+	/* Expand the fdlist buffer if necessary. */
+	if (i > fdsize) {
+	    fdsize = i + 16;
+	    fdlist = sresize(fdlist, fdsize, int);
 	}
 
 	/*
-	 * Add all currently open sockets to the select sets, and
-	 * store them in sklist as well.
+	 * Add all currently open fds to the select sets, and store
+	 * them in fdlist as well.
 	 */
-	skcount = 0;
-	for (socket = first_socket(&socketstate, &rwx); socket >= 0;
-	     socket = next_socket(&socketstate, &rwx)) {
-	    sklist[skcount++] = socket;
+	fdcount = 0;
+	for (fd = first_fd(&fdstate, &rwx); fd >= 0;
+	     fd = next_fd(&fdstate, &rwx)) {
+	    fdlist[fdcount++] = fd;
 	    if (rwx & 1)
-		FD_SET_MAX(socket, maxfd, rset);
+		FD_SET_MAX(fd, maxfd, rset);
 	    if (rwx & 2)
-		FD_SET_MAX(socket, maxfd, wset);
+		FD_SET_MAX(fd, maxfd, wset);
 	    if (rwx & 4)
-		FD_SET_MAX(socket, maxfd, xset);
+		FD_SET_MAX(fd, maxfd, xset);
 	}
 
 	do {
@@ -659,19 +668,19 @@ int main(int argc, char **argv)
 	    exit(1);
 	}
 
-	for (i = 0; i < skcount; i++) {
-	    socket = sklist[i];
+	for (i = 0; i < fdcount; i++) {
+	    fd = fdlist[i];
             /*
              * We must process exceptional notifications before
              * ordinary readability ones, or we may go straight
              * past the urgent marker.
              */
-	    if (FD_ISSET(socket, &xset))
-		select_result(socket, 4);
-	    if (FD_ISSET(socket, &rset))
-		select_result(socket, 1);
-	    if (FD_ISSET(socket, &wset))
-		select_result(socket, 2);
+	    if (FD_ISSET(fd, &xset))
+		select_result(fd, 4);
+	    if (FD_ISSET(fd, &rset))
+		select_result(fd, 1);
+	    if (FD_ISSET(fd, &wset))
+		select_result(fd, 2);
 	}
 
 	if (FD_ISSET(signalpipe[0], &rset)) {