Mercurial > hg > nginx
diff src/stream/ngx_stream_core_module.c @ 6560:c90cf79d0e1d
Renamed "u" to "sockaddr" in listen options types.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 23 May 2016 16:37:28 +0300 |
parents | adf25b8d0431 |
children | 2f41d383c9c7 |
line wrap: on
line diff
--- a/src/stream/ngx_stream_core_module.c Mon May 23 16:37:20 2016 +0300 +++ b/src/stream/ngx_stream_core_module.c Mon May 23 16:37:28 2016 +0300 @@ -280,7 +280,7 @@ ngx_memzero(ls, sizeof(ngx_stream_listen_t)); - ngx_memcpy(&ls->u.sockaddr, &u.sockaddr, u.socklen); + ngx_memcpy(&ls->sockaddr.sockaddr, &u.sockaddr, u.socklen); ls->socklen = u.socklen; ls->backlog = NGX_LISTEN_BACKLOG; @@ -328,7 +328,7 @@ size_t len; u_char buf[NGX_SOCKADDR_STRLEN]; - if (ls->u.sockaddr.sa_family == AF_INET6) { + if (ls->sockaddr.sockaddr.sa_family == AF_INET6) { if (ngx_strcmp(&value[i].data[10], "n") == 0) { ls->ipv6only = 1; @@ -346,7 +346,7 @@ ls->bind = 1; } else { - len = ngx_sock_ntop(&ls->u.sockaddr, ls->socklen, buf, + len = ngx_sock_ntop(&ls->sockaddr.sockaddr, ls->socklen, buf, NGX_SOCKADDR_STRLEN, 1); ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, @@ -505,8 +505,8 @@ continue; } - if (ngx_cmp_sockaddr(&als[i].u.sockaddr, als[i].socklen, - &ls->u.sockaddr, ls->socklen, 1) + if (ngx_cmp_sockaddr(&als[i].sockaddr.sockaddr, als[i].socklen, + &ls->sockaddr.sockaddr, ls->socklen, 1) != NGX_OK) { continue;