1
0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-05 20:55:46 +03:00

init: Introduce internal is_ssh_initialized()

The introduced function returns whether the library is initialized or
not.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2020-04-06 12:07:28 +02:00
committed by Andreas Schneider
parent e3e52394c1
commit dba2114ed7
3 changed files with 45 additions and 0 deletions

View File

@@ -32,6 +32,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdbool.h>
#if !defined(HAVE_STRTOULL) #if !defined(HAVE_STRTOULL)
# if defined(HAVE___STRTOULL) # if defined(HAVE___STRTOULL)
@@ -417,4 +418,6 @@ void explicit_bzero(void *s, size_t n);
void ssh_agent_state_free(void *data); void ssh_agent_state_free(void *data);
bool is_ssh_initialized(void);
#endif /* _LIBSSH_PRIV_H */ #endif /* _LIBSSH_PRIV_H */

View File

@@ -261,4 +261,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,
#endif /* _WIN32 */ #endif /* _WIN32 */
/**
* @internal
* @brief Return whether the library is initialized
*
* @returns true if the library is initialized; false otherwise.
*
* @see ssh_init()
*/
bool is_ssh_initialized() {
bool is_initialized = false;
ssh_mutex_lock(&ssh_init_mutex);
is_initialized = _ssh_initialized > 0;
ssh_mutex_unlock(&ssh_init_mutex);
return is_initialized;
}
/** @} */ /** @} */

View File

@@ -2,6 +2,7 @@
#define LIBSSH_STATIC #define LIBSSH_STATIC
#include <errno.h>
#include "torture.h" #include "torture.h"
#include "libssh/libssh.h" #include "libssh/libssh.h"
@@ -32,11 +33,33 @@ static void torture_ssh_init_after_finalize(void **state) {
assert_int_equal(rc, SSH_OK); assert_int_equal(rc, SSH_OK);
} }
static void torture_is_ssh_initialized(UNUSED_PARAM(void **state)) {
int rc;
bool initialized = false;
/* Make sure the library is not initialized */
while (is_ssh_initialized()) {
rc = ssh_finalize();
assert_return_code(rc, errno);
}
rc = ssh_init();
assert_return_code(rc, errno);
initialized = is_ssh_initialized();
assert_true(initialized);
rc = ssh_finalize();
assert_return_code(rc, errno);
initialized = is_ssh_initialized();
assert_false(initialized);
}
int torture_run_tests(void) { int torture_run_tests(void) {
int rc; int rc;
struct CMUnitTest tests[] = { struct CMUnitTest tests[] = {
cmocka_unit_test(torture_ssh_init), cmocka_unit_test(torture_ssh_init),
cmocka_unit_test(torture_ssh_init_after_finalize), cmocka_unit_test(torture_ssh_init_after_finalize),
cmocka_unit_test(torture_is_ssh_initialized),
}; };
torture_filter_tests(tests); torture_filter_tests(tests);