mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added IPv6 support to ip_hash.

Browse Source
This commit is contained in:
Ruslan Ermilov 2012-06-19 12:36:54 +00:00
parent 29844cd55c
commit 36a931aba6
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/http/modules/ngx_http_upstream_ip_hash_module.c
View File

@ -16,7 +16,8 @@ typedef struct {
ngx_uint_t hash; ngx_uint_t hash;
u_char addr[3]; u_char addrlen;
u_char *addr;
u_char tries; u_char tries;
@ -76,7 +77,10 @@ ngx_module_t ngx_http_upstream_ip_hash_module = {
}; };
ngx_int_t static u_char ngx_http_upstream_ip_hash_pseudo_addr[3];
static ngx_int_t
ngx_http_upstream_init_ip_hash(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) ngx_http_upstream_init_ip_hash(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
{ {
if (ngx_http_upstream_init_round_robin(cf, us) != NGX_OK) { if (ngx_http_upstream_init_round_robin(cf, us) != NGX_OK) {
@ -93,8 +97,10 @@ static ngx_int_t
ngx_http_upstream_init_ip_hash_peer(ngx_http_request_t *r, ngx_http_upstream_init_ip_hash_peer(ngx_http_request_t *r,
ngx_http_upstream_srv_conf_t *us) ngx_http_upstream_srv_conf_t *us)
{ {
u_char *p;
struct sockaddr_in *sin; struct sockaddr_in *sin;
#if (NGX_HAVE_INET6)
struct sockaddr_in6 *sin6;
#endif
ngx_http_upstream_ip_hash_peer_data_t *iphp; ngx_http_upstream_ip_hash_peer_data_t *iphp;
iphp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_ip_hash_peer_data_t)); iphp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_ip_hash_peer_data_t));
@ -110,20 +116,25 @@ ngx_http_upstream_init_ip_hash_peer(ngx_http_request_t *r,
r->upstream->peer.get = ngx_http_upstream_get_ip_hash_peer; r->upstream->peer.get = ngx_http_upstream_get_ip_hash_peer;
/* AF_INET only */ switch (r->connection->sockaddr->sa_family) {
if (r->connection->sockaddr->sa_family == AF_INET) {
case AF_INET:
sin = (struct sockaddr_in *) r->connection->sockaddr; sin = (struct sockaddr_in *) r->connection->sockaddr;
p = (u_char *) &sin->sin_addr.s_addr; iphp->addr = (u_char *) &sin->sin_addr.s_addr;
iphp->addr[0] = p[0]; iphp->addrlen = 3;
iphp->addr[1] = p[1]; break;
iphp->addr[2] = p[2];
} else { #if (NGX_HAVE_INET6)
iphp->addr[0] = 0; case AF_INET6:
iphp->addr[1] = 0; sin6 = (struct sockaddr_in6 *) r->connection->sockaddr;
iphp->addr[2] = 0; iphp->addr = (u_char *) &sin6->sin6_addr.s6_addr;
iphp->addrlen = 16;
break;
#endif
default:
iphp->addr = ngx_http_upstream_ip_hash_pseudo_addr;
iphp->addrlen = 3;
} }
iphp->hash = 89; iphp->hash = 89;
@ -163,7 +174,7 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
for ( ;; ) { for ( ;; ) {
for (i = 0; i < 3; i++) { for (i = 0; i < iphp->addrlen; i++) {
hash = (hash * 113 + iphp->addr[i]) % 6271; hash = (hash * 113 + iphp->addr[i]) % 6271;
} }