From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Aug 2011 11:59:53 +0000 (+0100)
Subject: WIP DNS bugfixes
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=8b56203c8884254d4606a5db7623af4e18c37a68;p=secnet.git

WIP DNS bugfixes
---

diff --git a/Makefile.in b/Makefile.in
index 0d1ff1a..22fbf49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,7 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
 	-Wpointer-arith -Wformat=2 -Winit-self \
 	-Wswitch-enum -Wunused-variable -Wbad-function-cast \
 	-Wno-strict-aliasing -fno-strict-aliasing
-ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(CMDLINE_CFLAGS)
 CPPFLAGS:=@CPPFLAGS@
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
diff --git a/dns-bitenc-test.c b/dns-bitenc-test.c
index a11ecd9..19536ac 100644
--- a/dns-bitenc-test.c
+++ b/dns-bitenc-test.c
@@ -49,7 +49,7 @@ int main(int argc, const char **argv) {
 
     const uint8_t *pr;
     for (pr=pktbegin; pr<packet+sizeof(packet); pr++)
-	printf("%02x",*pr);
+	printf(" %02x",*pr);
     printf("\n");
 
     const uint8_t *domainend;
diff --git a/dns-transp-common.c b/dns-transp-common.c
index 1b8eb86..55b14c8 100644
--- a/dns-transp-common.c
+++ b/dns-transp-common.c
@@ -31,7 +31,7 @@ int dnsdomainenc_start(struct dnsdomainenc *be, uint8_t *buf, int buflen,
     be->npending=0;
     be->bufstop=buf+1;
     be->out=buf+buflen;
-    for (i=mydompathlen-1; i>=0; i++) {
+    for (i=mydompathlen-1; i>=0; i--) {
 	const char *lab=mydompath[i];
 	int ll=strlen(lab);
 	if (ll>63) return FAKERCODE_MYDOMAINLABELTOOLONG;