Mercurial > hg > nginx

comparison src/event/ngx_event_openssl_stapling.c @ 6593:b3b7e33083ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduced ngx_inet_get_port() and ngx_inet_set_port() functions.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 20 Jun 2016 11:50:39 +0300
parents d3302eb87a0c
children 6acbe9964ceb
comparison
equal deleted inserted replaced
6592:2c7b488a61fb 6593:b3b7e33083ac
918 { 918 {
919 ngx_ssl_ocsp_ctx_t *ctx = resolve->data; 919 ngx_ssl_ocsp_ctx_t *ctx = resolve->data;
920 920
921 u_char *p; 921 u_char *p;
922 size_t len; 922 size_t len;
923 in_port_t port;
924 socklen_t socklen; 923 socklen_t socklen;
925 ngx_uint_t i; 924 ngx_uint_t i;
926 struct sockaddr *sockaddr; 925 struct sockaddr *sockaddr;
927 926
928 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0, 927 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
960 959
961 if (ctx->addrs == NULL) { 960 if (ctx->addrs == NULL) {
962 goto failed; 961 goto failed;
963 } 962 }
964 963
965 port = htons(ctx->port);
966
967 for (i = 0; i < resolve->naddrs; i++) { 964 for (i = 0; i < resolve->naddrs; i++) {
968 965
969 socklen = resolve->addrs[i].socklen; 966 socklen = resolve->addrs[i].socklen;
970 967
971 sockaddr = ngx_palloc(ctx->pool, socklen); 968 sockaddr = ngx_palloc(ctx->pool, socklen);
972 if (sockaddr == NULL) { 969 if (sockaddr == NULL) {
973 goto failed; 970 goto failed;
974 } 971 }
975 972
976 ngx_memcpy(sockaddr, resolve->addrs[i].sockaddr, socklen); 973 ngx_memcpy(sockaddr, resolve->addrs[i].sockaddr, socklen);
977 974 ngx_inet_set_port(sockaddr, ctx->port);
978 switch (sockaddr->sa_family) {
979 #if (NGX_HAVE_INET6)
980 case AF_INET6:
981 ((struct sockaddr_in6 *) sockaddr)->sin6_port = port;
982 break;
983 #endif
984 default: /* AF_INET */
985 ((struct sockaddr_in *) sockaddr)->sin_port = port;
986 }
987 975
988 ctx->addrs[i].sockaddr = sockaddr; 976 ctx->addrs[i].sockaddr = sockaddr;
989 ctx->addrs[i].socklen = socklen; 977 ctx->addrs[i].socklen = socklen;
990 978
991 p = ngx_pnalloc(ctx->pool, NGX_SOCKADDR_STRLEN); 979 p = ngx_pnalloc(ctx->pool, NGX_SOCKADDR_STRLEN);