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

Fix for float compare warning. Minor cleanups.

Browse Source
This commit is contained in:
David Garske
2019-01-03 11:40:04 -08:00
parent a7251e4158
commit ff0a4eb69a
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/benchmark/tls_bench.c
View File

@@ -743,7 +743,7 @@ static int bench_tls_client(info_t* info)
} }
info->client_stats.txTotal += ret; info->client_stats.txTotal += ret;
/* read echo of message */ /* read echo of message from server */
XMEMSET(readBuf, 0, readBufSz); XMEMSET(readBuf, 0, readBufSz);
start = gettime_secs(1); start = gettime_secs(1);
#ifndef BENCH_USE_NONBLOCK #ifndef BENCH_USE_NONBLOCK
@@ -775,7 +775,6 @@ static int bench_tls_client(info_t* info)
wolfSSL_free(cli_ssl); wolfSSL_free(cli_ssl);
cli_ssl = NULL; cli_ssl = NULL;
sleep(0); /* give a bit of time for server to get ready */
} }
exit: exit:
@@ -809,7 +808,7 @@ static void* client_thread(void* args)
pthread_cond_signal(&info->to_server.cond); pthread_cond_signal(&info->to_server.cond);
info->to_client.done = 1; info->to_client.done = 1;
(void)ret; /* set in into struct */ (void)ret; /* set in info struct */
return NULL; return NULL;
} }
@@ -895,7 +894,7 @@ static void CloseAndCleanupListenSocket(int* listenFd)
static int bench_tls_server(info_t* info) static int bench_tls_server(info_t* info)
{ {
byte *readBuf = NULL; byte *readBuf = NULL;
double start, total = 0; double start;
int ret, len = 0, readBufSz; int ret, len = 0, readBufSz;
WOLFSSL_CTX* srv_ctx = NULL; WOLFSSL_CTX* srv_ctx = NULL;
WOLFSSL* srv_ssl = NULL; WOLFSSL* srv_ssl = NULL;
@@ -1005,12 +1004,7 @@ static int bench_tls_server(info_t* info)
wolfSSL_SetTmpDH(srv_ssl, p, sizeof(p), g, sizeof(g)); wolfSSL_SetTmpDH(srv_ssl, p, sizeof(p), g, sizeof(g));
#endif #endif
/* start total counter after first wait */ /* accept TLS connection */
if (total == 0.0) {
total = gettime_secs(0);
}
/* accept tls connection without tcp sockets */
start = gettime_secs(1); start = gettime_secs(1);
#ifndef BENCH_USE_NONBLOCK #ifndef BENCH_USE_NONBLOCK
ret = wolfSSL_accept(srv_ssl); ret = wolfSSL_accept(srv_ssl);
@@ -1031,7 +1025,7 @@ static int bench_tls_server(info_t* info)
info->server_stats.connTime += start; info->server_stats.connTime += start;
info->server_stats.connCount++; info->server_stats.connCount++;
/* read msg post handshake from client */ /* read message from client */
XMEMSET(readBuf, 0, readBufSz); XMEMSET(readBuf, 0, readBufSz);
start = gettime_secs(1); start = gettime_secs(1);
#ifndef BENCH_USE_NONBLOCK #ifndef BENCH_USE_NONBLOCK
@@ -1076,7 +1070,7 @@ static int bench_tls_server(info_t* info)
if (XSTRSTR((const char*)readBuf, kShutdown) != NULL) { if (XSTRSTR((const char*)readBuf, kShutdown) != NULL) {
info->server.shutdown = 1; info->server.shutdown = 1;
if (info->showVerbose) { if (info->showVerbose) {
printf("Server cipher done\n"); printf("Server shutdown done\n");
} }
} }