diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-04-26 21:11:26 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-04-27 11:10:19 +0200 |
| commit | ff25dd1a47525c88500dd61cdeb27faaea6ee599 (patch) | |
| tree | 796cd3620b38deb608e4504a31757f1947e3e9c7 | |
| parent | 9e5b50b54d1032634979c224f2dd11c84f2900b7 (diff) | |
apps/s_server.c: Avoid unused variable due to 'no-dtls'
Fixes #6098
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/6104)
| -rw-r--r-- | apps/s_server.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index be1564a6f6..ef39a4f538 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -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)) |