+ * adnsresfilter doesn't resolve textual prefixes of addresses (eg,

[adns.git] / client / adnsresfilter.c

diff --git a/client/adnsresfilter.c b/client/adnsresfilter.c
index 136929d24fdfb2589bb6800fe98abdba0662fc04..81750491fbf8952cf67292eedbfc77ca0f9ab61b 100644 (file)
--- 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
@@ -49,8 +49,8 @@ struct outqueuenode {
   struct treething *addr;
 };
 
-static int bracket, forever;
-static unsigned long timeout=100;
+static int bracket, forever, address;
+static unsigned long timeout= 1000;
 static adns_rrtype rrt= adns_r_ptr;
 
 static int outblocked, inputeof;
@@ -109,10 +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"
-            "         -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();
 }
 
@@ -148,6 +151,8 @@ static void parseargs(const char *const *argv) {
        rrt= adns_r_ptr_raw;
       } else if (!strcmp(arg,"--wait")) {
        forever= 1;
+      } else if (!strcmp(arg,"--address")) {
+       address= 1;
       } else if (!strcmp(arg,"--help")) {
        usage(); quit(0);
       } else if (!strcmp(arg,"--timeout")) {
@@ -169,6 +174,9 @@ static void parseargs(const char *const *argv) {
        case 'w':
          forever= 1;
          break;
+       case 'a':
+         address= 1;
+         break;
        case 'h':
          usage();
          quit(0);
@@ -232,10 +240,24 @@ static void writestdout(struct outqueuenode *entry) {
 }
 
 static void replacetextwithname(struct outqueuenode *entry) {
-  free(entry->buffer);
-  entry->buffer= 0;
-  entry->textp= entry->addr->ans->rrs.str[0];
-  entry->textlen= strlen(entry->textp);
+  char *name, *newbuf;
+  int namelen, newlen;
+
+  name= entry->addr->ans->rrs.str[0];
+  namelen= strlen(name);
+  if (!address) {
+    free(entry->buffer);
+    entry->buffer= 0;
+    entry->textp= name;
+    entry->textlen= namelen;
+  } else {
+    newlen= entry->textlen + namelen + (bracket ? 0 : 2);
+    newbuf= xmalloc(newlen + 1);
+    sprintf(newbuf, bracket ? "%s%.*s" : "%s[%.*s]", name, entry->textlen, entry->textp);
+    free(entry->buffer);
+    entry->buffer= entry->textp= newbuf;
+    entry->textlen= newlen;
+  }
 }
 
 static void checkadnsqueries(void) {
@@ -347,7 +369,6 @@ static void readstdin(void) {
       if (!bracket && !isalnum(c)) startaddr();
     }
   }
-  if (cbyte==3 && inbyte>0 && !bracket) procaddr();
 }
 
 static void startup(void) {