X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.c;h=c05abe28f7e42233b59cf35da17b22c241b31f28;hb=17af65c78c2e754647f37cf0599b6bced213d7c6;hp=51bbf44e958f8a9622eefc47b70fd12a94d4d4a9;hpb=36d125e1d7e0dcc0538ebb066048beeec22ffccf;p=PuTTY.git

diff --git a/ssh.c b/ssh.c
index 51bbf44e..c05abe28 100644
--- a/ssh.c
+++ b/ssh.c
@@ -2831,11 +2831,13 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
     }
 
     {
-	char type, *e;
+	char type;
+	static char *e;
 	int n;
-	int sport,dport;
+	int sport,dport,sserv,dserv;
 	char sports[256], dports[256], host[256];
 	char buf[1024];
+	struct servent *se;
 
 	ssh_rportfwds = newtree234(ssh_rportcmp_ssh1);
         /* Add port forwardings. */
@@ -2860,12 +2862,43 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
 	    dports[n] = 0;
 	    e++;
 	    dport = atoi(dports);
+	    dserv = 0;
+	    if (dport == 0) {
+		dserv = 1;
+		se = getservbyname(dports, NULL);
+		if (se != NULL) {
+		    dport = ntohs(se->s_port);
+		} else {
+		    sprintf(buf,
+			    "Service lookup failed for destination port \"%s\"",
+			    dports);
+		    logevent(buf);
+		}
+	    }
 	    sport = atoi(sports);
+	    sserv = 0;
+	    if (sport == 0) {
+		sserv = 1;
+		se = getservbyname(sports, NULL);
+		if (se != NULL) {
+		    sport = ntohs(se->s_port);
+		} else {
+		    sprintf(buf,
+			    "Service lookup failed for source port \"%s\"",
+			    sports);
+		    logevent(buf);
+		}
+	    }
 	    if (sport && dport) {
 		if (type == 'L') {
 		    pfd_addforward(host, dport, sport);
-		    sprintf(buf, "Local port %d forwarding to %s:%d",
-			    sport, host, dport);
+		    sprintf(buf, "Local port %.*s%.*s%d%.*s forwarding to"
+			    " %s:%.*s%.*s%d%.*s",
+			    sserv ? strlen(sports) : 0, sports,
+			    sserv, "(", sport, sserv, ")",
+			    host,
+			    dserv ? strlen(dports) : 0, dports,
+			    dserv, "(", dport, dserv, ")");
 		    logevent(buf);
 		} else {
 		    struct ssh_rportfwd *pf;
@@ -2879,14 +2912,31 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
 			logevent(buf);
 			sfree(pf);
 		    } else {
-			sprintf(buf, "Requesting remote port %d forward to %s:%d",
-				sport, host, dport);
+			sprintf(buf, "Requesting remote port %.*s%.*s%d%.*s"
+				" forward to %s:%.*s%.*s%d%.*s",
+			    sserv ? strlen(sports) : 0, sports,
+			    sserv, "(", sport, sserv, ")",
+			    host,
+			    dserv ? strlen(dports) : 0, dports,
+			    dserv, "(", dport, dserv, ")");
 			logevent(buf);
 			send_packet(SSH1_CMSG_PORT_FORWARD_REQUEST,
 				    PKT_INT, sport,
 				    PKT_STR, host,
 				    PKT_INT, dport,
 				    PKT_END);
+			do {
+			    crReturnV;
+			} while (!ispkt);
+			if (pktin.type != SSH1_SMSG_SUCCESS
+			    && pktin.type != SSH1_SMSG_FAILURE) {
+			    bombout(("Protocol confusion"));
+			    crReturnV;
+			} else if (pktin.type == SSH1_SMSG_FAILURE) {
+			    c_write_str("Server refused port forwarding\r\n");
+			    ssh_editing = ssh_echoing = 1;
+			}
+			logevent("Remote port forwarding enabled");
 		    }
 		}
 	    }
@@ -4714,9 +4764,10 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
 	static char *e;		       /* preserve across crReturn */
 	char type;
 	int n;
-	int sport,dport;
+	int sport,dport,sserv,dserv;
 	char sports[256], dports[256], host[256];
 	char buf[1024];
+	struct servent *se;
 
 	ssh_rportfwds = newtree234(ssh_rportcmp_ssh2);
         /* Add port forwardings. */
@@ -4741,12 +4792,43 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
 	    dports[n] = 0;
 	    e++;
 	    dport = atoi(dports);
+	    dserv = 0;
+	    if (dport == 0) {
+		dserv = 1;
+		se = getservbyname(dports, NULL);
+		if (se != NULL) {
+		    dport = ntohs(se->s_port);
+		} else {
+		    sprintf(buf,
+			    "Service lookup failed for destination port \"%s\"",
+			    dports);
+		    logevent(buf);
+		}
+	    }
 	    sport = atoi(sports);
+	    sserv = 0;
+	    if (sport == 0) {
+		sserv = 1;
+		se = getservbyname(sports, NULL);
+		if (se != NULL) {
+		    sport = ntohs(se->s_port);
+		} else {
+		    sprintf(buf,
+			    "Service lookup failed for source port \"%s\"",
+			    sports);
+		    logevent(buf);
+		}
+	    }
 	    if (sport && dport) {
 		if (type == 'L') {
 		    pfd_addforward(host, dport, sport);
-		    sprintf(buf, "Local port %d forwarding to %s:%d",
-			    sport, host, dport);
+		    sprintf(buf, "Local port %.*s%.*s%d%.*s forwarding to"
+			    " %s:%.*s%.*s%d%.*s",
+			    sserv ? strlen(sports) : 0, sports,
+			    sserv, "(", sport, sserv, ")",
+			    host,
+			    dserv ? strlen(dports) : 0, dports,
+			    dserv, "(", dport, dserv, ")");
 		    logevent(buf);
 		} else {
 		    struct ssh_rportfwd *pf;
@@ -4761,8 +4843,13 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
 			logevent(buf);
 			sfree(pf);
 		    } else {
-			sprintf(buf, "Requesting remote port %d (forwarded to %s:%d)",
-				sport, host, dport);
+			sprintf(buf, "Requesting remote port %.*s%.*s%d%.*s"
+				" forward to %s:%.*s%.*s%d%.*s",
+			    sserv ? strlen(sports) : 0, sports,
+			    sserv, "(", sport, sserv, ")",
+			    host,
+			    dserv ? strlen(dports) : 0, dports,
+			    dserv, "(", dport, dserv, ")");
 			logevent(buf);
 			ssh2_pkt_init(SSH2_MSG_GLOBAL_REQUEST);
 			ssh2_pkt_addstring("tcpip-forward");