mirror of
https://github.com/nginx/nginx.git
synced 2025-01-19 01:42:58 +08:00
ipv6only
This commit is contained in:
parent
648b0dcf28
commit
6d94b51f0b
@ -282,6 +282,23 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
|
||||
|
||||
if (ls[i].sockaddr->sa_family == AF_INET6 && ls[i].ipv6only) {
|
||||
int ipv6only;
|
||||
|
||||
ipv6only = (ls[i].ipv6only == 1);
|
||||
|
||||
if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
|
||||
(const void *) &ipv6only, sizeof(int))
|
||||
== -1)
|
||||
{
|
||||
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
|
||||
"setsockopt(IPV6_V6ONLY) %V failed, ignored",
|
||||
&ls[i].addr_text);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/* TODO: close on exit */
|
||||
|
||||
if (!(ngx_event_flags & NGX_USE_AIO_EVENT)) {
|
||||
|
@ -56,6 +56,10 @@ struct ngx_listening_s {
|
||||
unsigned shared:1; /* shared between threads or processes */
|
||||
unsigned addr_ntop:1;
|
||||
|
||||
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
|
||||
unsigned ipv6only:2;
|
||||
#endif
|
||||
|
||||
#if (NGX_HAVE_DEFERRED_ACCEPT)
|
||||
unsigned deferred_accept:1;
|
||||
unsigned delete_deferred:1;
|
||||
|
@ -1768,6 +1768,10 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
|
||||
ls->deferred_accept = addr->listen_conf->deferred_accept;
|
||||
#endif
|
||||
|
||||
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
|
||||
ls->ipv6only = addr->listen_conf->ipv6only;
|
||||
#endif
|
||||
|
||||
return ls;
|
||||
}
|
||||
|
||||
|
@ -3332,6 +3332,45 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ngx_strncmp(value[n].data, "ipv6only=o", 10) == 0) {
|
||||
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
|
||||
struct sockaddr *sa;
|
||||
|
||||
sa = (struct sockaddr *) ls->sockaddr;
|
||||
|
||||
if (sa->sa_family == AF_INET6) {
|
||||
|
||||
if (ngx_strcmp(&value[n].data[10], "n") == 0) {
|
||||
ls->conf.ipv6only = 1;
|
||||
|
||||
} else if (ngx_strcmp(&value[n].data[10], "ff") == 0) {
|
||||
ls->conf.ipv6only = 2;
|
||||
|
||||
} else {
|
||||
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||
"invalid ipv6only flags \"%s\"",
|
||||
&value[n].data[9]);
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
ls->conf.bind = 1;
|
||||
|
||||
} else {
|
||||
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||
"ipv6only is not supported "
|
||||
"on addr \"%s\", ignored",
|
||||
ls->conf.addr);
|
||||
}
|
||||
|
||||
continue;
|
||||
#else
|
||||
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||
"bind ipv6only is not supported "
|
||||
"on this platform");
|
||||
return NGX_CONF_ERROR;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (ngx_strcmp(value[n].data, "ssl") == 0) {
|
||||
#if (NGX_HTTP_SSL)
|
||||
ls->conf.ssl = 1;
|
||||
|
@ -44,6 +44,9 @@ typedef struct {
|
||||
#if (NGX_HTTP_SSL)
|
||||
unsigned ssl:1;
|
||||
#endif
|
||||
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
|
||||
unsigned ipv6only:2;
|
||||
#endif
|
||||
|
||||
int backlog;
|
||||
int rcvbuf;
|
||||
|
Loading…
Reference in New Issue
Block a user