+ * Improvements to adnslogres (incl. new -c option) from Tony Finch.

[adns.git] / client / adnslogres.c

diff --git a/client/adnslogres.c b/client/adnslogres.c
index ab594d712025863131fc4b2491f40aa1999fd017..cb0bc278590e4894f703bc6d947f5565ada859b2 100644 (file)
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -42,11 +42,14 @@ static const char * const cvsid =
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#include <stdarg.h>
 
+#include "config.h"
 #include "adns.h"
 
 /* maximum number of concurrent DNS queries */
-#define MAXPENDING 1000
+#define MAXMAXPENDING 64000
+#define DEFMAXPENDING 2000
 
 /* maximum length of a line */
 #define MAXLINE 1024
@@ -57,11 +60,21 @@ static const char * const cvsid =
 
 static const char *progname;
 
-#define msg(fmt, args...) fprintf(stderr, "%s: " fmt "\n", progname, ##args)
+#define guard_null(str) ((str) ? (str) : "")
 
 #define sensible_ctype(type,ch) (type((unsigned char)(ch)))
   /* isfoo() functions from ctype.h can't safely be fed char - blech ! */
 
+static void msg(const char *fmt, ...) {
+  va_list al;
+
+  fprintf(stderr, "%s: ", progname);
+  va_start(al,fmt);
+  vfprintf(stderr, fmt, al);
+  va_end(al);
+  fputc('\n',stderr);
+}
+
 static void aargh(const char *cause) {
   const char *why = strerror(errno);
   if (!why) why = "Unknown error";
@@ -133,7 +146,7 @@ static logline *readline(FILE *inf, adns_state adns, int opts) {
     strcpy(line->start, buf);
     str= ipaddr2domain(line->start, &line->addr, &line->rest);
     if (opts & OPT_DEBUG)
-      msg("submitting %.*s -> %s", line->rest-line->addr, line->addr, str);
+      msg("submitting %.*s -> %s", line->rest-line->addr, guard_null(line->addr), str);
     if (adns_submit(adns, str, adns_r_ptr,
                    adns_qf_quoteok_cname|adns_qf_cname_loose,
                    NULL, &line->query))
@@ -145,7 +158,7 @@ static logline *readline(FILE *inf, adns_state adns, int opts) {
   return NULL;
 }
        
-static void proclog(FILE *inf, FILE *outf, int opts) {
+static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
   int eof, err, len;
   adns_state adns;
   adns_answer *answer;
@@ -156,17 +169,19 @@ static void proclog(FILE *inf, FILE *outf, int opts) {
   head= tail= readline(inf, adns, opts);
   len= 1; eof= 0;
   while (head) {
-    if (opts & OPT_DEBUG)
-      msg("%d in queue; checking %.*s", len,
-         head->rest-head->addr, head->addr);
-    if (eof || len > MAXPENDING)
-      if (opts & OPT_POLL)
-       err= adns_wait_poll(adns, &head->query, &answer, NULL);
-      else
-       err= adns_wait(adns, &head->query, &answer, NULL);
-    else
-      err= adns_check(adns, &head->query, &answer, NULL);
-    if (err != EAGAIN) {
+    while (head) {
+      if (opts & OPT_DEBUG)
+       msg("%d in queue; checking %.*s", len,
+           head->rest-head->addr, guard_null(head->addr));
+      if (eof || len > maxpending) {
+       if (opts & OPT_POLL)
+         err= adns_wait_poll(adns, &head->query, &answer, NULL);
+       else
+         err= adns_wait(adns, &head->query, &answer, NULL);
+      } else {
+       err= adns_check(adns, &head->query, &answer, NULL);
+      }
+      if (err == EAGAIN) break;
       printline(outf, head->start, head->addr, head->rest,
                answer->status == adns_s_ok ? *answer->rrs.str : NULL);
       line= head; head= head->next;
@@ -175,15 +190,12 @@ static void proclog(FILE *inf, FILE *outf, int opts) {
     }
     if (!eof) {
       line= readline(inf, adns, opts);
-      if (!line)
+      if (line) {
+        if (!head) head= line;
+        else tail->next= line;
+        tail= line; len++;
+      } else {
        eof= 1;
-      else {
-       if (!head)
-         head= line;
-       else
-         tail->next= line;
-       tail= line;
-       len++;
       }
     }
   }
@@ -191,12 +203,13 @@ static void proclog(FILE *inf, FILE *outf, int opts) {
 }
 
 static void usage(void) {
-  fprintf(stderr, "usage: %s [-d] [-p] [logfile]\n", progname);
+  fprintf(stderr, "usage: %s [-d] [-p] [-c concurrency] [logfile]\n", progname);
   exit(1);
 }
 
 int main(int argc, char *argv[]) {
-  int c, opts;
+  int c, opts, maxpending;
+  extern char *optarg;
   FILE *inf;
 
   progname= strrchr(*argv, '/');
@@ -204,10 +217,18 @@ int main(int argc, char *argv[]) {
     progname++;
   else
     progname= *argv;
-  opts= 0;
 
-  while ((c= getopt(argc, argv, "dp")) != -1)
+  maxpending= DEFMAXPENDING;
+  opts= 0;
+  while ((c= getopt(argc, argv, "c:dp")) != -1)
     switch (c) {
+    case 'c':
+      maxpending= atoi(optarg);
+      if (maxpending < 1 || maxpending > MAXMAXPENDING) {
+       fprintf(stderr, "%s: unfeasible concurrency %d\n", progname, maxpending);
+       exit(1);
+      }
+      break;
     case 'd':
       opts|= OPT_DEBUG;
       break;
@@ -232,7 +253,7 @@ int main(int argc, char *argv[]) {
   if (!inf)
     aargh("couldn't open input");
 
-  proclog(inf, stdout, opts);
+  proclog(inf, stdout, maxpending, opts);
 
   if (fclose(inf))
     aargh("fclose input");