Mercurial > hg > nginx-quic
comparison src/http/ngx_http_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 | 19db5a6bc34e |
comparison
equal
deleted
inserted
replaced
6559:adf25b8d0431 | 6560:c90cf79d0e1d |
---|---|
3028 *cf = pcf; | 3028 *cf = pcf; |
3029 | 3029 |
3030 if (rv == NGX_CONF_OK && !cscf->listen) { | 3030 if (rv == NGX_CONF_OK && !cscf->listen) { |
3031 ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t)); | 3031 ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t)); |
3032 | 3032 |
3033 sin = &lsopt.u.sockaddr_in; | 3033 sin = &lsopt.sockaddr.sockaddr_in; |
3034 | 3034 |
3035 sin->sin_family = AF_INET; | 3035 sin->sin_family = AF_INET; |
3036 #if (NGX_WIN32) | 3036 #if (NGX_WIN32) |
3037 sin->sin_port = htons(80); | 3037 sin->sin_port = htons(80); |
3038 #else | 3038 #else |
3051 #if (NGX_HAVE_TCP_FASTOPEN) | 3051 #if (NGX_HAVE_TCP_FASTOPEN) |
3052 lsopt.fastopen = -1; | 3052 lsopt.fastopen = -1; |
3053 #endif | 3053 #endif |
3054 lsopt.wildcard = 1; | 3054 lsopt.wildcard = 1; |
3055 | 3055 |
3056 (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.socklen, lsopt.addr, | 3056 (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, |
3057 NGX_SOCKADDR_STRLEN, 1); | 3057 lsopt.addr, NGX_SOCKADDR_STRLEN, 1); |
3058 | 3058 |
3059 if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) { | 3059 if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) { |
3060 return NGX_CONF_ERROR; | 3060 return NGX_CONF_ERROR; |
3061 } | 3061 } |
3062 } | 3062 } |
3996 return NGX_CONF_ERROR; | 3996 return NGX_CONF_ERROR; |
3997 } | 3997 } |
3998 | 3998 |
3999 ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t)); | 3999 ngx_memzero(&lsopt, sizeof(ngx_http_listen_opt_t)); |
4000 | 4000 |
4001 ngx_memcpy(&lsopt.u.sockaddr, &u.sockaddr, u.socklen); | 4001 ngx_memcpy(&lsopt.sockaddr.sockaddr, &u.sockaddr, u.socklen); |
4002 | 4002 |
4003 lsopt.socklen = u.socklen; | 4003 lsopt.socklen = u.socklen; |
4004 lsopt.backlog = NGX_LISTEN_BACKLOG; | 4004 lsopt.backlog = NGX_LISTEN_BACKLOG; |
4005 lsopt.rcvbuf = -1; | 4005 lsopt.rcvbuf = -1; |
4006 lsopt.sndbuf = -1; | 4006 lsopt.sndbuf = -1; |
4013 lsopt.wildcard = u.wildcard; | 4013 lsopt.wildcard = u.wildcard; |
4014 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) | 4014 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) |
4015 lsopt.ipv6only = 1; | 4015 lsopt.ipv6only = 1; |
4016 #endif | 4016 #endif |
4017 | 4017 |
4018 (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.socklen, lsopt.addr, | 4018 (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr, |
4019 NGX_SOCKADDR_STRLEN, 1); | 4019 NGX_SOCKADDR_STRLEN, 1); |
4020 | 4020 |
4021 for (n = 2; n < cf->args->nelts; n++) { | 4021 for (n = 2; n < cf->args->nelts; n++) { |
4022 | 4022 |
4023 if (ngx_strcmp(value[n].data, "default_server") == 0 | 4023 if (ngx_strcmp(value[n].data, "default_server") == 0 |
4142 | 4142 |
4143 if (ngx_strncmp(value[n].data, "ipv6only=o", 10) == 0) { | 4143 if (ngx_strncmp(value[n].data, "ipv6only=o", 10) == 0) { |
4144 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) | 4144 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) |
4145 struct sockaddr *sa; | 4145 struct sockaddr *sa; |
4146 | 4146 |
4147 sa = &lsopt.u.sockaddr; | 4147 sa = &lsopt.sockaddr.sockaddr; |
4148 | 4148 |
4149 if (sa->sa_family == AF_INET6) { | 4149 if (sa->sa_family == AF_INET6) { |
4150 | 4150 |
4151 if (ngx_strcmp(&value[n].data[10], "n") == 0) { | 4151 if (ngx_strcmp(&value[n].data[10], "n") == 0) { |
4152 lsopt.ipv6only = 1; | 4152 lsopt.ipv6only = 1; |