-moving dns plugin to dns directory

5 files changed, 16 insertions, 29 deletions

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index a7aafa4fc..cf410217f 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -31,6 +31,10 @@ lib_LTLIBRARIES = \
 bin_PROGRAMS = \
   gnunet-service-dns $(HIJACKBIN)
 
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_dns.la 
+
+
 gnunet_helper_hijack_dns_SOURCES = \
  gnunet-helper-hijack-dns.c
 
@@ -45,7 +49,6 @@ gnunet_service_dns_LDADD = \
   $(top_builddir)/src/dns/libgnunetdnsparser.la \
   $(GN_LIBINTL)
 
-
 libgnunetdnsparser_la_SOURCES = \
  dnsparser.c 
 libgnunetdnsparser_la_LIBADD = \
@@ -53,10 +56,19 @@ libgnunetdnsparser_la_LIBADD = \
 libgnunetdnsparser_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-
 libgnunetdns_la_SOURCES = \
  dns_api.c dns.h
 libgnunetdns_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
 libgnunetdns_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
\ No newline at end of file
+  $(GN_LIB_LDFLAGS)
+
+libgnunet_plugin_block_dns_la_SOURCES = \
+  plugin_block_dns.c
+libgnunet_plugin_block_dns_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_block_dns_la_LDFLAGS = \
+  $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
+
+
+
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index a8c3254ef..55c87b9c6 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file vpn/gnunet-service-dns.c
+ * @file dns/gnunet-service-dns.c
  * @author Philipp Toelke
  */
 #include "platform.h"
diff --git a/src/vpn/plugin_block_dns.c b/src/dns/plugin_block_dns.c
index 34b054c8d..34b054c8d 100644
--- a/src/vpn/plugin_block_dns.c
+++ b/src/dns/plugin_block_dns.c
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 13928dba3..ecb01969b 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -58,20 +58,6 @@ gnunet_daemon_exit_LDADD = \
   $(GN_LIBINTL)
 
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dns.la 
-
-libgnunet_plugin_block_dns_la_SOURCES = \
-  plugin_block_dns.c
-libgnunet_plugin_block_dns_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_block_dns_la_LDFLAGS = \
-  $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
-
-
-#check_PROGRAMS = \
-# test_XXX
-
 if ENABLE_TEST_RUN
 #TESTS = \
 # test_transport_api_tcp 
diff --git a/src/vpn/vpn.conf b/src/vpn/vpn.conf
index 0baaa838a..7b7ff2788 100644
--- a/src/vpn/vpn.conf
+++ b/src/vpn/vpn.conf
@@ -20,14 +20,3 @@ IFNAME = exit-gnunet
 ENABLE_UDP = NO
 ENABLE_TCP = NO
 
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-dns.sock
-PROVIDE_EXIT = NO