example, test_ssh2: shutdown socket before close

Syncing them with `tests/session_fixture.c`.

Cherry-picked from #1017

example/direct_tcpip.c

@@ -305,6 +305,7 @@ int main(int argc, char *argv[])
 shutdown:
 
     if(forwardsock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(forwardsock, 2);
 #ifdef WIN32
         closesocket(forwardsock);
 #else
@@ -313,6 +314,7 @@ shutdown:
     }
 
     if(listensock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(listensock, 2);
 #ifdef WIN32
         closesocket(listensock);
 #else
@@ -329,6 +331,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/scp.c

@@ -178,6 +178,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/scp_nonblock.c

@@ -281,6 +281,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/scp_write.c

@@ -207,6 +207,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/scp_write_nonblock.c

@@ -267,6 +267,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp.c

@@ -290,6 +290,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_RW_nonblock.c

@@ -338,6 +338,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_append.c

@@ -227,6 +227,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_mkdir.c

@@ -168,6 +168,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_mkdir_nonblock.c

@@ -167,6 +167,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_nonblock.c

@@ -284,6 +284,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_write.c

@@ -211,6 +211,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_write_nonblock.c

@@ -269,6 +269,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftp_write_sliding.c

@@ -280,6 +280,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftpdir.c

@@ -291,6 +291,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/sftpdir_nonblock.c

@@ -231,6 +231,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/ssh2.c

@@ -339,6 +339,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/ssh2_agent.c

@@ -234,6 +234,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/ssh2_agent_forwarding.c

@@ -282,6 +282,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/ssh2_echo.c

@@ -353,6 +353,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/ssh2_exec.c

@@ -291,6 +291,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/subsystem_netconf.c

@@ -289,6 +289,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/tcpip-forward.c

@@ -300,6 +300,7 @@ int main(int argc, char *argv[])
 shutdown:
 
     if(forwardsock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(forwardsock, 2);
 #ifdef WIN32
         closesocket(forwardsock);
 #else
@@ -319,6 +320,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2);
 #ifdef WIN32
         closesocket(sock);
 #else

example/x11.c

@@ -180,8 +180,10 @@ static void x11_callback(LIBSSH2_SESSION *session, LIBSSH2_CHANNEL *channel,
                     chan_iter->next = new;
                 }
             }
-            else
+            else {
+                shutdown(sock, SHUT_RDWR);
                 close(sock);
+            }
         }
     }
     return;
@@ -345,6 +347,7 @@ int main(int argc, char *argv[])
     if(rc) {
         fprintf(stderr, "Failed to authenticate\n");
         session_shutdown(session);
+        shutdown(sock, SHUT_RDWR);
         close(sock);
         return -1;
     }
@@ -354,6 +357,7 @@ int main(int argc, char *argv[])
     if(!channel) {
         fprintf(stderr, "Failed to open a new channel\n");
         session_shutdown(session);
+        shutdown(sock, SHUT_RDWR);
         close(sock);
         return -1;
     }
@@ -363,6 +367,7 @@ int main(int argc, char *argv[])
     if(rc) {
         fprintf(stderr, "Failed to request a pty\n");
         session_shutdown(session);
+        shutdown(sock, SHUT_RDWR);
         close(sock);
         return -1;
     }
@@ -372,6 +377,7 @@ int main(int argc, char *argv[])
     if(rc) {
         fprintf(stderr, "Failed to request X11 forwarding\n");
         session_shutdown(session);
+        shutdown(sock, SHUT_RDWR);
         close(sock);
         return -1;
     }
@@ -381,6 +387,7 @@ int main(int argc, char *argv[])
     if(rc) {
         fprintf(stderr, "Failed to open a shell\n");
         session_shutdown(session);
+        shutdown(sock, SHUT_RDWR);
         close(sock);
         return -1;
     }
@@ -389,6 +396,7 @@ int main(int argc, char *argv[])
     if(rc) {
         fprintf(stderr, "Failed to entered in raw mode\n");
         session_shutdown(session);
+        shutdown(sock, SHUT_RDWR);
         close(sock);
         return -1;
     }

tests/test_ssh2.c

@@ -228,6 +228,7 @@ shutdown:
     }
 
     if(sock != LIBSSH2_INVALID_SOCKET) {
+        shutdown(sock, 2 /* SHUT_RDWR */);
 #ifdef WIN32
         closesocket(sock);
 #else