aboutsummaryrefslogtreecommitdiff
path: root/src/or/eventdns.c
diff options
context:
space:
mode:
authorMike Chiussi <chiussi@gmail.com>2006-09-07 06:34:20 +0000
committerMike Chiussi <chiussi@gmail.com>2006-09-07 06:34:20 +0000
commitb931994c6a42662b28c3fb5882b96aa91d908e94 (patch)
tree084d74702bf3268f51fdaafbedb655c85d50f0aa /src/or/eventdns.c
parentc40acb86f4b34fab25108acea3bf82ec24bf7d08 (diff)
downloadtor-b931994c6a42662b28c3fb5882b96aa91d908e94.tar
tor-b931994c6a42662b28c3fb5882b96aa91d908e94.tar.gz
fixed win32 eventdns snafu
svn:r8345
Diffstat (limited to 'src/or/eventdns.c')
-rw-r--r--src/or/eventdns.c51
1 files changed, 39 insertions, 12 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 6b8544ed8..95b6dc9eb 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -2062,17 +2062,27 @@ load_nameservers_with_getnetworkparams(void)
IP_ADDR_STRING *ns;
DWORD (WINAPI *fn)(FIXED_INFO*, DWORD*);
- if (!(handle = LoadLibrary("iphlpapi.dll")))
- goto done;
+ if (!(handle = LoadLibrary("iphlpapi.dll"))) {
+ log(EVENTDNS_LOG_WARN,"Could not open iphlpapi.dll");
+ //right now status = 0, doesn't that mean "good" - mikec
+ status = -1;
+ goto done;
+ }
if (!(fn =
(DWORD (WINAPI*)(FIXED_INFO*,DWORD*))
GetProcAddress(handle, "GetNetworkParams"))) {
- goto done;
+ log(EVENTDNS_LOG_WARN,"Could not get address of function.");
+ //same as above
+ status = -1;
+ goto done;
}
buf = malloc(size);
- if (!buf) { status = 4; goto done; }
+ if (!buf) {
+ status = 4;
+ goto done;
+ }
fixed = buf;
r = fn(fixed, &size);
if (r != ERROR_SUCCESS && r != ERROR_BUFFER_OVERFLOW) {
@@ -2085,21 +2095,36 @@ load_nameservers_with_getnetworkparams(void)
if (!buf) { status = 4; goto done; }
fixed = buf;
r = fn(fixed, &size);
- if (r != ERROR_SUCCESS) { status = -1; goto done; }
+ if (r != ERROR_SUCCESS) {
+ log(EVENTDNS_LOG_DEBUG,"fn() failed.");
+ status = -1;
+ goto done;
+ }
}
assert(fixed);
added_any = 0;
ns = &(fixed->DnsServerList);
while (ns) {
- r = eventdns_nameserver_ip_add_line(ns->IpAddress.String);
- if (r) { status = r; goto done; }
- added_any = 0;
- ns = ns->Next;
+ r = eventdns_nameserver_ip_add_line(ns->IpAddress.String);
+ if (r) {
+ log(EVENTDNS_LOG_DEBUG,"Could not add nameserver %s to list,error: %d",
+ (ns->IpAddress.String),(int)GetLastError());
+ status = r;
+ goto done;
+ } else {
+ log(EVENTDNS_LOG_DEBUG,"Succesfully added %s as nameserver",ns->IpAddress.String);
+ }
+
+ added_any++;
+ ns = ns->Next;
}
- if (!added_any)
- status = -1;
+ if (!added_any) {
+ //should we ever get here? - mikec
+ log(EVENTDNS_LOG_DEBUG,"No name servers added.");
+ status = -1;
+ }
done:
if (buf)
@@ -2198,8 +2223,10 @@ load_nameservers_from_registry(void)
int
eventdns_config_windows_nameservers(void)
{
- if (load_nameservers_with_getnetworkparams() == 0)
+ if (load_nameservers_with_getnetworkparams() == 0) {
return 0;
+ }
+
return load_nameservers_from_registry();
}
#endif