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

Merge pull request #8441 from philljj/wolfio_comments

Browse Source 
wolfio: comment ifdef endif blocks.
This commit is contained in:
David Garske
2025-02-14 08:55:31 -08:00
committed by GitHub
parent 60c1558142 f2bb063ca4
commit 29f2767b88
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/wolfio.c
View File

@ -226,7 +226,7 @@ static int TranslateIoReturnCode(int err, SOCKET_T sd, int direction)
else else
return WOLFSSL_CBIO_ERR_TIMEOUT; return WOLFSSL_CBIO_ERR_TIMEOUT;
} }
#endif #endif /* SOCKET_ETIMEDOUT */
else if (err == SOCKET_ECONNRESET) { else if (err == SOCKET_ECONNRESET) {
WOLFSSL_MSG("\tConnection reset"); WOLFSSL_MSG("\tConnection reset");
@ -763,7 +763,7 @@ int EmbedReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *ctx)
else else
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
timeout.tv_sec = dtls_timeout; timeout.tv_sec = dtls_timeout;
#endif #endif /* USE_WINDOWS_API */
if (setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, if (setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout,
sizeof(timeout)) != 0) { sizeof(timeout)) != 0) {
WOLFSSL_MSG("setsockopt rcvtimeo failed"); WOLFSSL_MSG("setsockopt rcvtimeo failed");
@ -860,22 +860,22 @@ int EmbedReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *ctx)
#ifndef WOLFSSL_PEER_ADDRESS_CHANGES #ifndef WOLFSSL_PEER_ADDRESS_CHANGES
else { else {
ret = 0; ret = 0;
#ifdef WOLFSSL_RW_THREADED #ifdef WOLFSSL_RW_THREADED
if (wc_LockRwLock_Rd(&ssl->buffers.dtlsCtx.peerLock) != 0) if (wc_LockRwLock_Rd(&ssl->buffers.dtlsCtx.peerLock) != 0)
return WOLFSSL_CBIO_ERR_GENERAL; return WOLFSSL_CBIO_ERR_GENERAL;
#endif #endif /* WOLFSSL_RW_THREADED */
if (!sockAddrEqual(peer, peerSz, (SOCKADDR_S*)dtlsCtx->peer.sa, if (!sockAddrEqual(peer, peerSz, (SOCKADDR_S*)dtlsCtx->peer.sa,
dtlsCtx->peer.sz)) { dtlsCtx->peer.sz)) {
ret = WOLFSSL_CBIO_ERR_GENERAL; ret = WOLFSSL_CBIO_ERR_GENERAL;
} }
#ifdef WOLFSSL_RW_THREADED #ifdef WOLFSSL_RW_THREADED
if (wc_UnLockRwLock(&ssl->buffers.dtlsCtx.peerLock) != 0) if (wc_UnLockRwLock(&ssl->buffers.dtlsCtx.peerLock) != 0)
return WOLFSSL_CBIO_ERR_GENERAL; return WOLFSSL_CBIO_ERR_GENERAL;
#endif #endif /* WOLFSSL_RW_THREADED */
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
#endif #endif /* !WOLFSSL_PEER_ADDRESS_CHANGES */
} }
#ifndef NO_ASN_TIME #ifndef NO_ASN_TIME
ssl->dtls_start_timeout = 0; ssl->dtls_start_timeout = 0;
@ -1092,7 +1092,7 @@ int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif #endif /* WOLFSSL_DTLS */
/* get the peer information in human readable form (ip, port, family) /* get the peer information in human readable form (ip, port, family)
* default function assumes BSD sockets * default function assumes BSD sockets
@ -1357,13 +1357,13 @@ int wolfIO_TcpConnect(SOCKET_T* sockfd, const char* ip, word16 port, int to_sec)
#else #else
HOSTENT *entry; HOSTENT *entry;
#endif #endif
#endif #endif /* !WOLFSSL_USE_POPEN_HOST */
#ifdef WOLFSSL_IPV6 #ifdef WOLFSSL_IPV6
SOCKADDR_IN6 *sin; SOCKADDR_IN6 *sin;
#else #else
SOCKADDR_IN *sin; SOCKADDR_IN *sin;
#endif #endif /* WOLFSSL_IPV6 */
#endif /* HAVE_SOCKADDR */ #endif /* HAVE_GETADDRINFO */
if (sockfd == NULL || ip == NULL) { if (sockfd == NULL || ip == NULL) {
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
@ -1374,8 +1374,8 @@ int wolfIO_TcpConnect(SOCKET_T* sockfd, const char* ip, word16 port, int to_sec)
sockaddr_len = sizeof(SOCKADDR_IN6); sockaddr_len = sizeof(SOCKADDR_IN6);
#else #else
sockaddr_len = sizeof(SOCKADDR_IN); sockaddr_len = sizeof(SOCKADDR_IN);
#endif #endif /* WOLFSSL_IPV6 */
#endif #endif /* !HAVE_GETADDRINFO */
XMEMSET(&addr, 0, sizeof(addr)); XMEMSET(&addr, 0, sizeof(addr));
#ifdef WOLFIO_DEBUG #ifdef WOLFIO_DEBUG
@ -1527,7 +1527,7 @@ int wolfIO_TcpConnect(SOCKET_T* sockfd, const char* ip, word16 port, int to_sec)
} }
#else #else
(void)to_sec; (void)to_sec;
#endif #endif /* HAVE_IO_TIMEOUT */
ret = connect(*sockfd, (SOCKADDR *)&addr, sockaddr_len); ret = connect(*sockfd, (SOCKADDR *)&addr, sockaddr_len);
#ifdef HAVE_IO_TIMEOUT #ifdef HAVE_IO_TIMEOUT
@ -1546,7 +1546,7 @@ int wolfIO_TcpConnect(SOCKET_T* sockfd, const char* ip, word16 port, int to_sec)
wolfIO_SetBlockingMode(*sockfd, 0); wolfIO_SetBlockingMode(*sockfd, 0);
} }
} }
#endif #endif /* HAVE_IO_TIMEOUT */
if (ret != 0) { if (ret != 0) {
WOLFSSL_MSG("Responder tcp connect failed"); WOLFSSL_MSG("Responder tcp connect failed");
CloseSocket(*sockfd); CloseSocket(*sockfd);
@ -2668,7 +2668,7 @@ int MicriumReceive(WOLFSSL *ssl, char *buf, int sz, void *ctx)
} }
} }
} }
#endif #endif /* WOLFSSL_DTLS */
ret = NetSock_RxData(sd, buf, sz, ssl->rflags, &err); ret = NetSock_RxData(sd, buf, sz, ssl->rflags, &err);
if (ret < 0) { if (ret < 0) {
@ -3420,7 +3420,7 @@ int wolfSSL_SetIO_LwIP(WOLFSSL* ssl, void* pcb,
return ERR_OK; return ERR_OK;
} }
#endif #endif /* WOLFSSL_LWIP_NATIVE */
#ifdef WOLFSSL_ISOTP #ifdef WOLFSSL_ISOTP
static int isotp_send_single_frame(struct isotp_wolfssl_ctx *ctx, char *buf, static int isotp_send_single_frame(struct isotp_wolfssl_ctx *ctx, char *buf,
@ -3805,5 +3805,5 @@ int wolfSSL_SetIO_ISOTP(WOLFSSL *ssl, isotp_wolfssl_ctx *ctx,
} }
return 0; return 0;
} }
#endif #endif /* WOLFSSL_ISOTP */
#endif /* WOLFCRYPT_ONLY */ #endif /* WOLFCRYPT_ONLY */