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

Improved diagnostics in port-forwarding: we now log any error returned by

Browse Source 
pfd_addforward() rather than just ignoring it.

[originally from svn r4529]
This commit is contained in:
Jacob Nevins 2004-09-03 13:46:39 +00:00
parent 47997ad904
commit 27193c4bf0
1 changed files with 68 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
ssh.c
View File

@ -3449,27 +3449,40 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
} }
} }
if (sport && dport) { if (sport && dport) {
if (type == 'L') { /* Set up a description of the source port. */
pfd_addforward(host, dport, *saddr ? saddr : NULL, char *sportdesc = dupprintf("%.*s%.*s%.*s%.*s%d%.*s",
sport, ssh, &ssh->cfg);
logeventf(ssh, "Local port %.*s%.*s%.*s%.*s%d%.*s"
" forwarding to %s:%.*s%.*s%d%.*s",
(int)(*saddr?strlen(saddr):0), *saddr?saddr:NULL,
(int)(*saddr?1:0), ":",
(int)(sserv ? strlen(sports) : 0), sports,
sserv, "(", sport, sserv, ")",
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?strlen(saddr):0), *saddr?saddr:NULL,
(int)(*saddr?1:0), ":", (int)(*saddr?1:0), ":",
(int)(sserv ? strlen(sports) : 0), sports, (int)(sserv ? strlen(sports) : 0), sports,
sserv, "(", sport, sserv, ")"); sserv, "(", sport, sserv, ")");
if (type == 'L') {
/* Verbose description of the destination port */
char *dportdesc = dupprintf("%s:%.*s%.*s%d%.*s",
host,
(int)(dserv ? strlen(dports) : 0), dports,
dserv, "(", dport, dserv, ")");
const char *err = pfd_addforward(host, dport,
*saddr ? saddr : NULL,
sport, ssh, &ssh->cfg);
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);
}
sfree(dportdesc);
} else if (type == 'D') {
const char *err = pfd_addforward(NULL, -1,
*saddr ? saddr : NULL,
sport, ssh, &ssh->cfg);
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);
}
} else { } else {
struct ssh_rportfwd *pf; struct ssh_rportfwd *pf;
pf = snew(struct ssh_rportfwd); pf = snew(struct ssh_rportfwd);
@ -3512,6 +3525,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
logevent("Remote port forwarding enabled"); logevent("Remote port forwarding enabled");
} }
} }
sfree(sportdesc);
} }
} }
} }
@ -5606,27 +5620,40 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
} }
} }
if (sport && dport) { if (sport && dport) {
if (type == 'L') { /* Set up a description of the source port. */
pfd_addforward(host, dport, *saddr ? saddr : NULL, char *sportdesc = dupprintf("%.*s%.*s%.*s%.*s%d%.*s",
sport, ssh, &ssh->cfg);
logeventf(ssh, "Local port %.*s%.*s%.*s%.*s%d%.*s"
" forwarding to %s:%.*s%.*s%d%.*s",
(int)(*saddr?strlen(saddr):0), *saddr?saddr:NULL,
(int)(*saddr?1:0), ":",
(int)(sserv ? strlen(sports) : 0), sports,
sserv, "(", sport, sserv, ")",
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?strlen(saddr):0), *saddr?saddr:NULL,
(int)(*saddr?1:0), ":", (int)(*saddr?1:0), ":",
(int)(sserv ? strlen(sports) : 0), sports, (int)(sserv ? strlen(sports) : 0), sports,
sserv, "(", sport, sserv, ")"); sserv, "(", sport, sserv, ")");
if (type == 'L') {
/* Verbose description of the destination port */
char *dportdesc = dupprintf("%s:%.*s%.*s%d%.*s",
host,
(int)(dserv ? strlen(dports) : 0), dports,
dserv, "(", dport, dserv, ")");
const char *err = pfd_addforward(host, dport,
*saddr ? saddr : NULL,
sport, ssh, &ssh->cfg);
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);
}
sfree(dportdesc);
} else if (type == 'D') {
const char *err = pfd_addforward(NULL, -1,
*saddr ? saddr : NULL,
sport, ssh, &ssh->cfg);
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);
}
} else { } else {
struct ssh_rportfwd *pf; struct ssh_rportfwd *pf;
pf = snew(struct ssh_rportfwd); pf = snew(struct ssh_rportfwd);
@ -5638,14 +5665,9 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
" to %s:%d", host, dport); " to %s:%d", host, dport);
sfree(pf); sfree(pf);
} else { } else {
logeventf(ssh, "Requesting remote port " logeventf(ssh, "Requesting remote port %s"
"%.*s%.*s%.*s%.*s%d%.*s"
" forward to %s:%.*s%.*s%d%.*s", " forward to %s:%.*s%.*s%d%.*s",
(int)(*saddr?strlen(saddr):0), sportdesc,
*saddr?saddr:NULL,
(int)(*saddr?1:0), ":",
(int)(sserv ? strlen(sports) : 0), sports,
sserv, "(", sport, sserv, ")",
host, host,
(int)(dserv ? strlen(dports) : 0), dports, (int)(dserv ? strlen(dports) : 0), dports,
dserv, "(", dport, dserv, ")"); dserv, "(", dport, dserv, ")");
@ -5686,6 +5708,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
} }
} }
} }
sfree(sportdesc);
} }
} }
} }