Bug fix.

PR: 1307
Submitted by: Oliver Tappe <zooey@hirschkaefer.de>

diff --git a/apps/s_socket.c b/apps/s_socket.c
index d9321a0982593916de8cbd0eba140cf4d73eee44..37e6cdc5559d570ae6d2a2380819fda837cbd385 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -264,7 +264,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
                        
        if (s == INVALID_SOCKET) { perror("socket"); return(0); }
 
                        
        if (s == INVALID_SOCKET) { perror("socket"); return(0); }
 

-#ifndef OPENSSL_SYS_MPE
+#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)

        if (type == SOCK_STREAM)
                {
                i=0;
        if (type == SOCK_STREAM)
                {
                i=0;


@@ -274,7 +274,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
 #endif
 
        if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
 #endif
 
        if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)

-               { close(s); perror("connect"); return(0); }
+               { closesocket(s); perror("connect"); return(0); }

        *sock=s;
        return(1);
        }
        *sock=s;
        return(1);
        }