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/http/ngx_http_upstream_round_robin.c | |
| parent | 72d4e5d7930a07a8753640061bbe9210c6a1f890 (diff) | |
| download | nginx-5b201ac31f968d13f1165e7f29967e5826ccb9a1.tar.gz nginx-5b201ac31f968d13f1165e7f29967e5826ccb9a1.tar.bz2 | |
Introduced ngx_inet_get_port() and ngx_inet_set_port() functions.
Diffstat (limited to 'src/http/ngx_http_upstream_round_robin.c')
| -rw-r--r-- | src/http/ngx_http_upstream_round_robin.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c index 8342dc8ed..8479c427d 100644 --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -354,16 +354,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, } ngx_memcpy(sockaddr, ur->addrs[i].sockaddr, socklen); - - switch (sockaddr->sa_family) { -#if (NGX_HAVE_INET6) - case AF_INET6: - ((struct sockaddr_in6 *) sockaddr)->sin6_port = htons(ur->port); - break; -#endif - default: /* AF_INET */ - ((struct sockaddr_in *) sockaddr)->sin_port = htons(ur->port); - } + ngx_inet_set_port(sockaddr, ur->port); p = ngx_pnalloc(r->pool, NGX_SOCKADDR_STRLEN); if (p == NULL) { |
