Missing bits for colour selection support.

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index b696e46..a004176 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -3149,30 +3149,35 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                if (n < 255) sports[n++] = *ssh->portfwd_strptr++;
            }
            sports[n] = 0;
-           if (*ssh->portfwd_strptr == '\t')
-               ssh->portfwd_strptr++;
-           n = 0;
-           while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
-               if (n < 255) host[n++] = *ssh->portfwd_strptr++;
-           }
-           host[n] = 0;
-           if (*ssh->portfwd_strptr == ':')
+           if (type != 'D') {
+               if (*ssh->portfwd_strptr == '\t')
+                   ssh->portfwd_strptr++;
+               n = 0;
+               while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
+                   if (n < 255) host[n++] = *ssh->portfwd_strptr++;
+               }
+               host[n] = 0;
+               if (*ssh->portfwd_strptr == ':')
+                   ssh->portfwd_strptr++;
+               n = 0;
+               while (*ssh->portfwd_strptr) {
+                   if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
+               }
+               dports[n] = 0;
                ssh->portfwd_strptr++;
-           n = 0;
-           while (*ssh->portfwd_strptr) {
-               if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
-           }
-           dports[n] = 0;
-           ssh->portfwd_strptr++;
-           dport = atoi(dports);
-           dserv = 0;
-           if (dport == 0) {
-               dserv = 1;
-               dport = net_service_lookup(dports);
-               if (!dport) {
-                   logeventf(ssh, "Service lookup failed for"
-                             " destination port \"%s\"", dports);
+               dport = atoi(dports);
+               dserv = 0;
+               if (dport == 0) {
+                   dserv = 1;
+                   dport = net_service_lookup(dports);
+                   if (!dport) {
+                       logeventf(ssh, "Service lookup failed for"
+                                 " destination port \"%s\"", dports);
+                   }
                }
+           } else {
+               while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
+               dport = -1;
            }
            sport = atoi(sports);
            sserv = 0;
@@ -3197,6 +3202,15 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                              host,
                              (int)(dserv ? strlen(dports) : 0), dports,
                              dserv, "(", dport, dserv, ")");
+               } else if (type == 'D') {
+                   pfd_addforward(NULL, -1, *saddr ? saddr : NULL,
+                                  sport, ssh, &ssh->cfg);
+                   logeventf(ssh, "Local port %.*s%.*s%.*s%.*s%d%.*s"
+                             " doing SOCKS dynamic forwarding",
+                             (int)(*saddr?strlen(saddr):0), *saddr?saddr:NULL,
+                             (int)(*saddr?1:0), ":",
+                             (int)(sserv ? strlen(sports) : 0), sports,
+                             sserv, "(", sport, sserv, ")");
                } else {
                    struct ssh_rportfwd *pf;
                    pf = snew(struct ssh_rportfwd);
@@ -5230,30 +5244,35 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                if (n < 255) sports[n++] = *ssh->portfwd_strptr++;
            }
            sports[n] = 0;
