[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r10400: Aaargh. Revert accidentally-committed debugging code in last (in tor/trunk: . src/or)
Author: nickm
Date: 2007-05-29 15:54:54 -0400 (Tue, 29 May 2007)
New Revision: 10400
Modified:
tor/trunk/
tor/trunk/src/or/eventdns.c
Log:
r13071@catbus: nickm | 2007-05-29 15:54:46 -0400
Aaargh. Revert accidentally-committed debugging code in last patch.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r13071] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c 2007-05-29 19:54:51 UTC (rev 10399)
+++ tor/trunk/src/or/eventdns.c 2007-05-29 19:54:54 UTC (rev 10400)
@@ -2658,23 +2658,14 @@
#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state)
char *const first_token = strtok_r(start, delims, &strtok_state);
- if (!first_token) {
- log(EVDNS_LOG_WARN,"No token.");
- return;
- }
+ if (!first_token) return;
-
- log(EVDNS_LOG_WARN,"Token is %s; flags is %d", first_token, flags);
-
if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {
const char *const nameserver = NEXT_TOKEN;
struct in_addr ina;
- log(EVDNS_LOG_WARN,"Parsed nameserver %s", nameserver);
-
if (inet_aton(nameserver, &ina)) {
// address is valid
- log(EVDNS_LOG_WARN,"Liked it.");
evdns_nameserver_add(ina.s_addr);
}
} else if (!strcmp(first_token, "domain") && (flags & DNS_OPTION_SEARCH)) {