Constify.

[openssl.git] / apps / s_socket.c

diff --git a/apps/s_socket.c b/apps/s_socket.c
index d9321a0982593916de8cbd0eba140cf4d73eee44..2fff09f850d24597f5891abafa4e7fc38f276c71 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -96,7 +96,8 @@ static struct hostent *GetHostByName(char *name);
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);

-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
+static int init_client_ip(int *sock, const unsigned char ip[4], int port,
+                         int type);

 static int init_server(int *sock, int port, int type);
 static int init_server_long(int *sock, int port,char *ip, int type);
 static int do_accept(int acc_sock, int *sock, char **host);
 static int init_server(int *sock, int port, int type);
 static int init_server_long(int *sock, int port,char *ip, int type);
 static int do_accept(int acc_sock, int *sock, char **host);


@@ -239,7 +240,8 @@ int init_client(int *sock, char *host, int port, int type)
        return(init_client_ip(sock,ip,port,type));
        }
 
        return(init_client_ip(sock,ip,port,type));
        }
 

-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
+static int init_client_ip(int *sock, const unsigned char ip[4], int port,
+                         int type)

        {
        unsigned long addr;
        struct sockaddr_in them;
        {
        unsigned long addr;
        struct sockaddr_in them;


@@ -264,7 +266,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 +276,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);
        }


@@ -283,7 +285,7 @@ int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, uns
        {
        int sock;
        char *name = NULL;
        {
        int sock;
        char *name = NULL;

-       int accept_socket;
+       int accept_socket = 0;

        int i;
 
        if (!init_server(&accept_socket,port,type)) return(0);
        int i;
 
        if (!init_server(&accept_socket,port,type)) return(0);


@@ -321,7 +323,7 @@ static int init_server_long(int *sock, int port, char *ip, int type)
        {
        int ret=0;
        struct sockaddr_in server;
        {
        int ret=0;
        struct sockaddr_in server;

-       int s= -1,i;
+       int s= -1;

 
        if (!ssl_sock_init()) return(0);
 
 
        if (!ssl_sock_init()) return(0);
 


@@ -360,7 +362,6 @@ static int init_server_long(int *sock, int port, char *ip, int type)
                }
        /* Make it 128 for linux */
        if (type==SOCK_STREAM && listen(s,128) == -1) goto err;
                }
        /* Make it 128 for linux */
        if (type==SOCK_STREAM && listen(s,128) == -1) goto err;

-       i=0;

        *sock=s;
        ret=1;
 err:
        *sock=s;
        ret=1;
 err:


@@ -378,7 +379,7 @@ static int init_server(int *sock, int port, int type)
 
 static int do_accept(int acc_sock, int *sock, char **host)
        {
 
 static int do_accept(int acc_sock, int *sock, char **host)
        {

-       int ret,i;
+       int ret;

        struct hostent *h1,*h2;
        static struct sockaddr_in from;
        int len;
        struct hostent *h1,*h2;
        static struct sockaddr_in from;
        int len;


@@ -401,6 +402,7 @@ redoit:
        if (ret == INVALID_SOCKET)
                {
 #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
        if (ret == INVALID_SOCKET)
                {
 #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))

+               int i;

                i=WSAGetLastError();
                BIO_printf(bio_err,"accept error %d\n",i);
 #else
                i=WSAGetLastError();
                BIO_printf(bio_err,"accept error %d\n",i);
 #else


@@ -455,7 +457,6 @@ redoit:
                        BIO_printf(bio_err,"gethostbyname failure\n");
                        return(0);
                        }
                        BIO_printf(bio_err,"gethostbyname failure\n");
                        return(0);
                        }

-               i=0;

                if (h2->h_addrtype != AF_INET)
                        {
                        BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
                if (h2->h_addrtype != AF_INET)
                        {
                        BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");