X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f47a5ffbcffa2963f22151334975e89a7bb84d05..055817455466c8eb60392f30bb7c689763962e17:/ssh.c

diff --git a/ssh.c b/ssh.c
index 3f37c649..170253b2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -521,6 +521,7 @@ struct ssh_portfwd {
     unsigned sport, dport;
     char *saddr, *daddr;
     struct ssh_rportfwd *remote;
+    int addressfamily;
     void *local;
 };
 #define free_portfwd(pf) ( \
@@ -2449,8 +2450,11 @@ static const char *connect_to_host(Ssh ssh, char *host, int port,
     /*
      * Try to find host.
      */
-    logeventf(ssh, "Looking up host \"%s\"", host);
-    addr = name_lookup(host, port, realhost, &ssh->cfg);
+    logeventf(ssh, "Looking up host \"%s\"%s", host,
+	      (ssh->cfg.addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" :
+	       (ssh->cfg.addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" : "")));
+    addr = name_lookup(host, port, realhost, &ssh->cfg,
+		       ssh->cfg.addressfamily);
     if ((err = sk_addr_error(addr)) != NULL) {
 	sk_addr_free(addr);
 	return err;
@@ -3666,7 +3670,7 @@ static void ssh_rportfwd_succfail(Ssh ssh, struct Packet *pktin, void *ctx)
 
 static void ssh_setup_portfwd(Ssh ssh, const Config *cfg)
 {
-    char type;
+    char address_family, type;
     int n;
     int sport,dport,sserv,dserv;
     char sports[256], dports[256], saddr[256], host[256];
@@ -3690,8 +3694,22 @@ static void ssh_setup_portfwd(Ssh ssh, const Config *cfg)
     }
 
     while (*portfwd_strptr) {
-	type = *portfwd_strptr++;
+	address_family = 'A';
+	type = 'L';
+	while (*portfwd_strptr && *portfwd_strptr != '\t') {
+	    if (*portfwd_strptr == 'A' ||
+		*portfwd_strptr == '4' ||
+		*portfwd_strptr == '6')
+		address_family = *portfwd_strptr;
+	    else if (*portfwd_strptr == 'L' ||
+		*portfwd_strptr == 'R' ||
+		*portfwd_strptr == 'D')
+		type = *portfwd_strptr;
+	    portfwd_strptr++;
+	}
+
 	saddr[0] = '\0';
+
 	n = 0;
 	while (*portfwd_strptr && *portfwd_strptr != '\t') {
 	    if (*portfwd_strptr == ':') {
@@ -3774,6 +3792,9 @@ static void ssh_setup_portfwd(Ssh ssh, const Config *cfg)
 	    pfrec->dport = dport;
 	    pfrec->local = NULL;
 	    pfrec->remote = NULL;
+	    pfrec->addressfamily = (address_family == '4' ? ADDRTYPE_IPV4 :
+				    address_family == '6' ? ADDRTYPE_IPV6 :
+				    ADDRTYPE_UNSPEC);
 
 	    epfrec = add234(ssh->portfwds, pfrec);
 	    if (epfrec != pfrec) {
@@ -3793,27 +3814,28 @@ static void ssh_setup_portfwd(Ssh ssh, const Config *cfg)
 		const char *err = pfd_addforward(host, dport,
 						 *saddr ? saddr : NULL,
 						 sport, ssh, &ssh->cfg,
-						 &pfrec->local);
-		if (err) {
-		    logeventf(ssh, "Local port %s forward to %s"
-			      " failed: %s", sportdesc, dportdesc, err);
-		} else {
-		    logeventf(ssh, "Local port %s forwarding to %s",
-			      sportdesc, dportdesc);
-		}
+						 &pfrec->local,
+						 pfrec->addressfamily);
+
+		logeventf(ssh, "Local %sport %s forward to %s%s%s",
+			  pfrec->addressfamily == ADDRTYPE_IPV4 ? "IPv4 " :
+			  pfrec->addressfamily == ADDRTYPE_IPV6 ? "IPv6 " : "",
+			  sportdesc, dportdesc,
+			  err ? " failed: " : "", err);
+
 		sfree(dportdesc);
 	    } else if (type == 'D') {
 		const char *err = pfd_addforward(NULL, -1,
 						 *saddr ? saddr : NULL,
 						 sport, ssh, &ssh->cfg,
-						 &pfrec->local);
-		if (err) {
-		    logeventf(ssh, "Local port %s SOCKS dynamic forward"
-			      " setup failed: %s", sportdesc, err);
-		} else {
-		    logeventf(ssh, "Local port %s doing SOCKS"
-			      " dynamic forwarding", sportdesc);
-		}
+						 &pfrec->local,
+						 pfrec->addressfamily);
+
+			logeventf(ssh, "Local %sport %s SOCKS dynamic forward%s%s",
+				  pfrec->addressfamily == ADDRTYPE_IPV4 ? "IPv4 " :
+				  pfrec->addressfamily == ADDRTYPE_IPV6 ? "IPv6 " : "",
+				  sportdesc,
+				  err ? " setup failed: " : "", err);
 	    } else {
 		struct ssh_rportfwd *pf;
 
@@ -4045,7 +4067,7 @@ static void ssh1_msg_port_open(Ssh ssh, struct Packet *pktin)
     /* Remote side is trying to open a channel to talk to a
      * forwarded port. Give them back a local channel number. */
     struct ssh_channel *c;
-    struct ssh_rportfwd pf;
+    struct ssh_rportfwd pf, *pfp;
     int remoteid;
     int hostsize, port;
     char *host, buf[1024];
@@ -4062,8 +4084,9 @@ static void ssh1_msg_port_open(Ssh ssh, struct Packet *pktin)
     memcpy(pf.dhost, host, hostsize);
     pf.dhost[hostsize] = '\0';
     pf.dport = port;
+    pfp = find234(ssh->rportfwds, &pf, NULL);
 
-    if (find234(ssh->rportfwds, &pf, NULL) == NULL) {
+    if (pfp == NULL) {
 	sprintf(buf, "Rejected remote port open request for %s:%d",
 		pf.dhost, port);
 	logevent(buf);
@@ -4074,7 +4097,7 @@ static void ssh1_msg_port_open(Ssh ssh, struct Packet *pktin)
 		pf.dhost, port);
 	logevent(buf);
 	e = pfd_newconnect(&c->u.pfd.s, pf.dhost, port,
-			   c, &ssh->cfg);
+			   c, &ssh->cfg, pfp->pfrec->addressfamily);
 	if (e != NULL) {
 	    char buf[256];
 	    sprintf(buf, "Port open failed: %s", e);
@@ -4185,7 +4208,7 @@ static void ssh1_msg_channel_data(Ssh ssh, struct Packet *pktin)
     /* Data sent down one of our channels. */
     int i = ssh_pkt_getuint32(pktin);
     char *p;
-    int len;
+    unsigned int len;
     struct ssh_channel *c;
 
     ssh_pkt_getstring(pktin, &p, &len);
@@ -4204,7 +4227,7 @@ static void ssh1_msg_channel_data(Ssh ssh, struct Packet *pktin)
 	    /* Data for an agent message. Buffer it. */
 	    while (len > 0) {
 		if (c->u.a.lensofar < 4) {
-		    int l = min(4 - c->u.a.lensofar, len);
+		    unsigned int l = min(4 - c->u.a.lensofar, len);
 		    memcpy(c->u.a.msglen + c->u.a.lensofar, p,
 			   l);
 		    p += l;
@@ -4219,7 +4242,7 @@ static void ssh1_msg_channel_data(Ssh ssh, struct Packet *pktin)
 		    memcpy(c->u.a.message, c->u.a.msglen, 4);
 		}
 		if (c->u.a.lensofar >= 4 && len > 0) {
-		    int l =
+		    unsigned int l =
 			min(c->u.a.totallen - c->u.a.lensofar,
 			    len);
 		    memcpy(c->u.a.message + c->u.a.lensofar, p,
@@ -5335,7 +5358,7 @@ static void ssh2_msg_channel_window_adjust(Ssh ssh, struct Packet *pktin)
 static void ssh2_msg_channel_data(Ssh ssh, struct Packet *pktin)
 {
     char *data;
-    int length;
+    unsigned int length;
     unsigned i = ssh_pkt_getuint32(pktin);
     struct ssh_channel *c;
     c = find234(ssh->channels, &i, ssh_channelfind);
@@ -5364,7 +5387,7 @@ static void ssh2_msg_channel_data(Ssh ssh, struct Packet *pktin)
 	  case CHAN_AGENT:
 	    while (length > 0) {
 		if (c->u.a.lensofar < 4) {
-		    int l = min(4 - c->u.a.lensofar, length);
+		    unsigned int l = min(4 - c->u.a.lensofar, length);
 		    memcpy(c->u.a.msglen + c->u.a.lensofar,
 			   data, l);
 		    data += l;
@@ -5379,7 +5402,7 @@ static void ssh2_msg_channel_data(Ssh ssh, struct Packet *pktin)
 		    memcpy(c->u.a.message, c->u.a.msglen, 4);
 		}
 		if (c->u.a.lensofar >= 4 && length > 0) {
-		    int l =
+		    unsigned int l =
 			min(c->u.a.totallen - c->u.a.lensofar,
 			    length);
 		    memcpy(c->u.a.message + c->u.a.lensofar,
@@ -5799,7 +5822,8 @@ static void ssh2_msg_channel_open(Ssh ssh, struct Packet *pktin)
 	    const char *e = pfd_newconnect(&c->u.pfd.s,
 					   realpf->dhost,
 					   realpf->dport, c,
-					   &ssh->cfg);
+					   &ssh->cfg,
+					   realpf->pfrec->addressfamily);
 	    logeventf(ssh, "Attempting to forward remote port to "
 		      "%s:%d", realpf->dhost, realpf->dport);
 	    if (e != NULL) {
@@ -7794,7 +7818,7 @@ void ssh_send_port_open(void *channel, char *hostname, int port, char *org)
 		    PKT_INT, c->localid,
 		    PKT_STR, hostname,
 		    PKT_INT, port,
-		    //PKT_STR, <org:orgport>,
+		    /* PKT_STR, <org:orgport>, */
 		    PKT_END);
     } else {
 	pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_OPEN);
@@ -7861,6 +7885,16 @@ static int ssh_return_exitcode(void *handle)
 }
 
 /*
+ * cfg_info for SSH is the currently running version of the
+ * protocol. (1 for 1; 2 for 2; 0 for not-decided-yet.)
+ */
+static int ssh_cfg_info(void *handle)
+{
+    Ssh ssh = (Ssh) handle;
+    return ssh->version;
+}
+
+/*
  * Gross hack: pscp will try to start SFTP but fall back to scp1 if
  * that fails. This variable is the means by which scp.c can reach
  * into the SSH code and find out which one it got.
@@ -7887,5 +7921,6 @@ Backend ssh_backend = {
     ssh_provide_ldisc,
     ssh_provide_logctx,
     ssh_unthrottle,
+    ssh_cfg_info,
     22
 };