From 2c8fb05f6e1631403053ef8648d5860e0ec15cc3 Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Fri, 29 Dec 2017 00:29:14 +0000
Subject: Remove deprecated ToxDNS

Based on #331.

Fixes #42.
---
 testing/Makefile.inc |  20 +---------
 testing/dns3_test.c  | 106 ---------------------------------------------------
 2 files changed, 1 insertion(+), 125 deletions(-)
 delete mode 100644 testing/dns3_test.c

(limited to 'testing')

diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index fda99a89..8f24b44f 100644
--- a/testing/Makefile.inc
+++ b/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
diff --git a/testing/dns3_test.c b/testing/dns3_test.c
deleted file mode 100644
index 0df7ace2..00000000
--- a/testing/dns3_test.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "../toxcore/network.h"
-#include "../toxcore/tox.h"
-#include "../toxdns/toxdns.h"
-#include "misc_tools.c"
-
-static uint32_t create_packet(uint8_t *packet, uint8_t *string, uint8_t str_len, uint8_t id)
-{
-    memset(packet, 0, str_len + 13 + 16);
-    packet[0] = id;
-    packet[1] = rand();
-    packet[5] = 1;
-    packet[11] = 1;
-    packet[12] = '.';
-    memcpy(packet + 13, string, str_len);
-    uint32_t i, c = 0;
-
-    for (i = str_len + 12; i != 11; --i) {
-        if (packet[i] == '.') {
-            packet[i] = c;
-            c = 0;
-        } else {
-            ++c;
-        }
-    }
-
-    packet[str_len + 13 + 2] = 16;
-    packet[str_len + 13 + 4] = 1;
-    packet[str_len + 13 + 7] = 0x29;
-    packet[str_len + 13 + 8] = 16;
-    packet[str_len + 13 + 12] = 0x80;
-    return str_len + 13 + 16;
-}
-
-int main(int argc, char *argv[])
-{
-    if (argc < 4) {
-        printf("Usage: %s domain domain_public_key queried_username\nEX: %s utox.org D3154F65D28A5B41A05D4AC7E4B39C6B1C233CC857FB365C56E8392737462A12 username\n",
-               argv[0], argv[0]);
-        exit(0);
-    }
-
-    IP ip = {0};
-    ip.family = TOX_AF_INET;
-    Socket sock = net_socket(ip.family, TOX_SOCK_DGRAM, TOX_PROTO_UDP);
-
-    if (!sock_valid(sock)) {
-        return -1;
-    }
-
-    if (!addr_resolve_or_parse_ip(argv[1], &ip, 0)) {
-        return -1;
-    }
-
-    uint32_t request_id;
-    uint8_t string[1024] = {0};
-    void *d = tox_dns3_new(hex_string_to_bin(argv[2]));
-    int len = tox_generate_dns3_string(d, string + 1, sizeof(string) - 1, &request_id, (uint8_t *)argv[3], strlen(argv[3]));
-
-    if (len == -1) {
-        return -1;
-    }
-
-    string[0] = '_';
-    memcpy(string + len + 1, "._tox.", sizeof("._tox."));
-    memcpy((char *)(string + len + 1 + sizeof("._tox.") - 1), argv[1], strlen(argv[1]));
-    uint8_t packet[512];
-    uint8_t id = rand();
-    uint32_t p_len = create_packet(packet, string, strlen((char *)string), id);
-
-    IP_Port ip_port;
-    ip_port.port = 53;
-    ip_port.ip = ip;
-
-    if (net_sendto_ip4(sock, (char *)packet, p_len, ip_port) != p_len) {
-        return -1;
-    }
-
-    uint8_t buffer[512] = {0};
-    int r_len = recv(sock, (char *)buffer, sizeof(buffer), 0);
-
-    if (r_len < (int)p_len) {
-        return -1;
-    }
-
-    unsigned int i;
-
-    for (i = r_len - 1; i != 0 && buffer[i] != '='; --i) {
-        ;
-    }
-
-    uint8_t tox_id[TOX_ADDRESS_SIZE];
-
-    if (tox_decrypt_dns3_TXT(d, tox_id, buffer + i + 1, r_len - (i + 1), request_id) != 0) {
-        return -1;
-    }
-
-    printf("The Tox id for username %s is:\n", argv[3]);
-
-    //unsigned int i;
-    for (i = 0; i < TOX_ADDRESS_SIZE; ++i) {
-        printf("%02hhX", tox_id[i]);
-    }
-
-    printf("\n");
-    return 0;
-}
-- 
cgit v1.2.3