From 66ffc809472f27d69b9ad7361f8ba29c2674f716 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 1 Jan 2012 23:00:59 +0000
Subject: [PATCH] -moving DNS code into its own directory

---
 src/Makefile.am                               |  1 +
 src/dns/Makefile.am                           | 48 +++++++++++++++++++
 src/{vpn => dns}/gnunet-dns-parser.c          |  3 +-
 src/{vpn => dns}/gnunet-helper-hijack-dns.c   |  0
 src/{vpn => dns}/gnunet-service-dns.c         |  5 +-
 src/include/Makefile.am                       |  1 +
 .../gnunet_dns_service.h}                     |  0
 .../gnunet_dnsparser_lib.h}                   |  0
 src/vpn/Makefile.am                           | 21 +-------
 src/vpn/gnunet-daemon-vpn-dns.c               |  1 -
 src/vpn/gnunet-daemon-vpn-helper.c            |  1 -
 src/vpn/gnunet-daemon-vpn.h                   |  2 +-
 src/vpn/gnunet-vpn-packet.h                   |  2 +-
 13 files changed, 57 insertions(+), 28 deletions(-)
 create mode 100644 src/dns/Makefile.am
 rename src/{vpn => dns}/gnunet-dns-parser.c (99%)
 rename src/{vpn => dns}/gnunet-helper-hijack-dns.c (100%)
 rename src/{vpn => dns}/gnunet-service-dns.c (99%)
 rename src/{vpn/gnunet-service-dns-p.h => include/gnunet_dns_service.h} (100%)
 rename src/{vpn/gnunet-dns-parser.h => include/gnunet_dnsparser_lib.h} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index eb4049285..6022f0733 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@ SUBDIRS = \
   topology \
   fs \
   mesh \
