feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

shutdown shadows global in sys/socket.h line 576 renamed wc_shutdown

Browse Source
This commit is contained in:
kaleb-himes
2015-02-17 14:24:31 -07:00
parent 317e7fdb08
commit 8d5bba7962
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/client/client.c
View File

@@ -208,7 +208,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
int doPeerCheck = 1; int doPeerCheck = 1;
int nonBlocking = 0; int nonBlocking = 0;
int resumeSession = 0; int resumeSession = 0;
int shutdown = 0; int wc_shutdown = 0;
int ret; int ret;
int scr = 0; /* allow secure renegotiation */ int scr = 0; /* allow secure renegotiation */
int forceScr = 0; /* force client initiaed scr */ int forceScr = 0; /* force client initiaed scr */
@@ -371,7 +371,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
break; break;
case 'w' : case 'w' :
shutdown = 1; wc_shutdown = 1;
break; break;
case 'R' : case 'R' :
@@ -811,7 +811,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
if (doDTLS == 0) { /* don't send alert after "break" command */ if (doDTLS == 0) { /* don't send alert after "break" command */
ret = wolfSSL_shutdown(ssl); ret = wolfSSL_shutdown(ssl);
if (shutdown && ret == SSL_SHUTDOWN_NOT_DONE) if (wc_shutdown && ret == SSL_SHUTDOWN_NOT_DONE)
wolfSSL_shutdown(ssl); /* bidirectional shutdown */ wolfSSL_shutdown(ssl); /* bidirectional shutdown */
} }
#ifdef ATOMIC_USER #ifdef ATOMIC_USER
@@ -890,7 +890,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
wolfSSL_write(sslResume, msg, msgSz); wolfSSL_write(sslResume, msg, msgSz);
ret = wolfSSL_shutdown(sslResume); 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_shutdown(sslResume); /* bidirectional shutdown */
wolfSSL_free(sslResume); wolfSSL_free(sslResume);

6
examples/server/server.c
View File

@@ -174,7 +174,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
int fewerPackets = 0; int fewerPackets = 0;
int pkCallbacks = 0; int pkCallbacks = 0;
int serverReadyFile = 0; int serverReadyFile = 0;
int shutdown = 0; int wc_shutdown = 0;
int ret; int ret;
char* cipherList = NULL; char* cipherList = NULL;
const char* verifyCert = cliCert; const char* verifyCert = cliCert;
@@ -261,7 +261,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
break; break;
case 'w' : case 'w' :
shutdown = 1; wc_shutdown = 1;
break; break;
case 'v' : case 'v' :
@@ -568,7 +568,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
#endif #endif
ret = SSL_shutdown(ssl); 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_shutdown(ssl); /* bidirectional shutdown */
SSL_free(ssl); SSL_free(ssl);
SSL_CTX_free(ctx); SSL_CTX_free(ctx);