Dynamic port forwarding by means of a local SOCKS server. Fully

[u/mdw/putty] / cmdline.c

diff --git a/cmdline.c b/cmdline.c
index 8b181f6..eb98f60 100644 (file)
--- a/cmdline.c
+++ b/cmdline.c
@@ -111,6 +111,7 @@ static int cmdline_check_unavailable(int flag, char *p)
 #define RETURN(x) do { \
     if ((x) == 2 && !value) return -2; \
     ret = x; \
+    if (need_save < 0) return x; \
 } while (0)
 
 int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
@@ -126,7 +127,7 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-ssh")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        default_protocol = cfg->protocol = PROT_SSH;
        default_port = cfg->port = 22;
@@ -134,7 +135,7 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-telnet")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        default_protocol = cfg->protocol = PROT_TELNET;
        default_port = cfg->port = 23;
@@ -142,7 +143,7 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-rlogin")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        default_protocol = cfg->protocol = PROT_RLOGIN;
        default_port = cfg->port = 513;
@@ -150,7 +151,7 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-raw")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        default_protocol = cfg->protocol = PROT_RAW;
     }
@@ -160,48 +161,52 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-l")) {
        RETURN(2);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        strncpy(cfg->username, value, sizeof(cfg->username));
        cfg->username[sizeof(cfg->username) - 1] = '\0';
     }
-    if ((!strcmp(p, "-L") || !strcmp(p, "-R"))) {
+    if ((!strcmp(p, "-L") || !strcmp(p, "-R") || !strcmp(p, "-D"))) {
        char *fwd, *ptr, *q, *qq;
-       int i=0;
+       int dynamic, i=0;
        RETURN(2);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
+       dynamic = !strcmp(p, "-D");
        fwd = value;
        ptr = cfg->portfwd;
        /* if multiple forwards, find end of list */
-       if (ptr[0]=='R' || ptr[0]=='L') {
+       if (ptr[0]=='R' || ptr[0]=='L' || ptr[0] == 'D') {
            for (i = 0; i < sizeof(cfg->portfwd) - 2; i++)
                if (ptr[i]=='\000' && ptr[i+1]=='\000')
                    break;
            ptr = ptr + i + 1;  /* point to next forward slot */
        }
-       ptr[0] = p[1];  /* insert a 'L' or 'R' at the start */
+       ptr[0] = p[1];  /* insert a 'L', 'R' or 'D' at the start */
        if (strlen(fwd) > sizeof(cfg->portfwd) - i - 2) {
            cmdline_error("out of space for port forwardings");
            return ret;
        }
        strncpy(ptr+1, fwd, sizeof(cfg->portfwd) - i);
-       /*
-        * We expect _at least_ two colons in this string. The
-        * possible formats are `sourceport:desthost:destport', or
-        * `sourceip:sourceport:desthost:destport' if you're
-        * specifying a particular loopback address. We need to
-        * replace the one between source and dest with a \t; this
-        * means we must find the second-to-last colon in the
-        * string.
-        */
-       q = qq = strchr(ptr, ':');
-       while (qq) {
-           char *qqq = strchr(qq+1, ':');
-           if (qqq)
-               q = qq;
-           qq = qqq;
+       if (!dynamic) {
+           /*
+            * We expect _at least_ two colons in this string. The
+            * possible formats are `sourceport:desthost:destport',
+            * or `sourceip:sourceport:desthost:destport' if you're
+            * specifying a particular loopback address. We need to
+            * replace the one between source and dest with a \t;
+            * this means we must find the second-to-last colon in
+            * the string.
+            */
+           q = qq = strchr(ptr, ':');
+           while (qq) {
+               char *qqq = strchr(qq+1, ':');
+               if (qqq)
+                   q = qq;
+               qq = qqq;
+           }
+           if (q) *q = '\t';          /* replace second-last colon with \t */
        }
-       if (q) *q = '\t';              /* replace second-last colon with \t */
        cfg->portfwd[sizeof(cfg->portfwd) - 1] = '\0';
        cfg->portfwd[sizeof(cfg->portfwd) - 2] = '\0';
        ptr[strlen(ptr)+1] = '\000';    /* append two '\000' */
@@ -213,7 +218,7 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
        int c, d;
 
        RETURN(2);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
 
        filename = value;
@@ -243,11 +248,13 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-P")) {
        RETURN(2);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
        SAVEABLE(1);                   /* lower priority than -ssh,-telnet */
        cfg->port = atoi(value);
     }
     if (!strcmp(p, "-pw")) {
        RETURN(2);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
        cmdline_password = value;
        ssh_get_line = cmdline_get_line;
        ssh_getline_pw_only = TRUE;
@@ -255,62 +262,66 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 
     if (!strcmp(p, "-A")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->agentfwd = 1;
     }
     if (!strcmp(p, "-a")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->agentfwd = 0;
     }
 
     if (!strcmp(p, "-X")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->x11_forward = 1;
     }
     if (!strcmp(p, "-x")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->x11_forward = 0;
     }
 
     if (!strcmp(p, "-t")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->nopty = 0;
     }
     if (!strcmp(p, "-T")) {
        RETURN(1);
-       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+       UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->nopty = 1;
     }
 
     if (!strcmp(p, "-C")) {
        RETURN(1);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->compression = 1;
     }
 
     if (!strcmp(p, "-1")) {
        RETURN(1);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->sshprot = 0;              /* ssh protocol 1 only */
     }
     if (!strcmp(p, "-2")) {
        RETURN(1);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->sshprot = 3;              /* ssh protocol 2 only */
     }
 
     if (!strcmp(p, "-i")) {
        RETURN(2);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
        SAVEABLE(0);
        cfg->keyfile = filename_from_str(value);
     }