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

Merge remote-tracking branch 'origin/patches-2.0'

Browse Source 
Conflicts:
	sample/dns-example.c
This commit is contained in:
Nick Mathewson 2011-11-14 11:45:17 -05:00
commit 9ae6e5959d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sample/dns-example.c
View File

@ -165,6 +165,13 @@ main(int c, char **v) {
++idx; ++idx;
} }
#ifdef WIN32
{
WSADATA WSAData;
WSAStartup(0x101, &WSAData);
}
#endif
event_base = event_base_new(); event_base = event_base_new();
evdns_base = evdns_base_new(event_base, 0); evdns_base = evdns_base_new(event_base, 0);
evdns_set_log_fn(logfn); evdns_set_log_fn(logfn);
@ -188,12 +195,17 @@ main(int c, char **v) {
evdns_add_server_port_with_base(event_base, sock, 0, evdns_server_callback, NULL); evdns_add_server_port_with_base(event_base, sock, 0, evdns_server_callback, NULL);
} }
if (idx < c) { if (idx < c) {
int res;
#ifdef _WIN32 #ifdef _WIN32
evdns_base_config_windows_nameservers(evdns_base); res = evdns_base_config_windows_nameservers(evdns_base);
#else #else
evdns_base_resolv_conf_parse(evdns_base, DNS_OPTION_NAMESERVERS, res = evdns_base_resolv_conf_parse(evdns_base, DNS_OPTION_NAMESERVERS,
"/etc/resolv.conf"); "/etc/resolv.conf");
#endif #endif
if (res < 0) {
fprintf(stderr, "Couldn't configure nameservers");
return 1;
}
} }
printf("EVUTIL_AI_CANONNAME in example = %d\n", EVUTIL_AI_CANONNAME); printf("EVUTIL_AI_CANONNAME in example = %d\n", EVUTIL_AI_CANONNAME);