GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct the signatures for evdns_configure_windows_nameservers(), now that it is exposed.

Browse Source 
svn:r1369
This commit is contained in:
Nick Mathewson 2009-07-21 18:32:57 +00:00
parent f4775918cd
commit 670658ebd7
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
evdns.c
View File

@ -3538,13 +3538,32 @@ load_nameservers_from_registry(struct evdns_base *base)
#undef TRY #undef TRY
} }
static int int
evdns_config_windows_nameservers(struct evdns_base *base) evdns_base_config_windows_nameservers(struct evdns_base *base)
{ {
ASSERT_LOCKED(base); int r;
if (base == NULL)
base = current_base;
if (base == NULL)
return -1;
EVDNS_LOCK(base);
if (load_nameservers_with_getnetworkparams(base) == 0) if (load_nameservers_with_getnetworkparams(base) == 0)
return 0; return 0;
return load_nameservers_from_registry(base); r = load_nameservers_from_registry(base);
EVDNS_UNLOCK(base);
return r;
}
int
evdns_config_windows_nameservers(void)
{
if (!current_base) {
current_base = evdns_base_new(NULL, 1);
return current_base == NULL ? -1 : 0;
} else {
return evdns_base_config_windows_nameservers(current_base);
}
} }
#endif #endif
@ -3582,7 +3601,7 @@ evdns_base_new(struct event_base *event_base, int initialize_nameservers)
if (initialize_nameservers) { if (initialize_nameservers) {
int r; int r;
#ifdef WIN32 #ifdef WIN32
r = evdns_config_windows_nameservers(base); r = evdns_base_config_windows_nameservers(base);
#else #else
r = evdns_base_resolv_conf_parse(base, DNS_OPTIONS_ALL, "/etc/resolv.conf"); r = evdns_base_resolv_conf_parse(base, DNS_OPTIONS_ALL, "/etc/resolv.conf");
#endif #endif

4
include/event2/dns.h
View File

@ -447,8 +447,8 @@ int evdns_base_resolv_conf_parse(struct evdns_base *base, int flags, const char
@see evdns_resolv_conf_parse() @see evdns_resolv_conf_parse()
*/ */
#ifdef WIN32 #ifdef WIN32
int evdns_config_windows_nameservers(void); int evdns_base_config_windows_nameservers(struct evdns_base *);
#define EVDNS_CONFIG_WINDOWS_NAMESERVERS_IMPLEMENTED #define EVDNS_BASE_CONFIG_WINDOWS_NAMESERVERS_IMPLEMENTED
#endif #endif

5
include/event2/dns_compat.h
View File

@ -313,6 +313,11 @@ void evdns_search_ndots_set(const int ndots);
*/ */
struct evdns_server_port *evdns_add_server_port(evutil_socket_t socket, int is_tcp, evdns_request_callback_fn_type callback, void *user_data); struct evdns_server_port *evdns_add_server_port(evutil_socket_t socket, int is_tcp, evdns_request_callback_fn_type callback, void *user_data);
#ifdef WIN32
int evdns_config_windows_nameservers(void);
#define EVDNS_CONFIG_WINDOWS_NAMESERVERS_IMPLEMENTED
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif