comparison src/core/ngx_resolver.h @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents daf4847b43ff
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
35 typedef struct { 35 typedef struct {
36 ngx_connection_t *connection; 36 ngx_connection_t *connection;
37 struct sockaddr *sockaddr; 37 struct sockaddr *sockaddr;
38 socklen_t socklen; 38 socklen_t socklen;
39 ngx_str_t server; 39 ngx_str_t server;
40 ngx_log_t *log; 40 ngx_log_t log;
41 } ngx_udp_connection_t; 41 } ngx_udp_connection_t;
42 42
43 43
44 typedef struct ngx_resolver_ctx_s ngx_resolver_ctx_t; 44 typedef struct ngx_resolver_ctx_s ngx_resolver_ctx_t;
45 45
133 ngx_uint_t recursion; 133 ngx_uint_t recursion;
134 ngx_event_t *event; 134 ngx_event_t *event;
135 }; 135 };
136 136
137 137
138 ngx_resolver_t *ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr); 138 ngx_resolver_t *ngx_resolver_create(ngx_conf_t *cf, ngx_addr_t *addr);
139 ngx_resolver_ctx_t *ngx_resolve_start(ngx_resolver_t *r, 139 ngx_resolver_ctx_t *ngx_resolve_start(ngx_resolver_t *r,
140 ngx_resolver_ctx_t *temp); 140 ngx_resolver_ctx_t *temp);
141 ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx); 141 ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx);
142 void ngx_resolve_name_done(ngx_resolver_ctx_t *ctx); 142 void ngx_resolve_name_done(ngx_resolver_ctx_t *ctx);
143 ngx_int_t ngx_resolve_addr(ngx_resolver_ctx_t *ctx); 143 ngx_int_t ngx_resolve_addr(ngx_resolver_ctx_t *ctx);