Attachment 2612 Details for Bug 2257 – improved diff; refactor to sshpkt_fatal

[patch] improved diff; refactor to sshpkt_fatal

improve-reset-err.diff (text/plain), 1.99 KB, created by Damien Miller on 2015-05-01 14:51:44 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2015-05-01 14:51:44 AEST

Size: 1.99 KB

patch

obsolete

>Index: packet.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/packet.c,v
>retrieving revision 1.211
>diff -u -p -r1.211 packet.c
>--- packet.c	27 Apr 2015 01:52:30 -0000	1.211
>+++ packet.c	1 May 2015 04:50:49 -0000
>@@ -1908,9 +1908,19 @@ sshpkt_fatal(struct ssh *ssh, const char
> 		logit("Connection closed by %.200s", ssh_remote_ipaddr(ssh));
> 		cleanup_exit(255);
> 	case SSH_ERR_CONN_TIMEOUT:
>-		logit("Connection to %.200s timed out while "
>-		    "waiting to write", ssh_remote_ipaddr(ssh));
>+		logit("Connection to %.200s timed out", ssh_remote_ipaddr(ssh));
> 		cleanup_exit(255);
>+	case SSH_ERR_DISCONNECTED:
>+		logit("Disconnected from %.200s",
>+		    ssh_remote_ipaddr(ssh));
>+		cleanup_exit(255);
>+	case SSH_ERR_SYSTEM_ERROR:
>+		if (errno == ECONNRESET) {
>+			logit("Connection reset by %.200s",
>+			    ssh_remote_ipaddr(ssh));
>+			cleanup_exit(255);
>+		}
>+		/* FALLTHROUGH */
> 	default:
> 		fatal("%s%sConnection to %.200s: %s",
> 		    tag != NULL ? tag : "", tag != NULL ? ": " : "",
>Index: dispatch.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/dispatch.c,v
>retrieving revision 1.26
>diff -u -p -r1.26 dispatch.c
>--- dispatch.c	12 Feb 2015 20:34:19 -0000	1.26
>+++ dispatch.c	1 May 2015 04:50:49 -0000
>@@ -135,22 +135,6 @@ ssh_dispatch_run_fatal(struct ssh *ssh, 
> {
> 	int r;
> 
>-	if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) {
>-		switch (r) {
>-		case SSH_ERR_CONN_CLOSED:
>-			logit("Connection closed by %.200s",
>-			    ssh_remote_ipaddr(ssh));
>-			cleanup_exit(255);
>-		case SSH_ERR_CONN_TIMEOUT:
>-			logit("Connection to %.200s timed out while "
>-			    "waiting to read", ssh_remote_ipaddr(ssh));
>-			cleanup_exit(255);
>-		case SSH_ERR_DISCONNECTED:
>-			logit("Disconnected from %.200s",
>-			    ssh_remote_ipaddr(ssh));
>-			cleanup_exit(255);
>-		default:
>-			fatal("%s: %s", __func__, ssh_err(r));
>-		}
>-	}
>+	if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0)
>+		sshpkt_fatal(ssh, __func__, r);
> }

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2257: 2457 | 2611 | 2612