From 1f1466c194eb0132fc7facbe891a5dc095983e66 Mon Sep 17 00:00:00 2001
From: Julian Kranz <julian@juliankranz.de>
Date: Fri, 6 Jan 2012 17:22:01 +0100
Subject: [PATCH] ---

---
 src/iodine.c  |  2 +-
 src/iodined.c | 32 +++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/iodine.c b/src/iodine.c
index a3fb48c..77a3a95 100644
--- a/src/iodine.c
+++ b/src/iodine.c
@@ -179,7 +179,7 @@ main(int argc, char **argv)
 		__progname++;
 #endif
 
-	while ((choice = getopt(argc, argv, "vfhru6:t:d:R:P:m:M:F:T:O:L:I:")) != -1) {
+	while ((choice = getopt(argc, argv, "6vfhru:t:d:R:P:m:M:F:T:O:L:I:")) != -1) {
 		switch(choice) {
 		case 'v':
 			version();
diff --git a/src/iodined.c b/src/iodined.c
index a6418ab..9a99ccb 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -88,6 +88,8 @@ static in_addr_t ns_ip;
 static int bind_port;
 static int debug;
 
+static char v6;
+
 #if !defined(BSD) && !defined(__GLIBC__)
 static char *__progname;
 #endif
@@ -801,21 +803,27 @@ handle_null_request(int tun_fd, int dns_fd, struct query *q, int domain_len)
 				tempip.s_addr = users[userid].tun_ip;
 				tmp[1] = strdup(inet_ntoa(tempip));
 
-				struct in6_addr ip6;
+				if (v6) {
+					struct in6_addr ip6;
 
-				memcpy(&ip6, &my_net6, sizeof(my_net6));
-				ipv6_addr_add(&ip6, 1);
-				char server6[41];
-				inet_ntop(AF_INET6, &ip6, server6, sizeof(server6));
+					memcpy(&ip6, &my_net6, sizeof(my_net6));
+					ipv6_addr_add(&ip6, 1);
+					char server6[41];
+					inet_ntop(AF_INET6, &ip6, server6, sizeof(server6));
 
-				memcpy(&ip6, &(users[userid].tun_ip6), sizeof(my_net6));
-				char client6[41];
-				inet_ntop(AF_INET6, &ip6, client6, sizeof(client6));
+					memcpy(&ip6, &(users[userid].tun_ip6), sizeof(my_net6));
+					char client6[41];
+					inet_ntop(AF_INET6, &ip6, client6, sizeof(client6));
 
-				read = snprintf(out, sizeof(out), "%s-%s-%d-%d-%s-%s-%d",
-						tmp[0], tmp[1], my_mtu, netmask, server6, client6, netmask6);
+					read = snprintf(out, sizeof(out), "%s-%s-%d-%d-%s-%s-%d",
+							tmp[0], tmp[1], my_mtu, netmask, server6, client6,
+							netmask6);
+				}
 
-				printf("%s\n", out);
+				read = snprintf(out, sizeof(out), "%s-%s-%d-%d",
+						tmp[0], tmp[1], my_mtu, netmask);
+
+				//printf("%s\n", out);
 
 				write_dns(dns_fd, q, out, read, users[userid].downenc);
 				q->id = 0;
@@ -2246,8 +2254,6 @@ main(int argc, char **argv)
 	char *netsize;
 	int retval;
 
-	char v6;
-
 #ifndef WINDOWS32
 	pw = NULL;
 #endif