diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-18 16:03:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 16:03:29 +0100 |
| commit | 6e6403669377160885cac45db7b8115325c3932f (patch) | |
| tree | 70f8562157b3d123bcd68391937a28a57d81f6e1 /drivers/unix | |
| parent | 27326f8238b5ba5077fff408d3b3255b356a959e (diff) | |
| parent | cae0d8853d7a373ad8720289c12c7c2e7b5ef240 (diff) | |
Merge pull request #36321 from Faless/net/win_tcp_noreuse
Disable NetSocket reuse address on Windows.
Diffstat (limited to 'drivers/unix')
| -rw-r--r-- | drivers/unix/net_socket_posix.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/unix/net_socket_posix.cpp b/drivers/unix/net_socket_posix.cpp index 16282a15c7..f7e412be63 100644 --- a/drivers/unix/net_socket_posix.cpp +++ b/drivers/unix/net_socket_posix.cpp @@ -673,22 +673,29 @@ void NetSocketPosix::set_tcp_no_delay_enabled(bool p_enabled) { void NetSocketPosix::set_reuse_address_enabled(bool p_enabled) { ERR_FAIL_COND(!is_open()); +// On Windows, enabling SO_REUSEADDR actually would also enable reuse port, very bad on TCP. Denying... +// Windows does not have this option, SO_REUSEADDR in this magical world means SO_REUSEPORT +#ifndef WINDOWS_ENABLED + if (_is_stream) + return; int par = p_enabled ? 1 : 0; if (setsockopt(_sock, SOL_SOCKET, SO_REUSEADDR, SOCK_CBUF(&par), sizeof(int)) < 0) { WARN_PRINT("Unable to set socket REUSEADDR option!"); } +#endif } void NetSocketPosix::set_reuse_port_enabled(bool p_enabled) { -// Windows does not have this option, as it is always ON when setting REUSEADDR. -#ifndef WINDOWS_ENABLED ERR_FAIL_COND(!is_open()); +// See comment above... +#ifdef WINDOWS_ENABLED +#define SO_REUSEPORT SO_REUSEADDR +#endif int par = p_enabled ? 1 : 0; if (setsockopt(_sock, SOL_SOCKET, SO_REUSEPORT, SOCK_CBUF(&par), sizeof(int)) < 0) { WARN_PRINT("Unable to set socket REUSEPORT option!"); } -#endif } bool NetSocketPosix::is_open() const { |