Mercurial > hg > nginx
comparison src/core/ngx_resolver.c @ 2646:f4aea5b40fd7 stable-0.6
r2483, r2484, r2485, r2487, r2488, r2489, r2491 merge:
bugfixes in reverse resolver and SMTP proxy
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 01 Apr 2009 16:25:12 +0000 |
parents | 435b689b61ea |
children |
comparison
equal
deleted
inserted
replaced
2645:2baa184412b8 | 2646:f4aea5b40fd7 |
---|---|
576 | 576 |
577 | 577 |
578 ngx_int_t | 578 ngx_int_t |
579 ngx_resolve_addr(ngx_resolver_ctx_t *ctx) | 579 ngx_resolve_addr(ngx_resolver_ctx_t *ctx) |
580 { | 580 { |
581 u_char *name; | |
581 ngx_resolver_t *r; | 582 ngx_resolver_t *r; |
582 ngx_resolver_node_t *rn; | 583 ngx_resolver_node_t *rn; |
583 | 584 |
584 r = ctx->resolver; | 585 r = ctx->resolver; |
585 | 586 |
599 | 600 |
600 rn->expire = ngx_time() + r->expire; | 601 rn->expire = ngx_time() + r->expire; |
601 | 602 |
602 ngx_queue_insert_head(&r->addr_expire_queue, &rn->queue); | 603 ngx_queue_insert_head(&r->addr_expire_queue, &rn->queue); |
603 | 604 |
604 ctx->name.len = rn->nlen; | 605 name = ngx_resolver_dup(r, rn->name, rn->nlen); |
605 ctx->name.data = ngx_resolver_dup(r, rn->name, rn->nlen); | 606 if (name == NULL) { |
606 if (ctx->name.data == NULL) { | |
607 goto failed; | 607 goto failed; |
608 } | 608 } |
609 | 609 |
610 ctx->name.len = rn->nlen; | |
611 ctx->name.data = name; | |
612 | |
610 /* unlock addr mutex */ | 613 /* unlock addr mutex */ |
611 | 614 |
612 ctx->state = NGX_OK; | 615 ctx->state = NGX_OK; |
613 | 616 |
614 ctx->handler(ctx); | 617 ctx->handler(ctx); |
615 | 618 |
616 ngx_resolver_free(r, ctx->name.data); | 619 ngx_resolver_free(r, name); |
617 | 620 |
618 return NGX_OK; | 621 return NGX_OK; |
619 } | 622 } |
620 | 623 |
621 if (rn->waiting) { | 624 if (rn->waiting) { |
622 | 625 |
623 ctx->next = rn->waiting; | 626 ctx->next = rn->waiting; |
624 rn->waiting = ctx; | 627 rn->waiting = ctx; |
625 | 628 |
626 return NGX_AGAIN; | 629 /* unlock addr mutex */ |
630 | |
631 return NGX_OK; | |
627 } | 632 } |
628 | 633 |
629 ngx_queue_remove(&rn->queue); | 634 ngx_queue_remove(&rn->queue); |
630 | 635 |
631 ngx_resolver_free(r, rn->query); | 636 ngx_resolver_free(r, rn->query); |
1304 next = ctx->next; | 1309 next = ctx->next; |
1305 | 1310 |
1306 ctx->handler(ctx); | 1311 ctx->handler(ctx); |
1307 } | 1312 } |
1308 | 1313 |
1309 if (naddrs) { | 1314 if (naddrs > 1) { |
1310 ngx_resolver_free(r, addrs); | 1315 ngx_resolver_free(r, addrs); |
1311 } | 1316 } |
1312 | 1317 |
1313 return; | 1318 return; |
1314 | 1319 |
1481 | 1486 |
1482 if (i + len > (ngx_uint_t) n) { | 1487 if (i + len > (ngx_uint_t) n) { |
1483 goto short_response; | 1488 goto short_response; |
1484 } | 1489 } |
1485 | 1490 |
1486 len -= 2; | |
1487 | |
1488 if (ngx_resolver_copy(r, &name, buf, &buf[i], &buf[n]) != NGX_OK) { | 1491 if (ngx_resolver_copy(r, &name, buf, &buf[i], &buf[n]) != NGX_OK) { |
1489 return; | 1492 return; |
1490 } | 1493 } |
1491 | 1494 |
1492 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver an:%V", &name); | 1495 ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, "resolver an:%V", &name); |
1493 | 1496 |
1494 if (len != (size_t) rn->nlen || ngx_strncmp(name.data, rn->name, len) != 0) | 1497 if (name.len != (size_t) rn->nlen |
1498 || ngx_strncmp(name.data, rn->name, name.len) != 0) | |
1495 { | 1499 { |
1496 ngx_resolver_free(r, rn->name); | 1500 if (rn->nlen) { |
1501 ngx_resolver_free(r, rn->name); | |
1502 } | |
1503 | |
1504 rn->nlen = (u_short) name.len; | |
1497 rn->name = name.data; | 1505 rn->name = name.data; |
1498 | 1506 |
1499 name.data = ngx_resolver_dup(r, rn->name, len); | 1507 name.data = ngx_resolver_dup(r, rn->name, name.len); |
1500 if (name.data == NULL) { | 1508 if (name.data == NULL) { |
1501 goto failed; | 1509 goto failed; |
1502 } | 1510 } |
1503 } | 1511 } |
1504 | 1512 |