diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-05-01 07:10:01 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-05-10 11:55:48 +1000 |
commit | 639d6bc57b1942393ed12fb48f00bc05d4e093e4 (patch) | |
tree | 683e82b29b8c711bbabfdfb7f4724f8f95ca3b93 /dispatch.c | |
parent | 9559d7de34c572d4d3fd990ca211f8ec99f62c4d (diff) |
upstream commit
refactor ssh_dispatch_run_fatal() to use sshpkt_fatal()
to better report error conditions. Teach sshpkt_fatal() about ECONNRESET.
Improves error messages on TCP connection resets. bz#2257
ok dtucker@
Diffstat (limited to 'dispatch.c')
-rw-r--r-- | dispatch.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/dispatch.c b/dispatch.c index afe618221..aac933e0a 100644 --- a/dispatch.c +++ b/dispatch.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dispatch.c,v 1.26 2015/02/12 20:34:19 dtucker Exp $ */ | 1 | /* $OpenBSD: dispatch.c,v 1.27 2015/05/01 07:10:01 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -137,22 +137,6 @@ ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done, | |||
137 | { | 137 | { |
138 | int r; | 138 | int r; |
139 | 139 | ||
140 | if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) { | 140 | if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) |
141 | switch (r) { | 141 | sshpkt_fatal(ssh, __func__, r); |
142 | case SSH_ERR_CONN_CLOSED: | ||
143 | logit("Connection closed by %.200s", | ||
144 | ssh_remote_ipaddr(ssh)); | ||
145 | cleanup_exit(255); | ||
146 | case SSH_ERR_CONN_TIMEOUT: | ||
147 | logit("Connection to %.200s timed out while " | ||
148 | "waiting to read", ssh_remote_ipaddr(ssh)); | ||
149 | cleanup_exit(255); | ||
150 | case SSH_ERR_DISCONNECTED: | ||
151 | logit("Disconnected from %.200s", | ||
152 | ssh_remote_ipaddr(ssh)); | ||
153 | cleanup_exit(255); | ||
154 | default: | ||
155 | fatal("%s: %s", __func__, ssh_err(r)); | ||
156 | } | ||
157 | } | ||
158 | } | 142 | } |