Remove deprecated ToxDNS

Based on #331.

Fixes #42.

CMakeLists.txt

@@ -6,11 +6,11 @@
 # - A number of small libraries (.a/.so/...) containing independent components
 #   of toxcore. E.g. the DHT has its own library, and the system/network
 #   abstractions are in their own library as well. These libraries are not
-#   installed on `make install`. The toxdns, toxav, and toxencryptsave
-#   libraries are also not installed.
+#   installed on `make install`. The toxav, and toxencryptsave libraries are
+#   also not installed.
 # - A number of small programs, statically linked if possible.
-# - One big library containing all of the toxcore, toxav, toxdns, and
-#   toxencryptsave code.
+# - One big library containing all of the toxcore, toxav, and toxencryptsave
+#   code.
 #
 ################################################################################
 
@@ -328,15 +328,10 @@ endif()
 
 ################################################################################
 #
-# :: ToxDNS and block encryption libraries
+# :: Block encryption libraries
 #
 ################################################################################
 
-add_submodule(toxcore toxdns
-  toxdns/toxdns.c)
-target_link_modules(toxdns toxnetwork)
-set(toxdns_API_HEADERS ${toxcore_SOURCE_DIR}/toxdns/toxdns.h^tox)
-
 apidsl(toxencryptsave/toxencryptsave.api.h)
 add_submodule(toxcore toxencryptsave
   toxencryptsave/toxencryptsave.c
@@ -570,9 +565,6 @@ target_link_modules(DHT_test toxdht)
 add_c_executable(Messenger_test testing/Messenger_test.c)
 target_link_modules(Messenger_test toxmessenger)
 
-add_c_executable(dns3_test testing/dns3_test.c)
-target_link_modules(dns3_test toxdns)
-
 if(NOT WIN32)
   add_c_executable(tox_sync testing/tox_sync.c)
   target_link_modules(tox_sync toxcore)

INSTALL.md

@@ -243,7 +243,6 @@ If it worked, you should have all the toxcore dylibs in /usr/local/lib: (besides
 $ ls -la /usr/local/lib/libtox*.dylib
 libtoxav.0.dylib
 libtoxcore.0.dylib
-libtoxdns.0.dylib
 libtoxencryptsave.0.dylib
 to check what CPU architecture they're compiled for:
 $ lipo -i /usr/local/lib/libtoxencryptsave.0.dylib
@@ -414,7 +413,6 @@ mkdir tmp
 cd tmp
 $WINDOWS_TOOLCHAIN-ar x ../lib/libtoxcore.a
 $WINDOWS_TOOLCHAIN-ar x ../lib/libtoxav.a
-$WINDOWS_TOOLCHAIN-ar x ../lib/libtoxdns.a
 $WINDOWS_TOOLCHAIN-ar x ../lib/libtoxencryptsave.a
 $WINDOWS_TOOLCHAIN-gcc -Wl,--export-all-symbols -Wl,--out-implib=libtox.dll.a -shared -o libtox.dll *.o ../lib/*.a /usr/$WINDOWS_TOOLCHAIN/lib/libwinpthread.a -liphlpapi -lws2_32 -static-libgcc
 ```

build/Makefile.am

@@ -17,7 +17,6 @@ LT_LDFLAGS=-avoid-version
 endif
 
 include ../toxcore/Makefile.inc
-include ../toxdns/Makefile.inc
 include ../toxencryptsave/Makefile.inc
 include ../toxav/Makefile.inc
 include ../other/Makefile.inc

libtoxcore.pc.in

@@ -7,5 +7,5 @@ Name: libtoxcore
 Description: Tox protocol library
 Requires:
 Version: @PACKAGE_VERSION@
-Libs: @NACL_OBJECTS_PKGCONFIG@ -L${libdir} -ltoxcore @NACL_LDFLAGS@ -ltoxdns -ltoxencryptsave @NACL_LIBS@ @LIBS@ @MATH_LDFLAGS@ @PTHREAD_LDFLAGS@
+Libs: @NACL_OBJECTS_PKGCONFIG@ -L${libdir} -ltoxcore @NACL_LDFLAGS@ -ltoxencryptsave @NACL_LIBS@ @LIBS@ @MATH_LDFLAGS@ @PTHREAD_LDFLAGS@
 Cflags: -I${includedir}

other/astyle/README.md

@@ -8,7 +8,7 @@ This directory can house various tools and utilities.
 
 Run from ``toxcore`` directory:
 ```bash
-astyle --options=./other/astyle/astylerc ./toxcore/*.c ./toxcore/*.h ./toxdns/*.c ./toxdns/*.h ./testing/*.c ./toxav/*.c ./toxav/*.h ./other/*.c ./other/bootstrap_daemon/*.c ./toxencryptsave/*.c ./toxencryptsave/*.h ./auto_tests/*.c
+astyle --options=./other/astyle/astylerc ./toxcore/*.c ./toxcore/*.h ./testing/*.c ./toxav/*.c ./toxav/*.h ./other/*.c ./other/bootstrap_daemon/*.c ./toxencryptsave/*.c ./toxencryptsave/*.h ./auto_tests/*.c
 ```
 
 ### For selected file

testing/Makefile.inc

@@ -23,8 +23,7 @@ endif
 if BUILD_TESTING
 
 noinst_PROGRAMS +=      DHT_test \
-                        Messenger_test \
-                        dns3_test
+                        Messenger_test
 
 DHT_test_SOURCES =      ../testing/DHT_test.c
 
@@ -56,23 +55,6 @@ Messenger_test_LDADD =  $(LIBSODIUM_LDFLAGS) \
 
 
 
-dns3_test_SOURCES = \
-                        ../testing/dns3_test.c
-
-dns3_test_CFLAGS = \
-                        $(LIBSODIUM_CFLAGS) \
-                        $(NACL_CFLAGS)
-
-dns3_test_LDADD = \
-                        $(LIBSODIUM_LDFLAGS) \
-                        $(NACL_LDFLAGS) \
-                        libtoxdns.la \
-                        libtoxcore.la \
-                        $(LIBSODIUM_LIBS) \
-                        $(NACL_OBJECTS) \
-                        $(NACL_LIBS) \
-                        $(WINSOCK2_LIBS)
-
 if !WIN32
 
 noinst_PROGRAMS +=      tox_sync

toxcore/network.c

@@ -1411,20 +1411,6 @@ Socket net_socket(int domain, int type, int protocol)
     return socket(platform_domain, platform_type, platform_prot);
 }
 
-/* TODO: Remove, when tox DNS support will be removed.
- * Used only by dns3_test.c
- */
-size_t net_sendto_ip4(Socket sock, const char *buf, size_t n, IP_Port ip_port)
-{
-    struct sockaddr_in target;
-    size_t addrsize = sizeof(target);
-    target.sin_family = make_family(ip_port.ip.family);
-    target.sin_port = net_htons(ip_port.port);
-    fill_addr4(ip_port.ip.ip4, &target.sin_addr);
-
-    return (size_t)sendto(sock, buf, n, 0, (struct sockaddr *)&target, addrsize);
-}
-
 uint32_t net_htonl(uint32_t hostlong)
 {
     return htonl(hostlong);

toxcore/network.h

@@ -403,8 +403,6 @@ void net_freeipport(IP_Port *ip_ports);
  */
 int bind_to_port(Socket sock, int family, uint16_t port);
 
-size_t net_sendto_ip4(Socket sock, const char *buf, size_t n, IP_Port ip_port);
-
 /* Initialize networking.
  * bind to ip and port.
  * ip must be in network order EX: 127.0.0.1 = (7F000001).