technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Small optimization in nxt_sockaddr_text().

Browse Source
This commit is contained in:
Igor Sysoev
2017-06-28 09:33:35 +03:00
parent 2006e9f537
commit 61c20aae4b
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nxt_sockaddr.c
View File

@@ -193,17 +193,17 @@ nxt_sockaddr_text(nxt_sockaddr_t *sa)
u_char *p, *start, *end, *octet; u_char *p, *start, *end, *octet;
uint32_t port; uint32_t port;
offset = offsetof(nxt_sockaddr_t, u) + sa->socklen;
sa->start = offset;
start = nxt_pointer_to(sa, offset);
end = nxt_pointer_to(sa, sa->sockaddr_size); end = nxt_pointer_to(sa, sa->sockaddr_size);
switch (sa->u.sockaddr.sa_family) { switch (sa->u.sockaddr.sa_family) {
case AF_INET: case AF_INET:
offset = offsetof(nxt_sockaddr_t, u) + sizeof(struct sockaddr_in);
sa->start = offset;
sa->address_start = offset; sa->address_start = offset;
start = nxt_pointer_to(sa, offset);
octet = (u_char *) &sa->u.sockaddr_in.sin_addr; octet = (u_char *) &sa->u.sockaddr_in.sin_addr;
p = nxt_sprintf(start, end, "%ud.%ud.%ud.%ud", p = nxt_sprintf(start, end, "%ud.%ud.%ud.%ud",
@@ -219,14 +219,9 @@ nxt_sockaddr_text(nxt_sockaddr_t *sa)
#if (NXT_INET6) #if (NXT_INET6)
case AF_INET6: case AF_INET6:
offset = offsetof(nxt_sockaddr_t, u) + sizeof(struct sockaddr_in6);
sa->start = offset;
sa->address_start = offset + 1; sa->address_start = offset + 1;
start = nxt_pointer_to(sa, offset);
p = start; p = start;
*p++ = '['; *p++ = '[';
p = nxt_inet6_ntop(sa->u.sockaddr_in6.sin6_addr.s6_addr, p, end); p = nxt_inet6_ntop(sa->u.sockaddr_in6.sin6_addr.s6_addr, p, end);
@@ -245,12 +240,8 @@ nxt_sockaddr_text(nxt_sockaddr_t *sa)
#if (NXT_HAVE_UNIX_DOMAIN) #if (NXT_HAVE_UNIX_DOMAIN)
case AF_UNIX: case AF_UNIX:
offset = offsetof(nxt_sockaddr_t, u) + sa->socklen;
sa->start = offset;
sa->address_start = offset; sa->address_start = offset;
start = nxt_pointer_to(sa, offset);
p = (u_char *) sa->u.sockaddr_un.sun_path; p = (u_char *) sa->u.sockaddr_un.sun_path;
#if (NXT_LINUX) #if (NXT_LINUX)