Commit 16099833 by Edward Thomson

Merge pull request #3651 from libgit2/cmn/init-libssh2

ssh: initialize libssh2
parents 839bdb05 22f3d3aa
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "openssl_stream.h" #include "openssl_stream.h"
#include "thread-utils.h" #include "thread-utils.h"
#include "git2/global.h" #include "git2/global.h"
#include "transports/ssh.h"
#if defined(GIT_MSVC_CRTDBG) #if defined(GIT_MSVC_CRTDBG)
#include "win32/w32_stack.h" #include "win32/w32_stack.h"
...@@ -56,7 +57,8 @@ static int init_common(void) ...@@ -56,7 +57,8 @@ static int init_common(void)
/* Initialize any other subsystems that have global state */ /* Initialize any other subsystems that have global state */
if ((ret = git_hash_global_init()) == 0 && if ((ret = git_hash_global_init()) == 0 &&
(ret = git_sysdir_global_init()) == 0 && (ret = git_sysdir_global_init()) == 0 &&
(ret = git_filter_global_init()) == 0) (ret = git_filter_global_init()) == 0 &&
(ret = git_transport_ssh_global_init()) == 0)
ret = git_openssl_stream_global_init(); ret = git_openssl_stream_global_init();
GIT_MEMORY_BARRIER; GIT_MEMORY_BARRIER;
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "smart.h" #include "smart.h"
#include "cred.h" #include "cred.h"
#include "socket_stream.h" #include "socket_stream.h"
#include "ssh.h"
#ifdef GIT_SSH #ifdef GIT_SSH
...@@ -876,3 +877,18 @@ int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *p ...@@ -876,3 +877,18 @@ int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *p
return -1; return -1;
#endif #endif
} }
int git_transport_ssh_global_init(void)
{
#ifdef GIT_SSH
libssh2_init(0);
return 0;
#else
/* Nothing to initialize */
return 0;
#endif
}
/*
* Copyright (C) the libgit2 contributors. All rights reserved.
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
#ifndef INCLUDE_ssh_h__
#define INCLUDE_ssh_h__
int git_transport_ssh_global_init(void);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment