Mercurial > hg > nginx

comparison src/core/ngx_inet.h @ 4944:ab7a21ce8778

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 30 Nov 2012 11:26:50 +0000
parents d620f497c50f
children eaf95350d75c
comparison
equal deleted inserted replaced
4943:1e2d5d3f9f6b 4944:ab7a21ce8778
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