+  dns \
   vpn \
   integration-tests \
   $(EXP_DIR) 
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
new file mode 100644
index 000000000..aad1b0f7a
--- /dev/null
+++ b/src/dns/Makefile.am
@@ -0,0 +1,48 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+if MINGW
+  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+endif
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+plugindir = $(libdir)/gnunet
+
+if LINUX
+HIJACKBIN = gnunet-helper-hijack-dns
+install-exec-hook:
+	$(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-hijack-dns || true
+	$(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-hijack-dns || true
+else
+install-exec-hook:
+endif
+
+lib_LTLIBRARIES = libgnunetdnsparser.la
+
+bin_PROGRAMS = \
+  gnunet-service-dns $(HIJACKBIN)
+
+gnunet_helper_hijack_dns_SOURCES = \
+ gnunet-helper-hijack-dns.c
+
+gnunet_service_dns_SOURCES = \
+ gnunet-service-dns.c gnunet-service-dns-p.h 
+gnunet_service_dns_LDADD = \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(GN_LIBINTL) -lgnunetdnsparser
+
+
+libgnunetdnsparser_la_SOURCES = \
+ gnunet-dns-parser.c 
+libgnunetdnsparser_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+libgnunetdnsparser_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
\ No newline at end of file
diff --git a/src/vpn/gnunet-dns-parser.c b/src/dns/gnunet-dns-parser.c
similarity index 99%
rename from src/vpn/gnunet-dns-parser.c
rename to src/dns/gnunet-dns-parser.c
index e87109e0c..6921f0d34 100644
--- a/src/vpn/gnunet-dns-parser.c
+++ b/src/dns/gnunet-dns-parser.c
@@ -1,6 +1,5 @@
 #include "platform.h"
-#include "gnunet-dns-parser.h"
-#include "gnunet-vpn-packet.h"
+#include "gnunet_dnsparser_lib.h"
 
 /**
  * Parse a name from DNS to a normal .-delimited, 0-terminated string.
diff --git a/src/vpn/gnunet-helper-hijack-dns.c b/src/dns/gnunet-helper-hijack-dns.c
similarity index 100%
rename from src/vpn/gnunet-helper-hijack-dns.c
rename to src/dns/gnunet-helper-hijack-dns.c
diff --git a/src/vpn/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
similarity index 99%
rename from src/vpn/gnunet-service-dns.c
rename to src/dns/gnunet-service-dns.c
index 12d0a93cf..ee42a7001 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -28,13 +28,12 @@
 #include <gnunet_constants.h>
 #include "gnunet_network_lib.h"
 #include "gnunet_os_lib.h"
-#include "gnunet-service-dns-p.h"
+#include "gnunet_dns_service.h"
 #include "gnunet_connection_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_applications.h"
-#include "gnunet-vpn-packet.h"
 #include "gnunet_container_lib.h"
-#include "gnunet-dns-parser.h"
+#include "gnunet_dnsparser_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_block_lib.h"
 #include "block_dns.h"
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 003a90e24..417e200c2 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -40,6 +40,7 @@ gnunetinclude_HEADERS = \
   gnunet_datastore_plugin.h \
   gnunet_dht_service.h \
   gnunet_disk_lib.h \
+  gnunet_dnsparser_lib.h \
   gnunet_dv_service.h \
   gnunet_fragmentation_lib.h \
   gnunet_fs_service.h \
diff --git a/src/vpn/gnunet-service-dns-p.h b/src/include/gnunet_dns_service.h
similarity index 100%
rename from src/vpn/gnunet-service-dns-p.h
rename to src/include/gnunet_dns_service.h
diff --git a/src/vpn/gnunet-dns-parser.h b/src/include/gnunet_dnsparser_lib.h
similarity index 100%
rename from src/vpn/gnunet-dns-parser.h
rename to src/include/gnunet_dnsparser_lib.h
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index e69c5643e..dfba44f0a 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -17,30 +17,23 @@ dist_pkgcfg_DATA = \
 
 if LINUX
 VPNBIN = gnunet-helper-vpn
-HIJACKBIN = gnunet-helper-hijack-dns
 install-exec-hook:
 	$(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
 	$(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
-	$(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-hijack-dns || true
-	$(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-hijack-dns || true
 else
 install-exec-hook:
 endif
 
 
 bin_PROGRAMS = \
-  gnunet-daemon-exit gnunet-daemon-vpn gnunet-service-dns $(VPNBIN) $(HIJACKBIN)
+  gnunet-daemon-exit gnunet-daemon-vpn $(VPNBIN) $(HIJACKBIN)
 
 
 gnunet_helper_vpn_SOURCES = \
  gnunet-helper-vpn.c
 
-gnunet_helper_hijack_dns_SOURCES = \
- gnunet-helper-hijack-dns.c
-
 gnunet_daemon_vpn_SOURCES = \
  gnunet-daemon-vpn.c gnunet-daemon-vpn.h \
- gnunet-dns-parser.c gnunet-dns-parser.h \
  gnunet-daemon-vpn-helper.c gnunet-daemon-vpn-helper.h \
  gnunet-daemon-vpn-dns.c gnunet-daemon-vpn-dns.h \
  gnunet-helper-vpn-api.c gnunet-helper-vpn-api.h \
@@ -50,17 +43,7 @@ gnunet_daemon_vpn_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
-  $(GN_LIBINTL)
-
-gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c gnunet-service-dns-p.h \
- gnunet-dns-parser.c gnunet-dns-parser.h
-gnunet_service_dns_LDADD = \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdht.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/dns/libgnunetdnsparser.la \
   $(GN_LIBINTL)
 
 gnunet_daemon_exit_SOURCES = \
diff --git a/src/vpn/gnunet-daemon-vpn-dns.c b/src/vpn/gnunet-daemon-vpn-dns.c
index bd65e373f..b24d802f7 100644
--- a/src/vpn/gnunet-daemon-vpn-dns.c
+++ b/src/vpn/gnunet-daemon-vpn-dns.c
@@ -36,7 +36,6 @@
 #include "gnunet-daemon-vpn-dns.h"
 #include "gnunet-daemon-vpn.h"
 #include "gnunet-daemon-vpn-helper.h"
-#include "gnunet-service-dns-p.h"
 #include "gnunet-vpn-packet.h"
 
 struct query_packet_list *head;
diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c
index d0e36099e..8f295506a 100644
--- a/src/vpn/gnunet-daemon-vpn-helper.c
+++ b/src/vpn/gnunet-daemon-vpn-helper.c
@@ -38,7 +38,6 @@
 #include "gnunet-daemon-vpn-dns.h"
 #include "gnunet-daemon-vpn.h"
 #include "gnunet-daemon-vpn-helper.h"
-#include "gnunet-service-dns-p.h"
 #include "gnunet-vpn-packet.h"
 #include "gnunet-vpn-checksum.h"
 #include "gnunet-helper-vpn-api.h"
diff --git a/src/vpn/gnunet-daemon-vpn.h b/src/vpn/gnunet-daemon-vpn.h
index 95218aa61..c8bf91ebb 100644
--- a/src/vpn/gnunet-daemon-vpn.h
+++ b/src/vpn/gnunet-daemon-vpn.h
@@ -26,7 +26,7 @@
 #ifndef GNUNET_DAEMON_VPN_H
 #define GNUNET_DAEMON_VPN_H
 
-#include "gnunet-service-dns-p.h"
+#include "gnunet_dns_service.h"
 
 /**
  * This gets scheduled with cls pointing to an answer_packet and does everything
diff --git a/src/vpn/gnunet-vpn-packet.h b/src/vpn/gnunet-vpn-packet.h
index 19b2c8d7b..ddbfba730 100644
--- a/src/vpn/gnunet-vpn-packet.h
+++ b/src/vpn/gnunet-vpn-packet.h
@@ -3,7 +3,7 @@
 
 #include "platform.h"
 #include "gnunet_common.h"
-#include "gnunet-dns-parser.h"
+#include "gnunet_dnsparser_lib.h"
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
-- 
2.25.1