wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #691 from JacobBarthelmeh/Windows

Browse Source 
random port for MinGW with unit tests
This commit is contained in:
dgarske
2017-01-03 11:46:33 -08:00
committed by GitHub
parent 073aa95496 5abfe9d1cf
commit 11775acb86
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/api.c
View File

@@ -529,7 +529,6 @@ static void test_wolfSSL_SetTmpDH_buffer(void)
wolfSSL_free(ssl); wolfSSL_free(ssl);
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
printf("SUCCESS4\n");
#endif #endif
} }
@@ -637,8 +636,7 @@ static THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
ctx = wolfSSL_CTX_new(method); ctx = wolfSSL_CTX_new(method);
#if defined(USE_WINDOWS_API) #if defined(USE_WINDOWS_API)
/* Generate random port for testing */ port = ((func_args*)args)->signal->port;
port = GetRandomPort();
#elif defined(NO_MAIN_DRIVER) && !defined(WOLFSSL_SNIFFER) && \ #elif defined(NO_MAIN_DRIVER) && !defined(WOLFSSL_SNIFFER) && \
!defined(WOLFSSL_MDK_SHELL) && !defined(WOLFSSL_TIRTOS) !defined(WOLFSSL_MDK_SHELL) && !defined(WOLFSSL_TIRTOS)
/* Let tcp_listen assign port */ /* Let tcp_listen assign port */
@@ -885,8 +883,7 @@ static THREAD_RETURN WOLFSSL_THREAD run_wolfssl_server(void* args)
((func_args*)args)->return_code = TEST_FAIL; ((func_args*)args)->return_code = TEST_FAIL;
#if defined(USE_WINDOWS_API) #if defined(USE_WINDOWS_API)
/* Generate random port for testing */ port = ((func_args*)args)->signal->port;
port = GetRandomPort();
#elif defined(NO_MAIN_DRIVER) && !defined(WOLFSSL_SNIFFER) && \ #elif defined(NO_MAIN_DRIVER) && !defined(WOLFSSL_SNIFFER) && \
!defined(WOLFSSL_MDK_SHELL) && !defined(WOLFSSL_TIRTOS) !defined(WOLFSSL_MDK_SHELL) && !defined(WOLFSSL_TIRTOS)
/* Let tcp_listen assign port */ /* Let tcp_listen assign port */
@@ -1149,6 +1146,11 @@ static void test_wolfSSL_read_write(void)
StartTCP(); StartTCP();
InitTcpReady(&ready); InitTcpReady(&ready);
#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif
server_args.signal = &ready; server_args.signal = &ready;
client_args.signal = &ready; client_args.signal = &ready;
@@ -1186,6 +1188,11 @@ static void test_wolfSSL_dtls_export(void)
InitTcpReady(&ready); InitTcpReady(&ready);
#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif
/* set using dtls */ /* set using dtls */
XMEMSET(&server_cbf, 0, sizeof(callback_functions)); XMEMSET(&server_cbf, 0, sizeof(callback_functions));
XMEMSET(&client_cbf, 0, sizeof(callback_functions)); XMEMSET(&client_cbf, 0, sizeof(callback_functions));
@@ -1241,6 +1248,12 @@ static void test_wolfSSL_client_server(callback_functions* client_callbacks,
/* RUN Server side */ /* RUN Server side */
InitTcpReady(&ready); InitTcpReady(&ready);
#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif
server_args.signal = &ready; server_args.signal = &ready;
client_args.signal = &ready; client_args.signal = &ready;
start_thread(run_wolfssl_server, &server_args, &serverThread); start_thread(run_wolfssl_server, &server_args, &serverThread);

2
wolfssl/test.h
View File

@@ -664,6 +664,8 @@ static INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
static INLINE void tcp_socket(SOCKET_T* sockfd, int udp, int sctp) static INLINE void tcp_socket(SOCKET_T* sockfd, int udp, int sctp)
{ {
(void)sctp;
if (udp) if (udp)
*sockfd = socket(AF_INET_V, SOCK_DGRAM, IPPROTO_UDP); *sockfd = socket(AF_INET_V, SOCK_DGRAM, IPPROTO_UDP);
#ifdef WOLFSSL_SCTP #ifdef WOLFSSL_SCTP