Changes as from fanf in his message of 11th May 2000.

[adns.git] / client / adnslogres.c

diff --git a/client/adnslogres.c b/client/adnslogres.c
index ed312d2a6e88269efe35b6b3a37838b3622a4067..ac2aad8a64261f944cab8b94cde26f96083bdb09 100644 (file)
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -4,12 +4,12 @@
  */
 /*
  *  This file is
- *   Copyright (C) 1999 Tony Finch <dot@dotat.at>
- *   Copyright (C) 1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *   Copyright (C) 1999-2000 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-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999-2000 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
@@ -25,8 +25,9 @@
  *  along with this program; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * This version was originally supplied by Tony Finch, but has been
- * modified by Ian Jackson as it was incorporated into adns.
+ *  This version was originally supplied by Tony Finch, but has been
+ *  modified by Ian Jackson as it was incorporated into adns and
+ *  subsequently.
  */
 
 static const char * const cvsid =
@@ -41,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 MAXPENDING 64000
+#define MAXPENDING 64000
 
 /* maximum length of a line */
 #define MAXLINE 1024
@@ -56,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";
@@ -132,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))
@@ -157,14 +171,15 @@ static void proclog(FILE *inf, FILE *outf, int opts) {
   while (head) {
     if (opts & OPT_DEBUG)
       msg("%d in queue; checking %.*s", len,
-         head->rest-head->addr, head->addr);
-    if (eof || len > MAXPENDING)
+         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
+    } else {
       err= adns_check(adns, &head->query, &answer, NULL);
+    }
     if (err != EAGAIN) {
       printline(outf, head->start, head->addr, head->rest,
                answer->status == adns_s_ok ? *answer->rrs.str : NULL);
@@ -190,12 +205,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, '/');
@@ -203,10 +219,18 @@ int main(int argc, char *argv[]) {
     progname++;
   else
     progname= *argv;
-  opts= 0;
 
-  while ((c= getopt(argc, argv, "dp")) != -1)
+  maxpending= MAXPENDING;
+  opts= 0;
+  while ((c= getopt(argc, argv, "c:dp")) != -1)
     switch (c) {
+    case 'c':
+      maxpending= atoi(optarg);
+      if (maxpending < 1 || maxpending > MAXPENDING) {
+       fprintf(stderr, "%s: unfeasible concurrency %d\n", progname, maxpending);
+       exit(1);
+      }
+      break;
     case 'd':
       opts|= OPT_DEBUG;
       break;
@@ -231,7 +255,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");