Mercurial > hg > nginx

comparison src/core/ngx_connection.c @ 6474:2cd019520210

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Style.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 30 Mar 2016 11:52:16 +0300
parents fd4b52e74f96
children 090a78da4f88
comparison
equal deleted inserted replaced
6473:9d7326d3f474 6474:2cd019520210
45 ls->addr_text.len = len; 45 ls->addr_text.len = len;
46 46
47 switch (ls->sockaddr->sa_family) { 47 switch (ls->sockaddr->sa_family) {
48 #if (NGX_HAVE_INET6) 48 #if (NGX_HAVE_INET6)
49 case AF_INET6: 49 case AF_INET6:
50 ls->addr_text_max_len = NGX_INET6_ADDRSTRLEN; 50 ls->addr_text_max_len = NGX_INET6_ADDRSTRLEN;
51 break; 51 break;
52 #endif 52 #endif
53 #if (NGX_HAVE_UNIX_DOMAIN) 53 #if (NGX_HAVE_UNIX_DOMAIN)
54 case AF_UNIX: 54 case AF_UNIX:
55 ls->addr_text_max_len = NGX_UNIX_ADDRSTRLEN; 55 ls->addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
56 len++; 56 len++;
57 break; 57 break;
58 #endif 58 #endif
59 case AF_INET: 59 case AF_INET:
60 ls->addr_text_max_len = NGX_INET_ADDRSTRLEN; 60 ls->addr_text_max_len = NGX_INET_ADDRSTRLEN;
61 break; 61 break;
62 default: 62 default:
63 ls->addr_text_max_len = NGX_SOCKADDR_STRLEN; 63 ls->addr_text_max_len = NGX_SOCKADDR_STRLEN;
64 break; 64 break;
65 } 65 }
66 66
67 ls->addr_text.data = ngx_pnalloc(cf->pool, len); 67 ls->addr_text.data = ngx_pnalloc(cf->pool, len);
68 if (ls->addr_text.data == NULL) { 68 if (ls->addr_text.data == NULL) {
69 return NULL; 69 return NULL;
166 166
167 switch (ls[i].sockaddr->sa_family) { 167 switch (ls[i].sockaddr->sa_family) {
168 168
169 #if (NGX_HAVE_INET6) 169 #if (NGX_HAVE_INET6)
170 case AF_INET6: 170 case AF_INET6:
171 ls[i].addr_text_max_len = NGX_INET6_ADDRSTRLEN; 171 ls[i].addr_text_max_len = NGX_INET6_ADDRSTRLEN;
172 len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1; 172 len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
173 break; 173 break;
174 #endif 174 #endif
175 175
176 #if (NGX_HAVE_UNIX_DOMAIN) 176 #if (NGX_HAVE_UNIX_DOMAIN)
177 case AF_UNIX: 177 case AF_UNIX:
178 ls[i].addr_text_max_len = NGX_UNIX_ADDRSTRLEN; 178 ls[i].addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
179 len = NGX_UNIX_ADDRSTRLEN; 179 len = NGX_UNIX_ADDRSTRLEN;
180 break; 180 break;
181 #endif 181 #endif
182 182
183 case AF_INET: 183 case AF_INET:
184 ls[i].addr_text_max_len = NGX_INET_ADDRSTRLEN; 184 ls[i].addr_text_max_len = NGX_INET_ADDRSTRLEN;
185 len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1; 185 len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
186 break; 186 break;
187 187
188 default: 188 default:
189 ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno, 189 ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
190 "the inherited socket #%d has " 190 "the inherited socket #%d has "
191 "an unsupported protocol family", ls[i].fd); 191 "an unsupported protocol family", ls[i].fd);