From de2115b140440f5a2957531d3780a68b2941f310 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 18 Feb 2015 08:00:25 -0700 Subject: [PATCH] shutdown shadows global in sys/socket.h line 576 renamed wc_shutdown --- examples/client/client.c | 8 ++++---- examples/server/server.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index 66db505a8..9fa77d099 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -208,7 +208,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) int doPeerCheck = 1; int nonBlocking = 0; int resumeSession = 0; - int shutdown = 0; + int wc_shutdown = 0; int ret; int scr = 0; /* allow secure renegotiation */ int forceScr = 0; /* force client initiaed scr */ @@ -371,7 +371,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) break; case 'w' : - shutdown = 1; + wc_shutdown = 1; break; case 'R' : @@ -811,7 +811,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (doDTLS == 0) { /* don't send alert after "break" command */ ret = wolfSSL_shutdown(ssl); - if (shutdown && ret == SSL_SHUTDOWN_NOT_DONE) + if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE) wolfSSL_shutdown(ssl); /* bidirectional shutdown */ } #ifdef ATOMIC_USER @@ -890,7 +890,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) wolfSSL_write(sslResume, msg, msgSz); ret = wolfSSL_shutdown(sslResume); - if (shutdown && ret == SSL_SHUTDOWN_NOT_DONE) + if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE) wolfSSL_shutdown(sslResume); /* bidirectional shutdown */ wolfSSL_free(sslResume); diff --git a/examples/server/server.c b/examples/server/server.c index 64a989d65..1639f86b0 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -174,7 +174,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) int fewerPackets = 0; int pkCallbacks = 0; int serverReadyFile = 0; - int shutdown = 0; + int wc_shutdown = 0; int ret; char* cipherList = NULL; const char* verifyCert = cliCert; @@ -261,7 +261,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) break; case 'w' : - shutdown = 1; + wc_shutdown = 1; break; case 'v' : @@ -568,7 +568,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args) #endif ret = SSL_shutdown(ssl); - if (shutdown && ret == SSL_SHUTDOWN_NOT_DONE) + if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE) SSL_shutdown(ssl); /* bidirectional shutdown */ SSL_free(ssl); SSL_CTX_free(ctx);