Merge pull request libgit2#4596 from pks-t/pks/ssh-disconnect

ethomson · web-flow · commit 17339cb34af3 · 2018-04-16T15:35:56.000+01:00
transports: ssh: disconnect session before freeing it
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
@@ -212,6 +212,7 @@ static void ssh_stream_free(git_smart_subtransport_stream *stream)
 	}
 
 	if (s->session) {
+		libssh2_session_disconnect(s->session, "closing transport");
 		libssh2_session_free(s->session);
 		s->session = NULL;
 	}
@@ -489,7 +490,7 @@ static int _git_ssh_session_create(
 	}
 
 	do {
-		rc = libssh2_session_startup(s, socket->s);
+		rc = libssh2_session_handshake(s, socket->s);
 	} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);
 
 	if (rc != LIBSSH2_ERROR_NONE) {

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,7 @@ static void ssh_stream_free(git_smart_subtransport_stream *stream)`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`if (s->session) {`
	`215`	`+ libssh2_session_disconnect(s->session, "closing transport");`
`215`	`216`	`libssh2_session_free(s->session);`
`216`	`217`	`s->session = NULL;`
`217`	`218`	`}`
`@@ -489,7 +490,7 @@ static int _git_ssh_session_create(`
`489`	`490`	`}`
`490`	`491`
`491`	`492`	`do {`
`492`		`- rc = libssh2_session_startup(s, socket->s);`
	`493`	`+ rc = libssh2_session_handshake(s, socket->s);`
`493`	`494`	`} while (LIBSSH2_ERROR_EAGAIN == rc \|\| LIBSSH2_ERROR_TIMEOUT == rc);`
`494`	`495`
`495`	`496`	`if (rc != LIBSSH2_ERROR_NONE) {`