nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 09:12:24 +00:00
Code Issues Projects Releases Wiki Activity

Matt Harden's (modified) patch to do getservbyname() lookups on port-

Browse Source 
forwarding port numbers.

[originally from svn r1608]
This commit is contained in:
Simon Tatham 2002-03-27 21:43:37 +00:00
parent ecd496a621
commit e40f043ff8
1 changed files with 84 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
ssh.c
View File

@ -2833,9 +2833,10 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
{ {
char type, *e; char type, *e;
int n; int n;
int sport,dport; int sport,dport,sserv,dserv;
char sports[256], dports[256], host[256]; char sports[256], dports[256], host[256];
char buf[1024]; char buf[1024];
struct servent *se;
ssh_rportfwds = newtree234(ssh_rportcmp_ssh1); ssh_rportfwds = newtree234(ssh_rportcmp_ssh1);
/* Add port forwardings. */ /* Add port forwardings. */
@ -2860,12 +2861,43 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
dports[n] = 0; dports[n] = 0;
e++; e++;
dport = atoi(dports); 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); 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 (sport && dport) {
if (type == 'L') { if (type == 'L') {
pfd_addforward(host, dport, sport); pfd_addforward(host, dport, sport);
sprintf(buf, "Local port %d forwarding to %s:%d", sprintf(buf, "Local port %.*s%.*s%d%.*s forwarding to"
sport, host, dport); " %s:%.*s%.*s%d%.*s",
sserv ? strlen(sports) : 0, sports,
sserv, "(", sport, sserv, ")",
host,
dserv ? strlen(dports) : 0, dports,
dserv, "(", dport, dserv, ")");
logevent(buf); logevent(buf);
} else { } else {
struct ssh_rportfwd *pf; struct ssh_rportfwd *pf;
@ -2879,8 +2911,13 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
logevent(buf); logevent(buf);
sfree(pf); sfree(pf);
} else { } else {
sprintf(buf, "Requesting remote port %d forward to %s:%d", sprintf(buf, "Requesting remote port %.*s%.*s%d%.*s"
sport, host, dport); " 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); logevent(buf);
send_packet(SSH1_CMSG_PORT_FORWARD_REQUEST, send_packet(SSH1_CMSG_PORT_FORWARD_REQUEST,
PKT_INT, sport, PKT_INT, sport,
@ -4714,9 +4751,10 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
static char *e; /* preserve across crReturn */ static char *e; /* preserve across crReturn */
char type; char type;
int n; int n;
int sport,dport; int sport,dport,sserv,dserv;
char sports[256], dports[256], host[256]; char sports[256], dports[256], host[256];
char buf[1024]; char buf[1024];
struct servent *se;
ssh_rportfwds = newtree234(ssh_rportcmp_ssh2); ssh_rportfwds = newtree234(ssh_rportcmp_ssh2);
/* Add port forwardings. */ /* Add port forwardings. */
@ -4741,12 +4779,43 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
dports[n] = 0; dports[n] = 0;
e++; e++;
dport = atoi(dports); 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); 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 (sport && dport) {
if (type == 'L') { if (type == 'L') {
pfd_addforward(host, dport, sport); pfd_addforward(host, dport, sport);
sprintf(buf, "Local port %d forwarding to %s:%d", sprintf(buf, "Local port %.*s%.*s%d%.*s forwarding to"
sport, host, dport); " %s:%.*s%.*s%d%.*s",
sserv ? strlen(sports) : 0, sports,
sserv, "(", sport, sserv, ")",
host,
dserv ? strlen(dports) : 0, dports,
dserv, "(", dport, dserv, ")");
logevent(buf); logevent(buf);
} else { } else {
struct ssh_rportfwd *pf; struct ssh_rportfwd *pf;
@ -4761,8 +4830,13 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
logevent(buf); logevent(buf);
sfree(pf); sfree(pf);
} else { } else {
sprintf(buf, "Requesting remote port %d (forwarded to %s:%d)", sprintf(buf, "Requesting remote port %.*s%.*s%d%.*s"
sport, host, dport); " 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); logevent(buf);
ssh2_pkt_init(SSH2_MSG_GLOBAL_REQUEST); ssh2_pkt_init(SSH2_MSG_GLOBAL_REQUEST);
ssh2_pkt_addstring("tcpip-forward"); ssh2_pkt_addstring("tcpip-forward");