diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-02 04:40:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-02 04:40:19 +0000 |
commit | a0ba564746ecdff082ac3982d4d911f91deb8ab7 (patch) | |
tree | 140b348566ed4db87fee526f784bafa9249edf75 | |
parent | 86a020dbabef7e047706f462840bfe66b036093c (diff) | |
download | gnunet-a0ba564746ecdff082ac3982d4d911f91deb8ab7.tar.gz gnunet-a0ba564746ecdff082ac3982d4d911f91deb8ab7.zip |
-moving dns plugin to dns directory
-rw-r--r-- | src/dns/Makefile.am | 18 | ||||
-rw-r--r-- | src/dns/gnunet-service-dns.c | 2 | ||||
-rw-r--r-- | src/dns/plugin_block_dns.c (renamed from src/vpn/plugin_block_dns.c) | 0 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 14 | ||||
-rw-r--r-- | src/vpn/vpn.conf | 11 |
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 = \ | |||
31 | bin_PROGRAMS = \ | 31 | bin_PROGRAMS = \ |
32 | gnunet-service-dns $(HIJACKBIN) | 32 | gnunet-service-dns $(HIJACKBIN) |
33 | 33 | ||
34 | plugin_LTLIBRARIES = \ | ||
35 | libgnunet_plugin_block_dns.la | ||
36 | |||
37 | |||
34 | gnunet_helper_hijack_dns_SOURCES = \ | 38 | gnunet_helper_hijack_dns_SOURCES = \ |
35 | gnunet-helper-hijack-dns.c | 39 | gnunet-helper-hijack-dns.c |
36 | 40 | ||
@@ -45,7 +49,6 @@ gnunet_service_dns_LDADD = \ | |||
45 | $(top_builddir)/src/dns/libgnunetdnsparser.la \ | 49 | $(top_builddir)/src/dns/libgnunetdnsparser.la \ |
46 | $(GN_LIBINTL) | 50 | $(GN_LIBINTL) |
47 | 51 | ||
48 | |||
49 | libgnunetdnsparser_la_SOURCES = \ | 52 | libgnunetdnsparser_la_SOURCES = \ |
50 | dnsparser.c | 53 | dnsparser.c |
51 | libgnunetdnsparser_la_LIBADD = \ | 54 | libgnunetdnsparser_la_LIBADD = \ |
@@ -53,10 +56,19 @@ libgnunetdnsparser_la_LIBADD = \ | |||
53 | libgnunetdnsparser_la_LDFLAGS = \ | 56 | libgnunetdnsparser_la_LDFLAGS = \ |
54 | $(GN_LIB_LDFLAGS) | 57 | $(GN_LIB_LDFLAGS) |
55 | 58 | ||
56 | |||
57 | libgnunetdns_la_SOURCES = \ | 59 | libgnunetdns_la_SOURCES = \ |
58 | dns_api.c dns.h | 60 | dns_api.c dns.h |
59 | libgnunetdns_la_LIBADD = \ | 61 | libgnunetdns_la_LIBADD = \ |
60 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) | 62 | $(top_builddir)/src/util/libgnunetutil.la $(XLIB) |
61 | libgnunetdns_la_LDFLAGS = \ | 63 | libgnunetdns_la_LDFLAGS = \ |
62 | $(GN_LIB_LDFLAGS) \ No newline at end of file | 64 | $(GN_LIB_LDFLAGS) |
65 | |||
66 | libgnunet_plugin_block_dns_la_SOURCES = \ | ||
67 | plugin_block_dns.c | ||
68 | libgnunet_plugin_block_dns_la_LIBADD = \ | ||
69 | $(top_builddir)/src/util/libgnunetutil.la | ||
70 | libgnunet_plugin_block_dns_la_LDFLAGS = \ | ||
71 | $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS) | ||
72 | |||
73 | |||
74 | |||
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 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file vpn/gnunet-service-dns.c | 22 | * @file dns/gnunet-service-dns.c |
23 | * @author Philipp Toelke | 23 | * @author Philipp Toelke |
24 | */ | 24 | */ |
25 | #include "platform.h" | 25 | #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 = \ | |||
58 | $(GN_LIBINTL) | 58 | $(GN_LIBINTL) |
59 | 59 | ||
60 | 60 | ||
61 | plugin_LTLIBRARIES = \ | ||
62 | libgnunet_plugin_block_dns.la | ||
63 | |||
64 | libgnunet_plugin_block_dns_la_SOURCES = \ | ||
65 | plugin_block_dns.c | ||
66 | libgnunet_plugin_block_dns_la_LIBADD = \ | ||
67 | $(top_builddir)/src/util/libgnunetutil.la | ||
68 | libgnunet_plugin_block_dns_la_LDFLAGS = \ | ||
69 | $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS) | ||
70 | |||
71 | |||
72 | #check_PROGRAMS = \ | ||
73 | # test_XXX | ||
74 | |||
75 | if ENABLE_TEST_RUN | 61 | if ENABLE_TEST_RUN |
76 | #TESTS = \ | 62 | #TESTS = \ |
77 | # test_transport_api_tcp | 63 | # 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 | |||
20 | ENABLE_UDP = NO | 20 | ENABLE_UDP = NO |
21 | ENABLE_TCP = NO | 21 | ENABLE_TCP = NO |
22 | 22 | ||
23 | [dns] | ||
24 | AUTOSTART = YES | ||
25 | PORT = 0 | ||
26 | HOSTNAME = localhost | ||
27 | HOME = $SERVICEHOME | ||
28 | CONFIG = $DEFAULTCONFIG | ||
29 | BINARY = gnunet-service-dns | ||
30 | ACCEPT_FROM = 127.0.0.1; | ||
31 | ACCEPT_FROM6 = ::1; | ||
32 | UNIXPATH = /tmp/gnunet-service-dns.sock | ||
33 | PROVIDE_EXIT = NO | ||