Fixed some issues in toxdns and added a test.

Added request_id.

request_id must be obtained with tox_generate_dns3_string, stored,
then passed to tox_decrypt_dns3_TXT when we want to decrypt the
received response.

3 files changed, 71 insertions, 56 deletions

diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index 2142b4ca..d29c5d55 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -24,7 +24,8 @@ if BUILD_TESTING
 
 noinst_PROGRAMS +=      DHT_test \
                         Messenger_test \
-                        crypto_speed_test
+                        crypto_speed_test \
+                        dns3_test
 
 DHT_test_SOURCES =      ../testing/DHT_test.c
 
@@ -71,6 +72,24 @@ crypto_speed_test_LDADD = \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
+
+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
new file mode 100644
index 00000000..69649f50
--- /dev/null
+++ b/testing/dns3_test.c
@@ -0,0 +1,51 @@
+
+
+#include "../toxdns/toxdns.h"
+#include "../toxcore/tox.h"
+#include "misc_tools.c"
+
+
+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);
+    }
+
+    uint8_t string[1024] = {0};
+    void *d = tox_dns3_new(hex_string_to_bin(argv[2]));
+    unsigned int i;
+    uint32_t request_id;
+    /*
+    for (i = 0; i < 255; ++i) {
+        tox_generate_dns3_string(d, string, sizeof(string), &request_id, string, i);
+        printf("%s\n", string);
+    }*/
+    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]));
+    printf("Do a DNS request and find the TXT record for:\n%s\nThen paste the contents of the data contained in the id field here:\n",
+           string);
+
+    scanf("%s", string);
+    uint8_t tox_id[TOX_FRIEND_ADDRESS_SIZE];
+
+    if (tox_decrypt_dns3_TXT(d, tox_id, string, strlen((char *)string), request_id) != 0)
+        return -1;
+
+    printf("The Tox id for username %s is:\n", argv[3]);
+
+    //unsigned int i;
+    for (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; ++i) {
+        printf("%02hhX", tox_id[i]);
+    }
+
+    printf("\n");
+    return 0;
+}
diff --git a/testing/nToxAudio.h b/testing/nToxAudio.h
deleted file mode 100644
index 19b31f8b..00000000
--- a/testing/nToxAudio.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* nTox.h
- *
- *Textual frontend for Tox.
- *
- *  Copyright (C) 2013 Tox project All Rights Reserved.
- *
- *  This file is part of Tox.
- *
- *  Tox is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Tox is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef NTOX_H
-#define NTOX_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ncurses.h>
-#include <curses.h>
-#include <ctype.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <netdb.h>
-#include "../core/Messenger.h"
-#include "../core/network.h"
-
-#define STRING_LENGTH 256
-#define HISTORY 50
-#define PUB_KEY_BYTES 32
-
-void new_lines(char *line);
-void line_eval(char *line);
-void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width) ;
-int count_lines(char *string) ;
-char *appender(char *str, const char c);
-void do_refresh();
-
-
-
-
-#endif