-           if (*ssh->portfwd_strptr == '\t')
-               ssh->portfwd_strptr++;
-           n = 0;
-           while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
-               if (n < 255) host[n++] = *ssh->portfwd_strptr++;
-           }
-           host[n] = 0;
-           if (*ssh->portfwd_strptr == ':')
+           if (type != 'D') {
+               if (*ssh->portfwd_strptr == '\t')
+                   ssh->portfwd_strptr++;
+               n = 0;
+               while (*ssh->portfwd_strptr && *ssh->portfwd_strptr != ':') {
+                   if (n < 255) host[n++] = *ssh->portfwd_strptr++;
+               }
+               host[n] = 0;
+               if (*ssh->portfwd_strptr == ':')
+                   ssh->portfwd_strptr++;
+               n = 0;
+               while (*ssh->portfwd_strptr) {
+                   if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
+               }
+               dports[n] = 0;
                ssh->portfwd_strptr++;
-           n = 0;
-           while (*ssh->portfwd_strptr) {
-               if (n < 255) dports[n++] = *ssh->portfwd_strptr++;
-           }
-           dports[n] = 0;
-           ssh->portfwd_strptr++;
-           dport = atoi(dports);
-           dserv = 0;
-           if (dport == 0) {
-               dserv = 1;
-               dport = net_service_lookup(dports);
-               if (!dport) {
-                   logeventf(ssh, "Service lookup failed for destination"
-                             " port \"%s\"", dports);
+               dport = atoi(dports);
+               dserv = 0;
+               if (dport == 0) {
+                   dserv = 1;
+                   dport = net_service_lookup(dports);
+                   if (!dport) {
+                       logeventf(ssh, "Service lookup failed for destination"
+                                 " port \"%s\"", dports);
+                   }
                }
+           } else {
+               while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
+               dport = -1;
            }
            sport = atoi(sports);
            sserv = 0;
@@ -5278,6 +5297,15 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                              host,
                              (int)(dserv ? strlen(dports) : 0), dports,
                              dserv, "(", dport, dserv, ")");
+               } else if (type == 'D') {
+                   pfd_addforward(NULL, -1, *saddr ? saddr : NULL,
+                                  sport, ssh, &ssh->cfg);
+                   logeventf(ssh, "Local port %.*s%.*s%.*s%.*s%d%.*s"
+                             " doing SOCKS dynamic forwarding",
+                             (int)(*saddr?strlen(saddr):0), *saddr?saddr:NULL,
+                             (int)(*saddr?1:0), ":",
+                             (int)(sserv ? strlen(sports) : 0), sports,
+                             sserv, "(", sport, sserv, ")");
                } else {
                    struct ssh_rportfwd *pf;
                    pf = snew(struct ssh_rportfwd);
@@ -5808,7 +5836,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                int typelen;
                char *peeraddr;
                int peeraddrlen;
-               int port;
+               int peerport;
                char *error = NULL;
                struct ssh_channel *c;
                unsigned remid, winsize, pktsize;
@@ -5819,18 +5847,20 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                remid = ssh2_pkt_getuint32(ssh);
                winsize = ssh2_pkt_getuint32(ssh);
                pktsize = ssh2_pkt_getuint32(ssh);
-               ssh2_pkt_getstring(ssh, &peeraddr, &peeraddrlen);
-               port = ssh2_pkt_getuint32(ssh);
 
                if (typelen == 3 && !memcmp(type, "x11", 3)) {
-                   char *addrstr = snewn(peeraddrlen+1, char);
+                   char *addrstr;
+
+                    ssh2_pkt_getstring(ssh, &peeraddr, &peeraddrlen);
+                   addrstr = snewn(peeraddrlen+1, char);
                    memcpy(addrstr, peeraddr, peeraddrlen);
                    peeraddr[peeraddrlen] = '\0';
+                    peerport = ssh2_pkt_getuint32(ssh);
 
                    if (!ssh->X11_fwd_enabled)
                        error = "X11 forwarding is not enabled";
                    else if (x11_init(&c->u.x11.s, ssh->cfg.x11_display, c,
-                                     ssh->x11auth, addrstr, port,
+                                     ssh->x11auth, addrstr, peerport,
                                      &ssh->cfg) != NULL) {
                        error = "Unable to open an X11 connection";
                    } else {
@@ -5845,6 +5875,8 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                    int dummylen;
                    ssh2_pkt_getstring(ssh, &dummy, &dummylen);/* skip address */
                    pf.sport = ssh2_pkt_getuint32(ssh);
+                    ssh2_pkt_getstring(ssh, &peeraddr, &peeraddrlen);
+                    peerport = ssh2_pkt_getuint32(ssh);
                    realpf = find234(ssh->rportfwds, &pf, NULL);
                    if (realpf == NULL) {
                        error = "Remote port is not recognised";