removed debugging cruft, added README and stub headers for standalone testing

[fb-resolver] / resolver.c

diff --git a/resolver.c b/resolver.c
index 50907e3ef07b0d5312153bea17c684319f61d8fc..a78f0f068813777d40acde7da86915e9f87dff05 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -54,7 +54,7 @@
 #define QUIT_COMMAND "QUIT" /* shut down if this input is encountered */
 #ifdef WITH_RESOLVER_STATS
 # define DUMP_COMMAND "DUMP" /* report on internal state */
-#endif
+#endif /* WITH_RESOLVER_STATS */
 
 
 static
@@ -79,8 +79,8 @@ struct options {
 
 /*
        N.B.  The hostname in a cache entry is a flexible array!
-       If this is ever updated to c99 style, also update how it's allocated
-       in cache_add_.
+       If this is ever updated to c99 style, also update how it's
+       allocated in cache_add_.
 */
 struct cache_entry {
        lru_entry_t lru_; /* must be first */
@@ -760,18 +760,6 @@ ident_query_(char *out_buf, size_t out_buf_sz, struct sockaddr_storage *ss, unsi
        unsigned short *vport;
        socklen_t sockaddr_len;
 
-#ifdef DEBUG_PRETEND_IDENT
-       size_t delay = lrand48() % IDENT_TIMEOUT;
-       if (delay < 45) {
-               delay = delay / 5;
-               sleep(delay);
-       } else {
-               delay = 0;
-       }
-       LOG_VVV("pretending ident query took %zu seconds\n", delay);
-       goto done;
-#endif /* DEBUG_PRETEND_IDENT */
-
        deadline = time(&now) + IDENT_TIMEOUT;
 
        fd = socket(ss->ss_family, SOCK_STREAM, 0);
@@ -1139,10 +1127,6 @@ main(int argc, char **argv)
        }
 #endif /* HAVE_GETRLIMIT */
 
-#ifdef DEBUG_PRETEND_IDENT
-       srand48(getpid());
-#endif
-
        g_log_stream_ = stderr;
 
        while ( (c = getopt(argc, argv, "a:c:f:j:s:o:vh")) != EOF ) {
@@ -1205,6 +1189,7 @@ main(int argc, char **argv)
        }
 
 #ifdef LOG_DEBUG
+       /* forces muck-spawned resolver to log debug messages */
        char lf[] = "/tmp/resolver-debug.XXXXXX";
        int lf_fd = mkstemp(lf);