IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-20 14:13:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Mail: IPv6 backends (ticket #323).

Browse Source
This commit is contained in:
Ruslan Ermilov 2013-03-25 13:38:59 +00:00
parent 2fd8b271c4
commit 4f2d6513dc
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/mail/ngx_mail_auth_http_module.c
View File

@ -454,12 +454,15 @@ static void
ngx_mail_auth_http_process_headers(ngx_mail_session_t *s, ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
ngx_mail_auth_http_ctx_t *ctx) ngx_mail_auth_http_ctx_t *ctx)
{ {
u_char *p; u_char *p;
time_t timer; time_t timer;
size_t len, size; size_t len, size;
ngx_int_t rc, port, n; ngx_int_t rc, port, n;
ngx_addr_t *peer; ngx_addr_t *peer;
struct sockaddr_in *sin; struct sockaddr_in *sin;
#if (NGX_HAVE_INET6)
struct sockaddr_in6 *sin6;
#endif
ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0,
"mail auth http process headers"); "mail auth http process headers");
@ -772,17 +775,26 @@ ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
return; return;
} }
/* AF_INET only */ rc = ngx_parse_addr(s->connection->pool, peer,
ctx->addr.data, ctx->addr.len);
sin = ngx_pcalloc(s->connection->pool, sizeof(struct sockaddr_in)); switch (rc) {
if (sin == NULL) { case NGX_OK:
break;
case NGX_DECLINED:
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"auth http server %V sent invalid server "
"address:\"%V\"",
ctx->peer.name, &ctx->addr);
/* fall through */
default:
ngx_destroy_pool(ctx->pool); ngx_destroy_pool(ctx->pool);
ngx_mail_session_internal_server_error(s); ngx_mail_session_internal_server_error(s);
return; return;
} }
sin->sin_family = AF_INET;
port = ngx_atoi(ctx->port.data, ctx->port.len); port = ngx_atoi(ctx->port.data, ctx->port.len);
if (port == NGX_ERROR || port < 1 || port > 65535) { if (port == NGX_ERROR || port < 1 || port > 65535) {
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
@ -794,22 +806,21 @@ ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
return; return;
} }
sin->sin_port = htons((in_port_t) port); switch (peer->sockaddr->sa_family) {
sin->sin_addr.s_addr = ngx_inet_addr(ctx->addr.data, ctx->addr.len); #if (NGX_HAVE_INET6)
if (sin->sin_addr.s_addr == INADDR_NONE) { case AF_INET6:
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, sin6 = (struct sockaddr_in6 *) peer->sockaddr;
"auth http server %V sent invalid server " sin6->sin6_port = htons((in_port_t) port);
"address:\"%V\"", break;
ctx->peer.name, &ctx->addr); #endif
ngx_destroy_pool(ctx->pool);
ngx_mail_session_internal_server_error(s); default: /* AF_INET */
return; sin = (struct sockaddr_in *) peer->sockaddr;
sin->sin_port = htons((in_port_t) port);
break;
} }
peer->sockaddr = (struct sockaddr *) sin;
peer->socklen = sizeof(struct sockaddr_in);
len = ctx->addr.len + 1 + ctx->port.len; len = ctx->addr.len + 1 + ctx->port.len;
peer->name.len = len; peer->name.len = len;