Mercurial > hg > nginx

comparison src/core/ngx_inet.h @ 5037:032f71d771e6 stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4945, r4984: ngx_inet.[ch] minor fixes. *) Fixed the NGX_SOCKADDR_STRLEN macro definition. The ngx_sock_ntop() function, when told to print both address and port, prints IPv6 address in square brackets, followed by colon and port. *) Properly initialize "struct in6_addr" with zeroes.
author Maxim Dounin <mdounin@mdounin.ru>
date Sun, 10 Feb 2013 02:56:03 +0000
parents d620f497c50f
children eaf95350d75c
comparison
equal deleted inserted replaced
5036:6e374742043e 5037:032f71d771e6
28 (sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path)) 28 (sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path))
29 29
30 #if (NGX_HAVE_UNIX_DOMAIN) 30 #if (NGX_HAVE_UNIX_DOMAIN)
31 #define NGX_SOCKADDR_STRLEN (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN) 31 #define NGX_SOCKADDR_STRLEN (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN)
32 #else 32 #else
33 #define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof(":65535") - 1) 33 #define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1)
34 #endif 34 #endif
35 35
36 #if (NGX_HAVE_UNIX_DOMAIN) 36 #if (NGX_HAVE_UNIX_DOMAIN)
37 #define NGX_SOCKADDRLEN sizeof(struct sockaddr_un) 37 #define NGX_SOCKADDRLEN sizeof(struct sockaddr_un)
38 #else 38 #else