From: ian <ian>
Date: Wed, 24 Nov 1999 16:32:30 +0000 (+0000)
Subject: adnsresfilter -a (include addr.) option
X-Git-Tag: rel-adns-0-6~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=fd60df6638e3121a4de5e5395daed760c6898e50;ds=sidebyside

adnsresfilter -a (include addr.) option
---

diff --git a/client/adnsresfilter.c b/client/adnsresfilter.c
index 136929d..6891d88 100644
--- a/client/adnsresfilter.c
+++ b/client/adnsresfilter.c
@@ -49,7 +49,7 @@ struct outqueuenode {
   struct treething *addr;
 };
 
-static int bracket, forever;
+static int bracket, forever, address;
 static unsigned long timeout=100;
 static adns_rrtype rrt= adns_r_ptr;
 
@@ -112,6 +112,7 @@ static void usage(void) {
 	     "options: -b|--brackets\n"
 	     "         -w|--wait\n"
 	     "         -t<timeout>|--timeout <milliseconds>\n"
+	     "         -a|--address  (always include address in output)\n"
 	     "         -u|--unchecked\n")
       == EOF) outputerr();
 }
@@ -148,6 +149,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 +172,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 +238,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) {