shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

tests: Adjust to the current implementation to correctly free memory

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
This commit is contained in:
Jakub Jelen
2023-05-19 14:58:53 +02:00
parent 213d1c7fd8
commit af771cc35f
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/server/torture_sftpserver.c
View File

@@ -55,6 +55,14 @@ void sftp_handle_session_cb(ssh_event event,
ssh_session session, ssh_session session,
struct server_state_st *state); struct server_state_st *state);
static void free_test_server_state(void **state)
{
struct test_server_st *tss = *state;
torture_free_state(tss->state);
SAFE_FREE(tss);
}
static int setup_default_server(void **state) static int setup_default_server(void **state)
{ {
struct torture_state *s; struct torture_state *s;
@@ -159,6 +167,9 @@ static int setup_default_server(void **state)
ss->max_tries = 3; ss->max_tries = 3;
ss->error = 0; ss->error = 0;
tss->state = s;
tss->ss = ss;
/* Use the default session handling function */ /* Use the default session handling function */
ss->handle_session = sftp_handle_session_cb; ss->handle_session = sftp_handle_session_cb;
assert_non_null(ss->handle_session); assert_non_null(ss->handle_session);
@@ -167,7 +178,7 @@ static int setup_default_server(void **state)
ss->parse_global_config = false; ss->parse_global_config = false;
/* Start the server using the default values */ /* Start the server using the default values */
pid = fork_run_server(ss); pid = fork_run_server(ss, free_test_server_state, &tss);
if (pid < 0) { if (pid < 0) {
fail(); fail();
} }
@@ -180,15 +191,8 @@ static int setup_default_server(void **state)
unsetenv("PAM_WRAPPER"); unsetenv("PAM_WRAPPER");
/* Wait until the sshd is ready to accept connections */ /* Wait until the sshd is ready to accept connections */
//rc = torture_wait_for_daemon(5); rc = torture_wait_for_daemon(5);
//assert_int_equal(rc, 0); assert_int_equal(rc, 0);
/* TODO properly wait for the server (use ping approach) */
/* Wait 200ms */
usleep(200 * 1000);
tss->state = s;
tss->ss = ss;
*state = tss; *state = tss;