Mercurial > hg > nginx
changeset 6592:2c7b488a61fb
Set IP_BIND_ADDRESS_NO_PORT socket option for upstream sockets.
author | Andrei Belov <defan@nginx.com> |
---|---|
date | Mon, 20 Jun 2016 10:41:17 +0300 |
parents | 04d8d1f85649 |
children | b3b7e33083ac |
files | auto/unix src/event/ngx_event_connect.c |
diffstat | 2 files changed, 39 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/unix Wed Jun 15 21:05:30 2016 +0100 +++ b/auto/unix Mon Jun 20 10:41:17 2016 +0300 @@ -341,6 +341,19 @@ . auto/feature +# Linux IP_BIND_ADDRESS_NO_PORT + +ngx_feature="IP_BIND_ADDRESS_NO_PORT" +ngx_feature_name="NGX_HAVE_IP_BIND_ADDRESS_NO_PORT" +ngx_feature_run=no +ngx_feature_incs="#include <sys/socket.h> + #include <netinet/in.h>" +ngx_feature_path= +ngx_feature_libs= +ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, NULL, 0)" +. auto/feature + + # Linux transparent proxying ngx_feature="IP_TRANSPARENT"
--- a/src/event/ngx_event_connect.c Wed Jun 15 21:05:30 2016 +0100 +++ b/src/event/ngx_event_connect.c Mon Jun 20 10:41:17 2016 +0300 @@ -87,6 +87,32 @@ } #endif +#if (NGX_HAVE_IP_BIND_ADDRESS_NO_PORT) + + if (pc->sockaddr->sa_family != AF_UNIX) { + static int bind_address_no_port = 1; + + if (bind_address_no_port) { + if (setsockopt(s, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, + (const void *) &bind_address_no_port, + sizeof(int)) == -1) + { + err = ngx_socket_errno; + + if (err != NGX_EOPNOTSUPP && err != NGX_ENOPROTOOPT) { + ngx_log_error(NGX_LOG_ALERT, pc->log, err, + "setsockopt(IP_BIND_ADDRESS_NO_PORT) " + "failed, ignored"); + + } else { + bind_address_no_port = 0; + } + } + } + } + +#endif + if (bind(s, pc->local->sockaddr, pc->local->socklen) == -1) { ngx_log_error(NGX_LOG_CRIT, pc->log, ngx_socket_errno, "bind(%V) failed", &pc->local->name);