Mercurial > hg > nginx
comparison src/core/ngx_inet.h @ 7113:beeac3302e45
Fixed the NGX_UNIX_ADDRSTRLEN macro.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 25 Sep 2017 15:19:24 +0300 |
parents | b802b7e1d9bc |
children | 4f9b72a229c1 |
comparison
equal
deleted
inserted
replaced
7112:5a3ab1b5804b | 7113:beeac3302e45 |
---|---|
15 | 15 |
16 #define NGX_INET_ADDRSTRLEN (sizeof("255.255.255.255") - 1) | 16 #define NGX_INET_ADDRSTRLEN (sizeof("255.255.255.255") - 1) |
17 #define NGX_INET6_ADDRSTRLEN \ | 17 #define NGX_INET6_ADDRSTRLEN \ |
18 (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") - 1) | 18 (sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") - 1) |
19 #define NGX_UNIX_ADDRSTRLEN \ | 19 #define NGX_UNIX_ADDRSTRLEN \ |
20 (sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path)) | 20 (sizeof("unix:") - 1 + \ |
21 sizeof(struct sockaddr_un) - offsetof(struct sockaddr_un, sun_path)) | |
21 | 22 |
22 #if (NGX_HAVE_UNIX_DOMAIN) | 23 #if (NGX_HAVE_UNIX_DOMAIN) |
23 #define NGX_SOCKADDR_STRLEN (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN) | 24 #define NGX_SOCKADDR_STRLEN NGX_UNIX_ADDRSTRLEN |
24 #elif (NGX_HAVE_INET6) | 25 #elif (NGX_HAVE_INET6) |
25 #define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1) | 26 #define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1) |
26 #else | 27 #else |
27 #define NGX_SOCKADDR_STRLEN (NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1) | 28 #define NGX_SOCKADDR_STRLEN (NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1) |
28 #endif | 29 #endif |