diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2004-08-12 16:41:58 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2004-08-12 16:41:58 +0000 |
| commit | 8e1ec24f55be1a9af2595a58bb4b805bebd7fa9d (patch) | |
| tree | 0b54a905a49358adc37ce32e3e80239dd6ebd736 /svr-tcpfwd.c | |
| parent | 538bc5a09e8a7aa6fdc7f38f0bac649efd6bd264 (diff) | |
Merging in the changes from 0.41-0.43 main Dropbear tree
--HG--
extra : convert_revision : 4c3428781bc8faf0fd7cadd7099fbd7f4ea386e7
Diffstat (limited to 'svr-tcpfwd.c')
| -rw-r--r-- | svr-tcpfwd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/svr-tcpfwd.c b/svr-tcpfwd.c index 0eccae4..0f22a23 100644 --- a/svr-tcpfwd.c +++ b/svr-tcpfwd.c @@ -208,7 +208,7 @@ static int newtcpdirect(struct Channel * channel) { char portstring[NI_MAXSERV]; int sock; int len; - int ret = DROPBEAR_FAILURE; + int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED; if (opts.nolocaltcp) { TRACE(("leave newtcpdirect: local tcp forwarding disabled")); @@ -240,6 +240,7 @@ static int newtcpdirect(struct Channel * channel) { snprintf(portstring, sizeof(portstring), "%d", destport); sock = connect_remote(desthost, portstring, 1, NULL); if (sock < 0) { + err = SSH_OPEN_CONNECT_FAILED; TRACE(("leave newtcpdirect: sock failed")); goto out; } @@ -253,13 +254,13 @@ static int newtcpdirect(struct Channel * channel) { channel->infd = sock; channel->initconn = 1; - ret = DROPBEAR_SUCCESS; + err = SSH_OPEN_IN_PROGRESS; out: m_free(desthost); m_free(orighost); - TRACE(("leave newtcpdirect: ret %d", ret)); - return ret; + TRACE(("leave newtcpdirect: err %d", err)); + return err; } #endif |