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

fixed not working on mac

Browse Source 
fixed case of -s or -c
This commit is contained in:
Hideki Miyazaki
2020-03-27 12:33:51 +09:00
parent 9fac21f463
commit 99b9f46e58
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
examples/benchmark/tls_bench.c
View File

@@ -288,10 +288,11 @@ typedef struct {
#endif #endif
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
int doDTLS; int doDTLS;
int serverReady;
struct sockaddr_in serverAddr; struct sockaddr_in serverAddr;
struct sockaddr_in clientAddr; struct sockaddr_in clientAddr;
#ifdef HAVE_PTHREAD #ifdef HAVE_PTHREAD
int serverReady;
int clientOrserverOnly;
pthread_mutex_t dtls_mutex; pthread_mutex_t dtls_mutex;
pthread_cond_t dtls_cond; pthread_cond_t dtls_cond;
#endif #endif
@@ -905,7 +906,7 @@ static int bench_tls_client(info_t* info)
#if defined(HAVE_PTHREAD) && defined(WOLFSSL_DTLS) #if defined(HAVE_PTHREAD) && defined(WOLFSSL_DTLS)
/* synchronize with server */ /* synchronize with server */
if (info->doDTLS) { if (info->doDTLS && !info->clientOrserverOnly) {
pthread_mutex_lock(&info->dtls_mutex); pthread_mutex_lock(&info->dtls_mutex);
if (info->serverReady != 1) { if (info->serverReady != 1) {
pthread_cond_wait(&info->dtls_cond, &info->dtls_mutex); pthread_cond_wait(&info->dtls_cond, &info->dtls_mutex);
@@ -1136,22 +1137,18 @@ static int SocketWaitClient(info_t* info)
if (info->doDTLS) { if (info->doDTLS) {
#ifdef HAVE_PTHREAD #ifdef HAVE_PTHREAD
pthread_mutex_lock(&info->dtls_mutex); if (!info->clientOrserverOnly) {
info->serverReady = 1; pthread_mutex_lock(&info->dtls_mutex);
pthread_cond_signal(&info->dtls_cond); info->serverReady = 1;
pthread_mutex_unlock(&info->dtls_mutex); pthread_cond_signal(&info->dtls_cond);
pthread_mutex_unlock(&info->dtls_mutex);
}
#endif #endif
connd = (int)recvfrom(info->listenFd, (char *)msg, sizeof(msg), connd = (int)recvfrom(info->listenFd, (char *)msg, sizeof(msg),
MSG_PEEK, (struct sockaddr*)&clientAddr, &size); MSG_PEEK, (struct sockaddr*)&clientAddr, &size);
if (connd < -1) { if (connd < -1) {
printf("ERROR: failed to accept the connection\n"); printf("ERROR: failed to accept the connection\n");
return -1; return -1;
} else if (connd > 0) {
if (connect(info->listenFd, (const struct sockaddr *)&clientAddr,
size) != 0) {
printf("ERROR: Udp connet failed.\n");
return -1;
}
} }
XMEMCPY(&info->clientAddr, &clientAddr, sizeof(clientAddr)); XMEMCPY(&info->clientAddr, &clientAddr, sizeof(clientAddr));
info->server.sockFd = info->listenFd; info->server.sockFd = info->listenFd;
@@ -1781,7 +1778,12 @@ int bench_tls(void* args)
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
info->doDTLS = doDTLS; info->doDTLS = doDTLS;
#ifdef HAVE_PTHREAD
info->serverReady = 0; info->serverReady = 0;
if (argServerOnly || argClientOnly) {
info->clientOrserverOnly = 1;
}
#endif
#endif #endif
if (argClientOnly) { if (argClientOnly) {
#ifndef NO_WOLFSSL_CLIENT #ifndef NO_WOLFSSL_CLIENT