X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/564bdb3f7488129906647c89e70f37710ea2ce33..630bf6981f8ce925697e3668346e9d5267f2800c:/client/adnslogres.c

diff --git a/client/adnslogres.c b/client/adnslogres.c
index ac2aad8..c1a22c0 100644
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -4,12 +4,12 @@
  */
 /*
  *  This file is
- *   Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ *   Copyright (C) 1999 Tony Finch <dot@dotat.at>
  *   Copyright (C) 1999-2000 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  *  It is part of adns, which is
  *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,9 +47,13 @@ static const char * const cvsid =
 #include "config.h"
 #include "adns.h"
 
+#ifdef ADNS_REGRESS_TEST
+# include "hredirect.h"
+#endif
+
 /* maximum number of concurrent DNS queries */
-#define MAXPENDING 64000
-#define MAXPENDING 64000
+#define MAXMAXPENDING 64000
+#define DEFMAXPENDING 2000
 
 /* maximum length of a line */
 #define MAXLINE 1024
@@ -58,7 +62,8 @@ static const char * const cvsid =
 #define OPT_DEBUG 1
 #define OPT_POLL 2
 
-static const char *progname;
+static const char *const progname= "adnslogres";
+static const char *config_text;
 
 #define guard_null(str) ((str) ? (str) : "")
 
@@ -158,46 +163,55 @@ 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;
   logline *head, *tail, *line;
+  adns_initflags initflags;
 
-  errno= adns_init(&adns, (opts & OPT_DEBUG) ? adns_if_debug : 0, 0);
+  initflags= (opts & OPT_DEBUG) ? adns_if_debug : 0;
+  if (config_text) {
+    errno= adns_init_strcfg(&adns, initflags, stderr, config_text);
+  } else {
+    errno= adns_init(&adns, initflags, 0);
+  }
   if (errno) aargh("adns_init");
   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, 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) {
+    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;
+      if (err) {
+	fprintf(stderr, "%s: adns_wait/check: %s", progname, strerror(err));
+	exit(1);
+      }
       printline(outf, head->start, head->addr, head->rest,
 		answer->status == adns_s_ok ? *answer->rrs.str : NULL);
       line= head; head= head->next;
-      free(line); free(answer);
+      free(line);
+      free(answer);
       len--;
     }
     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++;
       }
     }
   }
@@ -205,7 +219,8 @@ static void proclog(FILE *inf, FILE *outf, int opts) {
 }
 
 static void usage(void) {
-  fprintf(stderr, "usage: %s [-d] [-p] [-c concurrency] [logfile]\n", progname);
+  fprintf(stderr, "usage: %s [-d] [-p] [-c concurrency] [-C config] [logfile]\n",
+	  progname);
   exit(1);
 }
 
@@ -214,23 +229,20 @@ int main(int argc, char *argv[]) {
   extern char *optarg;
   FILE *inf;
 
-  progname= strrchr(*argv, '/');
-  if (progname)
-    progname++;
-  else
-    progname= *argv;
-
-  maxpending= MAXPENDING;
+  maxpending= DEFMAXPENDING;
   opts= 0;
-  while ((c= getopt(argc, argv, "c:dp")) != -1)
+  while ((c= getopt(argc, argv, "c:C:dp")) != -1)
     switch (c) {
     case 'c':
       maxpending= atoi(optarg);
-      if (maxpending < 1 || maxpending > MAXPENDING) {
+      if (maxpending < 1 || maxpending > MAXMAXPENDING) {
        fprintf(stderr, "%s: unfeasible concurrency %d\n", progname, maxpending);
        exit(1);
       }
       break;
+    case 'C':
+      config_text= optarg;
+      break;
     case 'd':
       opts|= OPT_DEBUG;
       break;