The WinSock library is now loaded at run-time, which means we can

[u/mdw/putty] / plink.c

diff --git a/plink.c b/plink.c
index d61bbeb..b46c5d6 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -2,10 +2,6 @@
  * PLink - a command-line (stdin/stdout) variant of PuTTY.
  */
 
-#ifndef AUTO_WINSOCK
-#include <winsock2.h>
-#endif
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -16,8 +12,17 @@
 #include "storage.h"
 #include "tree234.h"
 
+#define WM_AGENT_CALLBACK (WM_XUSER + 4)
+
 #define MAX_STDIN_BACKLOG 4096
 
+struct agent_callback {
+    void (*callback)(void *, void *, int);
+    void *callback_ctx;
+    void *data;
+    int len;
+};
+
 void fatalbox(char *p, ...)
 {
     va_list ap;
@@ -26,7 +31,6 @@ void fatalbox(char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    WSACleanup();
     cleanup_exit(1);
 }
 void modalfatalbox(char *p, ...)
@@ -37,7 +41,6 @@ void modalfatalbox(char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    WSACleanup();
     cleanup_exit(1);
 }
 void connection_fatal(void *frontend, char *p, ...)
@@ -48,7 +51,6 @@ void connection_fatal(void *frontend, char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    WSACleanup();
     cleanup_exit(1);
 }
 void cmdline_error(char *p, ...)
@@ -171,8 +173,6 @@ int from_backend(void *frontend_handle, int is_stderr,
 {
     int osize, esize;
 
-    assert(len > 0);
-
     if (is_stderr) {
        bufchain_add(&stderr_data, data, len);
        try_output(1);
@@ -187,6 +187,19 @@ int from_backend(void *frontend_handle, int is_stderr,
     return osize + esize;
 }
 
+static DWORD main_thread_id;
+
+void agent_schedule_callback(void (*callback)(void *, void *, int),
+                            void *callback_ctx, void *data, int len)
+{
+    struct agent_callback *c = snew(struct agent_callback);
+    c->callback = callback;
+    c->callback_ctx = callback_ctx;
+    c->data = data;
+    c->len = len;
+    PostThreadMessage(main_thread_id, WM_AGENT_CALLBACK, 0, (LPARAM)c);
+}
+
 /*
  *  Short description of parameters.
  */
@@ -218,6 +231,7 @@ static void usage(void)
     printf("  -1 -2     force use of particular protocol version\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     exit(1);
 }
 
@@ -230,12 +244,12 @@ char *do_select(SOCKET skt, int startup)
     } else {
        events = 0;
     }
-    if (WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
-       switch (WSAGetLastError()) {
+    if (p_WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
+       switch (p_WSAGetLastError()) {
          case WSAENETDOWN:
            return "Network is down";
          default:
-           return "WSAAsyncSelect(): unknown error";
+           return "WSAEventSelect(): unknown error";
        }
     }
     return NULL;
@@ -243,8 +257,6 @@ char *do_select(SOCKET skt, int startup)
 
 int main(int argc, char **argv)
 {
-    WSADATA wsadata;
-    WORD winsock_ver;
     WSAEVENT stdinevent, stdoutevent, stderrevent;
     HANDLE handles[4];
     DWORD in_threadid, out_threadid, err_threadid;
@@ -257,6 +269,7 @@ int main(int argc, char **argv)
     int connopen;
     int exitcode;
     int errors;
+    int use_subsystem = 0;
 
     ssh_get_line = console_get_line;
 
@@ -309,6 +322,9 @@ int main(int argc, char **argv)
                continue;
            } else if (!strcmp(p, "-batch")) {
                console_batch_mode = 1;
+           } else if (!strcmp(p, "-s")) {
+               /* Save status to write to cfg later. */
+               use_subsystem = 1;
            } else {
                fprintf(stderr, "plink: unknown option \"%s\"\n", p);
                errors = 1;
@@ -467,6 +483,12 @@ int main(int argc, char **argv)
     cmdline_run_saved(&cfg);
 
     /*
+     * Apply subsystem status.
+     */
+    if (use_subsystem)
+       cfg.ssh_subsys = TRUE;
+
+    /*
      * Trim a colon suffix off the hostname if it's there.
      */
     cfg.host[strcspn(cfg.host, ":")] = '\0';
@@ -514,29 +536,18 @@ int main(int argc, char **argv)
     if (portnumber != -1)
        cfg.port = portnumber;
 
-    /*
-     * Initialise WinSock.
-     */
-    winsock_ver = MAKEWORD(2, 0);
-    if (WSAStartup(winsock_ver, &wsadata)) {
-       MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
-                  MB_OK | MB_ICONEXCLAMATION);
-       return 1;
-    }
-    if (LOBYTE(wsadata.wVersion) != 2 || HIBYTE(wsadata.wVersion) != 0) {
-       MessageBox(NULL, "WinSock version is incompatible with 2.0",
-                  "WinSock Error", MB_OK | MB_ICONEXCLAMATION);
-       WSACleanup();
+    sk_init();
+    if (p_WSAEventSelect == NULL) {
+       fprintf(stderr, "Plink requires WinSock 2\n");
        return 1;
     }
-    sk_init();
 
     /*
      * Start up the connection.
      */
     netevent = CreateEvent(NULL, FALSE, FALSE, NULL);
     {
-       char *error;
+       const char *error;
        char *realhost;
        /* nodelay is only useful if stdin is a character device (console) */
        int nodelay = cfg.tcp_nodelay &&
@@ -565,6 +576,8 @@ int main(int argc, char **argv)
     GetConsoleMode(inhandle, &orig_console_mode);
     SetConsoleMode(inhandle, ENABLE_PROCESSED_INPUT);
 
+    main_thread_id = GetCurrentThreadId();
+
     /*
      * Turn off ECHO and LINE input modes. We don't care if this
      * call fails, because we know we aren't necessarily running in
@@ -629,7 +642,8 @@ int main(int argc, char **argv)
            sending = TRUE;
        }
 
-       n = WaitForMultipleObjects(4, handles, FALSE, INFINITE);
+       n = MsgWaitForMultipleObjects(4, handles, FALSE, INFINITE,
+                                     QS_POSTMESSAGE);
        if (n == 0) {
            WSANETWORKEVENTS things;
            SOCKET socket;
@@ -668,7 +682,7 @@ int main(int argc, char **argv)
                WPARAM wp;
                socket = sklist[i];
                wp = (WPARAM) socket;
-               if (!WSAEnumNetworkEvents(socket, NULL, &things)) {
+               if (!p_WSAEnumNetworkEvents(socket, NULL, &things)) {
                     static const struct { int bit, mask; } eventtypes[] = {
                         {FD_CONNECT_BIT, FD_CONNECT},
                         {FD_READ_BIT, FD_READ},
@@ -727,6 +741,15 @@ int main(int argc, char **argv)
                back->unthrottle(backhandle, bufchain_size(&stdout_data) +
                                 bufchain_size(&stderr_data));
            }
+       } else if (n == 4) {
+           MSG msg;
+           while (PeekMessage(&msg, INVALID_HANDLE_VALUE,
+                              WM_AGENT_CALLBACK, WM_AGENT_CALLBACK,
+                              PM_REMOVE)) {
+               struct agent_callback *c = (struct agent_callback *)msg.lParam;
+               c->callback(c->callback_ctx, c->data, c->len);
+               sfree(c);
+           }
        }
        if (!reading && back->sendbuffer(backhandle) < MAX_STDIN_BACKLOG) {
            SetEvent(idata.eventback);
@@ -737,11 +760,11 @@ int main(int argc, char **argv)
            bufchain_size(&stderr_data) == 0)
            break;                     /* we closed the connection */
     }
-    WSACleanup();
     exitcode = back->exitcode(backhandle);
     if (exitcode < 0) {
        fprintf(stderr, "Remote process exit code unavailable\n");
        exitcode = 1;                  /* this is an error condition */
     }
-    return exitcode;
+    cleanup_exit(exitcode);
+    return 0;                         /* placate compiler warning */
 }