From a1786a480c9c95eaadee456ba1c602e76aa4e13c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Aug 2011 15:23:53 +0100
Subject: [PATCH] WIP DNS turn bitenc debugging off by default

---
 dns-transp-common.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/dns-transp-common.c b/dns-transp-common.c
index 4e8ce7a..a9eba2e 100644
--- a/dns-transp-common.c
+++ b/dns-transp-common.c
@@ -4,13 +4,16 @@
 
 #define MAX_DATA_LABELS 4
 
+#define DPRINTF (void)
+// *#define DPRINTF printf
+
 static const char out_table[32]="0123456789abcdefghijklmnopqrstuv";
 
 static void dump_enc(struct dnsdomainenc *be, const char *what) {
-    printf("ENC p=%08"PRIx32"/%-2d o=[%02d]|%02x %s\n",
-	   be->pending, be->npending,
-	   (int)(be->out - be->bufstop), *be->out,
-	   what);
+    DPRINTF("ENC p=%08"PRIx32"/%-2d o=[%02d]|%02x %s\n",
+	    be->pending, be->npending,
+	    (int)(be->out - be->bufstop), *be->out,
+	    what);
 }
 
 static inline int enoughinput(struct dnsdomainenc *be) {
@@ -121,10 +124,10 @@ void dnsdomaindec_globalinit(void) {
 
 static void dump_dec(struct dnsdomaindec *bd, const char *what) {
     int remain=bd->in - bd->databuf;
-    printf("DEC4 i=[%02d]|%02x p=%08"PRIx32"/%-2d %s\n",
-	   remain, remain ? *(bd->in-1) : 0,
-	   bd->pending, bd->npending,
-	   what);
+    DPRINTF("DEC4 i=[%02d]|%02x p=%08"PRIx32"/%-2d %s\n",
+	    remain, remain ? *(bd->in-1) : 0,
+	    bd->pending, bd->npending,
+	    what);
 }
 
 struct labelinpacket {
@@ -152,8 +155,8 @@ int dnsdomaindec_start(struct dnsdomaindec *bd, const uint8_t *packet,
     for (;;) {
 	if (domain==endpacket)
 	    return RCODE_FORMERR;
-	printf("DEC1 dom=|[%02d]|%02x[%02d]\n", domain-packet,
-	       *domain, endpacket-domain);
+	DPRINTF("DEC1 dom=|[%02d]|%02x[%02d]\n", domain-packet,
+		*domain, endpacket-domain);
 	unsigned b=*domain++;
 	if (!b) {
 	    totallen++;
@@ -182,8 +185,8 @@ int dnsdomaindec_start(struct dnsdomaindec *bd, const uint8_t *packet,
 	    return RCODE_FORMERR;
 	labels[nlabels].bytes=domain;
 	labels[nlabels].len=b;
-	printf("DEC1 labels[%d]=%.*s\n", nlabels,
-	       labels[nlabels].len, labels[nlabels].bytes);
+	DPRINTF("DEC1 labels[%d]=%.*s\n", nlabels,
+		labels[nlabels].len, labels[nlabels].bytes);
 	nlabels++;
 	domain += b;
     }
@@ -192,15 +195,15 @@ int dnsdomaindec_start(struct dnsdomaindec *bd, const uint8_t *packet,
     for (i=0; i<mydompathlen; i++) {
 	int l=strlen(mydompath[i]);
 	const struct labelinpacket *got=&labels[nlabels-mydompathlen+i];
-	printf("DEC2 [%d] %s ?= %.*s\n", i, mydompath[i],
-	       got->len, got->bytes);
+	DPRINTF("DEC2 [%d] %s ?= %.*s\n", i, mydompath[i],
+		got->len, got->bytes);
 	if (got->len != l || memcmp(got->bytes, mydompath[i], l))
 	    return FAKERCODE_NOTAUTH;
     }
     /* OK, it's our domain and it has some data and a good
      * number of labels.  Wow. */
     uint8_t *copyto=bd->databuf;
-    printf("DEC3");
+    DPRINTF("DEC3");
     for (i=nlabels-mydompathlen-1; i>=0; i--) {
 	const uint8_t *p=labels[i].bytes;
 	for (j=0; j<labels[i].len; j++) {
@@ -210,9 +213,9 @@ int dnsdomaindec_start(struct dnsdomaindec *bd, const uint8_t *packet,
 	    printf(" %02x",val);
 	    *copyto++=val;
 	}
-	printf(" .");
+	DPRINTF(" .");
     }
-    printf("\n");
+    DPRINTF("\n");
     assert(copyto <= bd->databuf+sizeof(bd->databuf));
     bd->in=copyto;
     return 0;
-- 
2.30.2