tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: refactor to be more readable top to bottom. Prompted by 

Coverity CID 405048 which was a false-positive fd leak; ok dtucker@

OpenBSD-Commit-ID: fc55ec2af622a017defb9b768bf26faefc792c00
This commit is contained in:
djm@openbsd.org 2023-03-07 21:47:42 +00:00 committed by Damien Miller
parent 42a06b29a4
commit eee9f3fc3d
No known key found for this signature in database
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.428 2023/03/04 03:22:59 dtucker Exp $ */ /* $OpenBSD: channels.c,v 1.429 2023/03/07 21:47:42 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1986,11 +1986,14 @@ channel_post_connecting(struct ssh *ssh, Channel *c)
fatal_f("channel %d: no remote id", c->self); fatal_f("channel %d: no remote id", c->self);
/* for rdynamic the OPEN_CONFIRMATION has been sent already */ /* for rdynamic the OPEN_CONFIRMATION has been sent already */
isopen = (c->type == SSH_CHANNEL_RDYNAMIC_FINISH); isopen = (c->type == SSH_CHANNEL_RDYNAMIC_FINISH);
if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, &err, &sz) == -1) { if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, &err, &sz) == -1) {
err = errno; err = errno;
error("getsockopt SO_ERROR failed"); error("getsockopt SO_ERROR failed");
} }
if (err == 0) { if (err == 0) {
/* Non-blocking connection completed */
debug("channel %d: connected to %s port %d", debug("channel %d: connected to %s port %d",
c->self, c->connect_ctx.host, c->connect_ctx.port); c->self, c->connect_ctx.host, c->connect_ctx.port);
channel_connect_ctx_free(&c->connect_ctx); channel_connect_ctx_free(&c->connect_ctx);
@ -2008,16 +2011,17 @@ channel_post_connecting(struct ssh *ssh, Channel *c)
(r = sshpkt_send(ssh)) != 0) (r = sshpkt_send(ssh)) != 0)
fatal_fr(r, "channel %i open confirm", c->self); fatal_fr(r, "channel %i open confirm", c->self);
} }
} else { return;
debug("channel %d: connection failed: %s", }
c->self, strerror(err)); if (err == EINTR || err == EAGAIN || err == EINPROGRESS)
/* Try next address, if any */ return;
if ((sock = connect_next(&c->connect_ctx)) > 0) {
close(c->sock); /* Non-blocking connection failed */
c->sock = c->rfd = c->wfd = sock; debug("channel %d: connection failed: %s", c->self, strerror(err));
return;
} /* Try next address, if any */
/* Exhausted all addresses */ if ((sock = connect_next(&c->connect_ctx)) == -1) {
/* Exhausted all addresses for this destination */
error("connect_to %.100s port %d: failed.", error("connect_to %.100s port %d: failed.",
c->connect_ctx.host, c->connect_ctx.port); c->connect_ctx.host, c->connect_ctx.port);
channel_connect_ctx_free(&c->connect_ctx); channel_connect_ctx_free(&c->connect_ctx);
@ -2036,6 +2040,10 @@ channel_post_connecting(struct ssh *ssh, Channel *c)
chan_mark_dead(ssh, c); chan_mark_dead(ssh, c);
} }
} }
/* New non-blocking connection in progress */
close(c->sock);
c->sock = c->rfd = c->wfd = sock;
} }
static int static int