Mercurial > hg > nginx
comparison src/mail/ngx_mail_auth_http_module.c @ 5134:c788e54090de
Mail: IPv6 backends (ticket #323).
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 25 Mar 2013 13:38:59 +0000 |
parents | eaf95350d75c |
children | 2220de0521ca |
comparison
equal
deleted
inserted
replaced
5133:089a662c17d1 | 5134:c788e54090de |
---|---|
452 | 452 |
453 static void | 453 static void |
454 ngx_mail_auth_http_process_headers(ngx_mail_session_t *s, | 454 ngx_mail_auth_http_process_headers(ngx_mail_session_t *s, |
455 ngx_mail_auth_http_ctx_t *ctx) | 455 ngx_mail_auth_http_ctx_t *ctx) |
456 { | 456 { |
457 u_char *p; | 457 u_char *p; |
458 time_t timer; | 458 time_t timer; |
459 size_t len, size; | 459 size_t len, size; |
460 ngx_int_t rc, port, n; | 460 ngx_int_t rc, port, n; |
461 ngx_addr_t *peer; | 461 ngx_addr_t *peer; |
462 struct sockaddr_in *sin; | 462 struct sockaddr_in *sin; |
463 #if (NGX_HAVE_INET6) | |
464 struct sockaddr_in6 *sin6; | |
465 #endif | |
463 | 466 |
464 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, | 467 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, |
465 "mail auth http process headers"); | 468 "mail auth http process headers"); |
466 | 469 |
467 for ( ;; ) { | 470 for ( ;; ) { |
770 ngx_destroy_pool(ctx->pool); | 773 ngx_destroy_pool(ctx->pool); |
771 ngx_mail_session_internal_server_error(s); | 774 ngx_mail_session_internal_server_error(s); |
772 return; | 775 return; |
773 } | 776 } |
774 | 777 |
775 /* AF_INET only */ | 778 rc = ngx_parse_addr(s->connection->pool, peer, |
776 | 779 ctx->addr.data, ctx->addr.len); |
777 sin = ngx_pcalloc(s->connection->pool, sizeof(struct sockaddr_in)); | 780 |
778 if (sin == NULL) { | 781 switch (rc) { |
782 case NGX_OK: | |
783 break; | |
784 | |
785 case NGX_DECLINED: | |
786 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, | |
787 "auth http server %V sent invalid server " | |
788 "address:\"%V\"", | |
789 ctx->peer.name, &ctx->addr); | |
790 /* fall through */ | |
791 | |
792 default: | |
779 ngx_destroy_pool(ctx->pool); | 793 ngx_destroy_pool(ctx->pool); |
780 ngx_mail_session_internal_server_error(s); | 794 ngx_mail_session_internal_server_error(s); |
781 return; | 795 return; |
782 } | 796 } |
783 | |
784 sin->sin_family = AF_INET; | |
785 | 797 |
786 port = ngx_atoi(ctx->port.data, ctx->port.len); | 798 port = ngx_atoi(ctx->port.data, ctx->port.len); |
787 if (port == NGX_ERROR || port < 1 || port > 65535) { | 799 if (port == NGX_ERROR || port < 1 || port > 65535) { |
788 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, | 800 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, |
789 "auth http server %V sent invalid server " | 801 "auth http server %V sent invalid server " |
792 ngx_destroy_pool(ctx->pool); | 804 ngx_destroy_pool(ctx->pool); |
793 ngx_mail_session_internal_server_error(s); | 805 ngx_mail_session_internal_server_error(s); |
794 return; | 806 return; |
795 } | 807 } |
796 | 808 |
797 sin->sin_port = htons((in_port_t) port); | 809 switch (peer->sockaddr->sa_family) { |
798 | 810 |
799 sin->sin_addr.s_addr = ngx_inet_addr(ctx->addr.data, ctx->addr.len); | 811 #if (NGX_HAVE_INET6) |
800 if (sin->sin_addr.s_addr == INADDR_NONE) { | 812 case AF_INET6: |
801 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, | 813 sin6 = (struct sockaddr_in6 *) peer->sockaddr; |
802 "auth http server %V sent invalid server " | 814 sin6->sin6_port = htons((in_port_t) port); |
803 "address:\"%V\"", | 815 break; |
804 ctx->peer.name, &ctx->addr); | 816 #endif |
805 ngx_destroy_pool(ctx->pool); | 817 |
806 ngx_mail_session_internal_server_error(s); | 818 default: /* AF_INET */ |
807 return; | 819 sin = (struct sockaddr_in *) peer->sockaddr; |
808 } | 820 sin->sin_port = htons((in_port_t) port); |
809 | 821 break; |
810 peer->sockaddr = (struct sockaddr *) sin; | 822 } |
811 peer->socklen = sizeof(struct sockaddr_in); | |
812 | 823 |
813 len = ctx->addr.len + 1 + ctx->port.len; | 824 len = ctx->addr.len + 1 + ctx->port.len; |
814 | 825 |
815 peer->name.len = len; | 826 peer->name.len = len; |
816 | 827 |