AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge PR #1414: Mayaqua/Network.c: Use int as boolean flags for socket options

Browse Source
This commit is contained in:
Davide Beatrici 2021-07-07 06:35:50 +02:00 committed by GitHub
commit 505c854303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/Mayaqua/Network.c
View File

@ -10784,7 +10784,7 @@ UINT SendToEx(SOCK *sock, IP *dest_addr, UINT dest_port, void *data, UINT size,
{ {
if (sock->UdpBroadcast == false) if (sock->UdpBroadcast == false)
{ {
bool yes = true; UINT yes = 1;
sock->UdpBroadcast = true; sock->UdpBroadcast = true;
@ -10883,7 +10883,7 @@ UINT SendTo6Ex(SOCK *sock, IP *dest_addr, UINT dest_port, void *data, UINT size,
{ {
if (sock->UdpBroadcast == false) if (sock->UdpBroadcast == false)
{ {
bool yes = true; UINT yes = 1;
sock->UdpBroadcast = true; sock->UdpBroadcast = true;
@ -11132,14 +11132,14 @@ SOCK *NewUDP4(UINT port, IP *ip)
// Failure // Failure
if (port != 0) if (port != 0)
{ {
bool true_flag = true; UINT true_flag = 1;
(void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(true_flag));
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0) if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0)
{ {
bool false_flag = false; UINT false_flag = 0;
(void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&false_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&false_flag, sizeof(false_flag));
#ifdef SO_EXCLUSIVEADDRUSE #ifdef SO_EXCLUSIVEADDRUSE
(void)setsockopt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char *)&true_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char *)&true_flag, sizeof(true_flag));
#endif // SO_EXCLUSIVEADDRUSE #endif // SO_EXCLUSIVEADDRUSE
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0) if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0)
{ {
@ -11172,7 +11172,7 @@ SOCK *NewUDP4(UINT port, IP *ip)
if (IS_SPECIAL_PORT(port)) if (IS_SPECIAL_PORT(port))
{ {
bool no = false; UINT no = 0;
(void)setsockopt(sock->socket, IPPROTO_IP, IP_HDRINCL, (char *)&no, sizeof(no)); (void)setsockopt(sock->socket, IPPROTO_IP, IP_HDRINCL, (char *)&no, sizeof(no));
sock->IsRawSocket = true; sock->IsRawSocket = true;
@ -11229,14 +11229,14 @@ SOCK *NewUDP6(UINT port, IP *ip)
// Failure // Failure
if (port != 0) if (port != 0)
{ {
bool true_flag = true; UINT true_flag = 1;
(void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(true_flag));
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0) if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0)
{ {
bool false_flag = false; UINT false_flag = 0;
(void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&false_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&false_flag, sizeof(false_flag));
#ifdef SO_EXCLUSIVEADDRUSE #ifdef SO_EXCLUSIVEADDRUSE
(void)setsockopt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char *)&true_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char *)&true_flag, sizeof(true_flag));
#endif // SO_EXCLUSIVEADDRUSE #endif // SO_EXCLUSIVEADDRUSE
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0) if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0)
{ {
@ -11270,7 +11270,7 @@ SOCK *NewUDP6(UINT port, IP *ip)
if (IS_SPECIAL_PORT(port)) if (IS_SPECIAL_PORT(port))
{ {
bool no = false; UINT no = 0;
#ifdef IPV6_HDRINCL #ifdef IPV6_HDRINCL
(void)setsockopt(sock->socket, IPPROTO_IP, IPV6_HDRINCL, (char *)&no, sizeof(no)); (void)setsockopt(sock->socket, IPPROTO_IP, IPV6_HDRINCL, (char *)&no, sizeof(no));
#endif // IPV6_HDRINCL #endif // IPV6_HDRINCL
@ -12612,7 +12612,7 @@ SOCK *Accept(SOCK *sock)
SOCKET s, new_socket; SOCKET s, new_socket;
int size; int size;
struct sockaddr_in addr; struct sockaddr_in addr;
bool true_flag = true; UINT true_flag = 1;
// Validate arguments // Validate arguments
if (sock == NULL) if (sock == NULL)
{ {
@ -12699,7 +12699,7 @@ SOCK *Accept(SOCK *sock)
ret->SecureMode = false; ret->SecureMode = false;
// Configuring the TCP options // Configuring the TCP options
(void)setsockopt(ret->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&true_flag, sizeof(bool)); (void)setsockopt(ret->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&true_flag, sizeof(true_flag));
// Initialization of the time-out value // Initialization of the time-out value
SetTimeout(ret, TIMEOUT_INFINITE); SetTimeout(ret, TIMEOUT_INFINITE);
@ -12811,8 +12811,8 @@ SOCK *Accept6(SOCK *sock)
ret->SecureMode = false; ret->SecureMode = false;
// Configuring the TCP options // Configuring the TCP options
bool true_flag = true; UINT true_flag = 1;
(void)setsockopt(ret->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&true_flag, sizeof(bool)); (void)setsockopt(ret->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&true_flag, sizeof(true_flag));
// Initialize the time-out value // Initialize the time-out value
SetTimeout(ret, TIMEOUT_INFINITE); SetTimeout(ret, TIMEOUT_INFINITE);
@ -12883,13 +12883,13 @@ SOCK *ListenEx62(UINT port, bool local_only, bool enable_ca)
return NULL; return NULL;
} }
bool true_flag = true; UINT true_flag = 1;
#ifdef OS_UNIX #ifdef OS_UNIX
// It is necessary to set the IPv6 Only flag on a UNIX system // It is necessary to set the IPv6 Only flag on a UNIX system
(void)setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &true_flag, sizeof(true_flag)); (void)setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &true_flag, sizeof(true_flag));
// This only have enabled for UNIX system since there is a bug // This only have enabled for UNIX system since there is a bug
// in the implementation of REUSEADDR in Windows OS // in the implementation of REUSEADDR in Windows OS
(void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(true_flag));
#endif // OS_UNIX #endif // OS_UNIX
if (bind(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_in6)) != 0) if (bind(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_in6)) != 0)
@ -12902,7 +12902,7 @@ SOCK *ListenEx62(UINT port, bool local_only, bool enable_ca)
#ifdef OS_WIN32 #ifdef OS_WIN32
if (enable_ca) if (enable_ca)
{ {
setsockopt(s, SOL_SOCKET, SO_CONDITIONAL_ACCEPT, (char *)&true_flag, sizeof(bool)); setsockopt(s, SOL_SOCKET, SO_CONDITIONAL_ACCEPT, (char *)&true_flag, sizeof(true_flag));
backlog = 1; backlog = 1;
} }
#endif #endif
@ -12984,11 +12984,11 @@ SOCK *ListenEx2(UINT port, bool local_only, bool enable_ca, IP *listen_ip)
return NULL; return NULL;
} }
bool true_flag = true; UINT true_flag = 1;
#ifdef OS_UNIX #ifdef OS_UNIX
// This only have enabled for UNIX system since there is a bug // This only have enabled for UNIX system since there is a bug
// in the implementation of REUSEADDR in Windows OS // in the implementation of REUSEADDR in Windows OS
(void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(bool)); (void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(true_flag));
#endif // OS_UNIX #endif // OS_UNIX
if (bind(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0) if (bind(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0)
@ -13001,7 +13001,7 @@ SOCK *ListenEx2(UINT port, bool local_only, bool enable_ca, IP *listen_ip)
#ifdef OS_WIN32 #ifdef OS_WIN32
if (enable_ca) if (enable_ca)
{ {
setsockopt(s, SOL_SOCKET, SO_CONDITIONAL_ACCEPT, (char *)&true_flag, sizeof(bool)); setsockopt(s, SOL_SOCKET, SO_CONDITIONAL_ACCEPT, (char *)&true_flag, sizeof(true_flag));
backlog = 1; backlog = 1;
} }
#endif // OS_WIN32 #endif // OS_WIN32
@ -13105,13 +13105,13 @@ void Disconnect(SOCK *sock)
{ {
// Forced disconnection flag // Forced disconnection flag
#ifdef SO_DONTLINGER #ifdef SO_DONTLINGER
bool true_flag = true; UINT true_flag = 1;
(void)setsockopt(sock->socket, SOL_SOCKET, SO_DONTLINGER, (char *)&true_flag, sizeof(bool)); (void)setsockopt(sock->socket, SOL_SOCKET, SO_DONTLINGER, (char *)&true_flag, sizeof(true_flag));
#else // SO_DONTLINGER #else // SO_DONTLINGER
bool false_flag = false; UINT false_flag = 0;
(void)setsockopt(sock->socket, SOL_SOCKET, SO_LINGER, (char *)&false_flag, sizeof(bool)); (void)setsockopt(sock->socket, SOL_SOCKET, SO_LINGER, (char *)&false_flag, sizeof(false_flag));
#endif // SO_DONTLINGER #endif // SO_DONTLINGER
// setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(bool)); // setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(true_flag));
} }
// TCP socket // TCP socket
@ -14339,18 +14339,18 @@ SOCK *ConnectEx4(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
Zero(&ling, sizeof(ling)); Zero(&ling, sizeof(ling));
bool true_flag = true; UINT true_flag = 1;
// Forced disconnection flag // Forced disconnection flag
#ifdef SO_DONTLINGER #ifdef SO_DONTLINGER
(void)setsockopt(sock->socket, SOL_SOCKET, SO_DONTLINGER, (char *)&true_flag, sizeof(bool)); (void)setsockopt(sock->socket, SOL_SOCKET, SO_DONTLINGER, (char *)&true_flag, sizeof(true_flag));
#else // SO_DONTLINGER #else // SO_DONTLINGER
bool false_flag = false; UINT false_flag = 0;
(void)setsockopt(sock->socket, SOL_SOCKET, SO_LINGER, (char *)&false_flag, sizeof(bool)); (void)setsockopt(sock->socket, SOL_SOCKET, SO_LINGER, (char *)&false_flag, sizeof(false_flag));
#endif // SO_DONTLINGER #endif // SO_DONTLINGER
// setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(bool)); // setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, (char *)&true_flag, sizeof(true_flag));
// Configuring TCP options // Configuring TCP options
(void)setsockopt(sock->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&true_flag, sizeof(bool)); (void)setsockopt(sock->socket, IPPROTO_TCP, TCP_NODELAY, (char *)&true_flag, sizeof(true_flag));
// Initialization of the time-out value // Initialization of the time-out value
SetTimeout(sock, TIMEOUT_INFINITE); SetTimeout(sock, TIMEOUT_INFINITE);