diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2021-05-31 16:36:51 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2021-05-31 16:36:51 +0300 |
| commit | 52cde89586caa3fffc677e7665f4765f7e7b0a2d (patch) | |
| tree | c1516c5fd460d0b92478f51e72aa13e52bfa2c9c /src | |
| parent | 85a104aa4e86ab82fd14493933f01f8822e83ed9 (diff) | |
| download | nginx-52cde89586caa3fffc677e7665f4765f7e7b0a2d.tar.gz nginx-52cde89586caa3fffc677e7665f4765f7e7b0a2d.zip | |
Core: disabled SO_REUSEADDR on UDP sockets while testing config.
On Linux, SO_REUSEADDR allows completely duplicate UDP sockets, so using
SO_REUSEADDR when testing configuration results in packets being dropped
if there is an existing traffic on the sockets being tested (ticket #2187).
While dropped packets are expected with UDP, it is better to avoid this
when possible.
With this change, SO_REUSEADDR is no longer set on datagram sockets when
testing configuration.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_connection.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 8339e2bb7..fe729a78a 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -495,21 +495,24 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) return NGX_ERROR; } - if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, - (const void *) &reuseaddr, sizeof(int)) - == -1) - { - ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, - "setsockopt(SO_REUSEADDR) %V failed", - &ls[i].addr_text); + if (ls[i].type != SOCK_DGRAM || !ngx_test_config) { - if (ngx_close_socket(s) == -1) { + if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, + (const void *) &reuseaddr, sizeof(int)) + == -1) + { ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, - ngx_close_socket_n " %V failed", + "setsockopt(SO_REUSEADDR) %V failed", &ls[i].addr_text); - } - return NGX_ERROR; + if (ngx_close_socket(s) == -1) { + ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, + ngx_close_socket_n " %V failed", + &ls[i].addr_text); + } + + return NGX_ERROR; + } } #if (NGX_HAVE_REUSEPORT) |