From 94b6bad3c8aa17fc852d86efa52c28c4f105531f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 13 Dec 2023 00:14:45 +0000 Subject: [PATCH] example, tests: call `WSACleanup()` for each `WSAStartup()` On Windows. Closes #1283 --- example/direct_tcpip.c | 4 ++++ example/scp.c | 4 ++++ example/scp_nonblock.c | 4 ++++ example/scp_write.c | 4 ++++ example/scp_write_nonblock.c | 4 ++++ example/sftp.c | 4 ++++ example/sftp_RW_nonblock.c | 4 ++++ example/sftp_append.c | 4 ++++ example/sftp_mkdir.c | 4 ++++ example/sftp_mkdir_nonblock.c | 4 ++++ example/sftp_nonblock.c | 4 ++++ example/sftp_write.c | 4 ++++ example/sftp_write_nonblock.c | 4 ++++ example/sftp_write_sliding.c | 4 ++++ example/sftpdir.c | 4 ++++ example/sftpdir_nonblock.c | 4 ++++ example/ssh2.c | 4 ++++ example/ssh2_agent.c | 4 ++++ example/ssh2_agent_forwarding.c | 4 ++++ example/ssh2_echo.c | 4 ++++ example/ssh2_exec.c | 4 ++++ example/subsystem_netconf.c | 4 ++++ example/tcpip-forward.c | 4 ++++ tests/openssh_fixture.c | 4 ++++ tests/test_ssh2.c | 4 ++++ 25 files changed, 100 insertions(+) diff --git a/example/direct_tcpip.c b/example/direct_tcpip.c index 94e9fcdd..19f77a92 100644 --- a/example/direct_tcpip.c +++ b/example/direct_tcpip.c @@ -336,5 +336,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/scp.c b/example/scp.c index 5c11f891..e5fc1a09 100644 --- a/example/scp.c +++ b/example/scp.c @@ -189,5 +189,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/scp_nonblock.c b/example/scp_nonblock.c index 66d020b2..818b2273 100644 --- a/example/scp_nonblock.c +++ b/example/scp_nonblock.c @@ -292,5 +292,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/scp_write.c b/example/scp_write.c index 3528be5f..7ced6c0d 100644 --- a/example/scp_write.c +++ b/example/scp_write.c @@ -221,5 +221,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/scp_write_nonblock.c b/example/scp_write_nonblock.c index 5f795031..360c150d 100644 --- a/example/scp_write_nonblock.c +++ b/example/scp_write_nonblock.c @@ -279,5 +279,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp.c b/example/sftp.c index bc282a67..67eeddf7 100644 --- a/example/sftp.c +++ b/example/sftp.c @@ -301,5 +301,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_RW_nonblock.c b/example/sftp_RW_nonblock.c index 4ccc8fa8..7a87bf85 100644 --- a/example/sftp_RW_nonblock.c +++ b/example/sftp_RW_nonblock.c @@ -353,5 +353,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_append.c b/example/sftp_append.c index db6d3c94..f7ff7c71 100644 --- a/example/sftp_append.c +++ b/example/sftp_append.c @@ -241,5 +241,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_mkdir.c b/example/sftp_mkdir.c index 96d6c9ec..3099a255 100644 --- a/example/sftp_mkdir.c +++ b/example/sftp_mkdir.c @@ -179,5 +179,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_mkdir_nonblock.c b/example/sftp_mkdir_nonblock.c index a6d77d8d..40c1f4a2 100644 --- a/example/sftp_mkdir_nonblock.c +++ b/example/sftp_mkdir_nonblock.c @@ -178,5 +178,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_nonblock.c b/example/sftp_nonblock.c index 8deef2d5..795f6a4f 100644 --- a/example/sftp_nonblock.c +++ b/example/sftp_nonblock.c @@ -295,5 +295,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_write.c b/example/sftp_write.c index 35744dd2..f1b6f0ae 100644 --- a/example/sftp_write.c +++ b/example/sftp_write.c @@ -225,5 +225,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_write_nonblock.c b/example/sftp_write_nonblock.c index 49995f8a..fd90b083 100644 --- a/example/sftp_write_nonblock.c +++ b/example/sftp_write_nonblock.c @@ -280,5 +280,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftp_write_sliding.c b/example/sftp_write_sliding.c index 07fd8ebc..3f1321d8 100644 --- a/example/sftp_write_sliding.c +++ b/example/sftp_write_sliding.c @@ -291,5 +291,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftpdir.c b/example/sftpdir.c index 27ad2734..815b452a 100644 --- a/example/sftpdir.c +++ b/example/sftpdir.c @@ -302,5 +302,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/sftpdir_nonblock.c b/example/sftpdir_nonblock.c index 99c570ff..59b178c8 100644 --- a/example/sftpdir_nonblock.c +++ b/example/sftpdir_nonblock.c @@ -242,5 +242,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/ssh2.c b/example/ssh2.c index 8e7304a9..d863eba2 100644 --- a/example/ssh2.c +++ b/example/ssh2.c @@ -356,5 +356,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return rc; } diff --git a/example/ssh2_agent.c b/example/ssh2_agent.c index e4da2ad4..d8b22440 100644 --- a/example/ssh2_agent.c +++ b/example/ssh2_agent.c @@ -245,5 +245,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return rc; } diff --git a/example/ssh2_agent_forwarding.c b/example/ssh2_agent_forwarding.c index f11f65c0..c58808ed 100644 --- a/example/ssh2_agent_forwarding.c +++ b/example/ssh2_agent_forwarding.c @@ -292,5 +292,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/ssh2_echo.c b/example/ssh2_echo.c index 60a39bac..dbc07a14 100644 --- a/example/ssh2_echo.c +++ b/example/ssh2_echo.c @@ -365,5 +365,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return exitcode; } diff --git a/example/ssh2_exec.c b/example/ssh2_exec.c index e8567e9d..cdd1f4f2 100644 --- a/example/ssh2_exec.c +++ b/example/ssh2_exec.c @@ -301,5 +301,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/subsystem_netconf.c b/example/subsystem_netconf.c index 0271c61a..47e29efb 100644 --- a/example/subsystem_netconf.c +++ b/example/subsystem_netconf.c @@ -300,5 +300,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/example/tcpip-forward.c b/example/tcpip-forward.c index aabc11a5..4125d308 100644 --- a/example/tcpip-forward.c +++ b/example/tcpip-forward.c @@ -329,5 +329,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return 0; } diff --git a/tests/openssh_fixture.c b/tests/openssh_fixture.c index 3ffbe566..0dc567bd 100644 --- a/tests/openssh_fixture.c +++ b/tests/openssh_fixture.c @@ -477,6 +477,10 @@ void stop_openssh_fixture(void) else if(have_docker) { fprintf(stderr, "Cannot stop container - none started\n"); } + +#ifdef _WIN32 + WSACleanup(); +#endif } libssh2_socket_t open_socket_to_openssh_server(void) diff --git a/tests/test_ssh2.c b/tests/test_ssh2.c index 2e6fa238..ca282de5 100644 --- a/tests/test_ssh2.c +++ b/tests/test_ssh2.c @@ -269,5 +269,9 @@ shutdown: libssh2_exit(); +#ifdef _WIN32 + WSACleanup(); +#endif + return rc; }