X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2Fadnsresfilter.c;h=81750491fbf8952cf67292eedbfc77ca0f9ab61b;hb=e24e7155ee921f30b195b079d0e2d29bf268a354;hp=6891d8865162026093739dac021a98b40655d291;hpb=fd60df6638e3121a4de5e5395daed760c6898e50;p=adns.git

diff --git a/client/adnsresfilter.c b/client/adnsresfilter.c
index 6891d88..8175049 100644
--- a/client/adnsresfilter.c
+++ b/client/adnsresfilter.c
@@ -7,7 +7,7 @@
  *    Copyright (C) 1999 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) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
  *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
  *  
  *  This program is free software; you can redistribute it and/or modify
@@ -50,7 +50,7 @@ struct outqueuenode {
 };
 
 static int bracket, forever, address;
-static unsigned long timeout=100;
+static unsigned long timeout= 1000;
 static adns_rrtype rrt= adns_r_ptr;
 
 static int outblocked, inputeof;
@@ -109,11 +109,13 @@ static void outputerr(void) { sysfail("write to stdout"); }
 static void usage(void) {
   if (printf("usage: adnsresfilter [<options ...>]\n"
 	     "       adnsresfilter  -h|--help\n"
-	     "options: -b|--brackets\n"
-	     "         -w|--wait\n"
-	     "         -t<timeout>|--timeout <milliseconds>\n"
-	     "         -a|--address  (always include address in output)\n"
-	     "         -u|--unchecked\n")
+	     "options: -t<milliseconds>|--timeout <milliseconds>\n"
+	     "         -w|--wait        (always wait for queries to time out or fail)\n"
+	     "         -b|--brackets    (require [...] around IP addresses)\n"
+	     "         -a|--address     (always include [address] in output)\n"
+	     "         -u|--unchecked   (do not forward map for checking)\n"
+	     "Timeout is the maximum amount to delay any particular bit of output for.\n"
+	     "Lookups will go on in the background.  Default timeout = 100 (ms).\n")
       == EOF) outputerr();
 }
 
@@ -367,7 +369,6 @@ static void readstdin(void) {
       if (!bracket && !isalnum(c)) startaddr();
     }
   }
-  if (cbyte==3 && inbyte>0 && !bracket) procaddr();
 }
 
 static void startup(void) {