Commit ff25dd1a authored by Richard Levitte's avatar Richard Levitte
Browse files

apps/s_server.c: Avoid unused variable due to 'no-dtls' 



Fixes #6098

Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/6104)
parent 9e5b50b5

apps/s_server.c

+4 −6
Original line number Diff line number Diff line
@@ -2189,9 +2189,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) 
    SSL *con = NULL;

    BIO *sbio;

    struct timeval timeout;

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)

    struct timeval tv;

#else

#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS))

    struct timeval *timeoutp;

#endif

#ifndef OPENSSL_NO_DTLS
@@ -2392,9 +2390,9 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) 
             * second and check for any keypress. In a proper Windows

             * application we wouldn't do this because it is inefficient.

             */

            tv.tv_sec = 1;

            tv.tv_usec = 0;

            i = select(width, (void *)&readfds, NULL, NULL, &tv);

            timeout.tv_sec = 1;

            timeout.tv_usec = 0;

            i = select(width, (void *)&readfds, NULL, NULL, &timeout);

            if (has_stdin_waiting())

                read_from_terminal = 1;

            if ((i < 0) || (!i && !read_from_terminal))