wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-05 13:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

For Windows API socklen_t = int

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2021-07-16 14:31:26 +02:00
parent 2bbd04f10f
commit 51b6c413d3
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wolfio.c
View File

@@ -884,7 +884,11 @@ int wolfIO_TcpBind(SOCKET_T* sockfd, word16 port)
&& !defined(WOLFSSL_KEIL_TCP_NET) && !defined(WOLFSSL_ZEPHYR) && !defined(WOLFSSL_KEIL_TCP_NET) && !defined(WOLFSSL_ZEPHYR)
{ {
int optval = 1; int optval = 1;
#ifndef USE_WINDOWS_API
socklen_t optlen = sizeof(optval); socklen_t optlen = sizeof(optval);
#else
int optlen = sizeof(optval);
#endif
if (setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR, &optval, optlen) < 0) { if (setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR, &optval, optlen) < 0) {
WOLFSSL_MSG("setsockopt SO_REUSEADDR failed"); WOLFSSL_MSG("setsockopt SO_REUSEADDR failed");
CloseSocket(*sockfd); CloseSocket(*sockfd);
@@ -917,7 +921,11 @@ int wolfIO_TcpBind(SOCKET_T* sockfd, word16 port)
} }
#ifdef HAVE_SOCKADDR #ifdef HAVE_SOCKADDR
#ifndef USE_WINDOWS_API
int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, socklen_t* peer_len) int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, socklen_t* peer_len)
#else
int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, int* peer_len)
#endif
{ {
return accept(sockfd, peer_addr, peer_len); return accept(sockfd, peer_addr, peer_len);
} }

4
wolfssl/wolfio.h
View File

@@ -373,7 +373,11 @@
#endif #endif
WOLFSSL_API int wolfIO_TcpConnect(SOCKET_T* sockfd, const char* ip, WOLFSSL_API int wolfIO_TcpConnect(SOCKET_T* sockfd, const char* ip,
unsigned short port, int to_sec); unsigned short port, int to_sec);
#ifndef USE_WINDOWS_API
WOLFSSL_API int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, socklen_t* peer_len); WOLFSSL_API int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, socklen_t* peer_len);
#else
WOLFSSL_API int wolfIO_TcpAccept(SOCKET_T sockfd, SOCKADDR* peer_addr, int* peer_len);
#endif
WOLFSSL_API int wolfIO_TcpBind(SOCKET_T* sockfd, word16 port); WOLFSSL_API int wolfIO_TcpBind(SOCKET_T* sockfd, word16 port);
WOLFSSL_API int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags); WOLFSSL_API int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags);
WOLFSSL_API int wolfIO_Recv(SOCKET_T sd, char *buf, int sz, int rdFlags); WOLFSSL_API int wolfIO_Recv(SOCKET_T sd, char *buf, int sz, int rdFlags);