diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2016-06-20 11:50:39 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2016-06-20 11:50:39 +0300 |
| commit | 5b201ac31f968d13f1165e7f29967e5826ccb9a1 (patch) | |
| tree | 61ce22b2491314e54fbcd585a28ffaa39cd49382 /src/core/ngx_proxy_protocol.c | |
| parent | 72d4e5d7930a07a8753640061bbe9210c6a1f890 (diff) | |
| download | nginx-5b201ac31f968d13f1165e7f29967e5826ccb9a1.tar.gz nginx-5b201ac31f968d13f1165e7f29967e5826ccb9a1.zip | |
Introduced ngx_inet_get_port() and ngx_inet_set_port() functions.
Diffstat (limited to 'src/core/ngx_proxy_protocol.c')
| -rw-r--r-- | src/core/ngx_proxy_protocol.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/core/ngx_proxy_protocol.c b/src/core/ngx_proxy_protocol.c index 3e54d4255..523ec35dd 100644 --- a/src/core/ngx_proxy_protocol.c +++ b/src/core/ngx_proxy_protocol.c @@ -141,19 +141,11 @@ ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last) case AF_INET: buf = ngx_cpymem(buf, "PROXY TCP4 ", sizeof("PROXY TCP4 ") - 1); - - port = ntohs(((struct sockaddr_in *) c->sockaddr)->sin_port); - lport = ntohs(((struct sockaddr_in *) c->local_sockaddr)->sin_port); - break; #if (NGX_HAVE_INET6) case AF_INET6: buf = ngx_cpymem(buf, "PROXY TCP6 ", sizeof("PROXY TCP6 ") - 1); - - port = ntohs(((struct sockaddr_in6 *) c->sockaddr)->sin6_port); - lport = ntohs(((struct sockaddr_in6 *) c->local_sockaddr)->sin6_port); - break; #endif @@ -169,5 +161,8 @@ ngx_proxy_protocol_write(ngx_connection_t *c, u_char *buf, u_char *last) buf += ngx_sock_ntop(c->local_sockaddr, c->local_socklen, buf, last - buf, 0); + port = ngx_inet_get_port(c->sockaddr); + lport = ngx_inet_get_port(c->local_sockaddr); + return ngx_slprintf(buf, last, " %ui %ui" CRLF, port, lport); } |