ffi-tox 0.1.1 → 0.1.3

data/ProjectTox-Core/testing/Makefile.inc

@@ -0,0 +1,112 @@
+if BUILD_NTOX
+
+bin_PROGRAMS += nTox
+
+nTox_SOURCES =          ../testing/nTox.h \
+                        ../testing/nTox.c
+
+nTox_CFLAGS =           $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS) \
+                        $(NCURSES_CFLAGS)
+
+nTox_LDADD =            $(LIBSODIUM_LDFLAGS) \
+                        $(NAC_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(NACL_LIBS) \
+                        $(NCURSES_LIBS) \
+                        $(WINSOCK2_LIBS)
+endif
+
+
+if BUILD_TESTING
+
+noinst_PROGRAMS +=      DHT_test \
+                        Messenger_test \
+                        dns3_test
+
+DHT_test_SOURCES =      ../testing/DHT_test.c
+
+DHT_test_CFLAGS =       $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS)
+
+DHT_test_LDADD =        $(LIBSODIUM_LDFLAGS) \
+                        $(NACL_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(NACL_LIBS) \
+                        $(WINSOCK2_LIBS)
+
+
+Messenger_test_SOURCES = \
+                        ../testing/Messenger_test.c
+
+Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS)
+
+Messenger_test_LDADD =  $(LIBSODIUM_LDFLAGS) \
+                        $(NACL_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(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
+
+tox_sync_SOURCES =      ../testing/tox_sync.c
+
+tox_sync_CFLAGS =       $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS)
+
+tox_sync_LDADD =        $(LIBSODIUM_LDFLAGS) \
+                        $(NACL_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(NACL_LIBS)
+
+
+noinst_PROGRAMS +=      tox_shell
+
+tox_shell_SOURCES =      ../testing/tox_shell.c
+
+tox_shell_CFLAGS =       $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS)
+
+tox_shell_LDADD =        $(LIBSODIUM_LDFLAGS) \
+                        $(NACL_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(NACL_LIBS) \
+                        -lutil
+
+endif
+
+EXTRA_DIST += 			$(top_srcdir)/testing/misc_tools.c
+
+endif

data/ProjectTox-Core/testing/Messenger_test.c

@@ -1,21 +1,21 @@
 /* Messenger test
- * 
+ *
  * This program adds a friend and accepts all friend requests with the proper message.
- * 
+ *
  * It tries sending a message to the added friend.
- * 
- * If it recieves a message from a friend it replies back.
- * 
- * 
+ *
+ * If it receives a message from a friend it replies back.
+ *
+ *
  * This is how I compile it: gcc -O2 -Wall -D VANILLA_NACL -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../core/DHT.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} Messenger_test.c
  *
- * 
+ *
  * Command line arguments are the ip, port and public_key of a node (for bootstrapping).
- * 
+ *
  * EX: ./test 127.0.0.1 33445 CDCFD319CE3460824B33BE58FD86B8941C9585181D8FBD7C79C5721D7C2E9F7C
- * 
+ *
  * Or the argument can be the path to the save file.
- * 
+ *
  * EX: ./test Save.bak
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -34,13 +34,17 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 
-#include "../core/Messenger.h"
-#include "misc_tools.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "../toxcore/Messenger.h"
+#include "misc_tools.c"
 
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 
 #define c_sleep(x) Sleep(1*x)
 
@@ -48,98 +52,158 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 #define c_sleep(x) usleep(1000*x)
+#define PORT 33445
 
 #endif
 
-void print_request(uint8_t * public_key, uint8_t * data, uint16_t length)
+void print_message(Messenger *m, int friendnumber, const uint8_t *string, uint16_t length, void *userdata)
 {
-    printf("Friend request recieved from: \n");
+    printf("Message with length %u received from %u: %s \n", length, friendnumber, string);
+    m_sendmessage(m, friendnumber, (uint8_t *)"Test1", 6);
+}
+
+/* FIXME needed as print_request has to match the interface expected by
+ * networking_requesthandler and so cannot take a Messenger * */
+static Messenger *m;
+
+void print_request(Messenger *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata)
+{
+    printf("Friend request received from: \n");
     printf("ClientID: ");
     uint32_t j;
-    for(j = 0; j < 32; j++)
-    {
-        if(public_key[j] < 16)
+
+    for (j = 0; j < 32; j++) {
+        if (public_key[j] < 16)
             printf("0");
+
         printf("%hhX", public_key[j]);
     }
+
     printf("\nOf length: %u with data: %s \n", length, data);
-    
-    if(length != sizeof("Install Gentoo"))
-    {
+
+    if (length != sizeof("Install Gentoo")) {
         return;
     }
-    if(memcmp(data , "Install Gentoo", sizeof("Install Gentoo")) == 0 )
-    //if the request contained the message of peace the person is obviously a friend so we add him.
+
+    if (memcmp(data , "Install Gentoo", sizeof("Install Gentoo")) == 0 )
+        //if the request contained the message of peace the person is obviously a friend so we add him.
     {
         printf("Friend request accepted.\n");
-        m_addfriend_norequest(public_key);
+        m_addfriend_norequest(m, public_key);
     }
 }
 
-void print_message(int friendnumber, uint8_t * string, uint16_t length)
-{
-    printf("Message with length %u recieved from %u: %s \n", length, friendnumber, string);
-    m_sendmessage(friendnumber, (uint8_t*)"Test1", 6);
-}
-
 int main(int argc, char *argv[])
 {
-    if (argc < 4 && argc != 2) {
-        printf("usage %s ip port public_key (of the DHT bootstrap node)\n or\n %s Save.bak\n", argv[0], argv[0]);
+    /* let user override default by cmdline */
+    uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
+    int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
+
+    if (argvoffset < 0)
+        exit(1);
+
+    /* with optional --ipvx, now it can be 1-4 arguments... */
+    if ((argc != argvoffset + 2) && (argc != argvoffset + 4)) {
+        printf("Usage: %s [--ipv4|--ipv6] ip port public_key (of the DHT bootstrap node)\n", argv[0]);
+        printf("or\n");
+        printf("       %s [--ipv4|--ipv6] Save.bak (to read Save.bak as state file)\n", argv[0]);
         exit(0);
     }
-    initMessenger();
-    if(argc > 3) {
-        IP_Port bootstrap_ip_port;
-        bootstrap_ip_port.port = htons(atoi(argv[2]));
-        bootstrap_ip_port.ip.i = inet_addr(argv[1]);
-        DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
+
+    Messenger_Options options = {0};
+    options.ipv6enabled = ipv6enabled;
+    m = new_messenger(&options);
+
+    if ( !m ) {
+        fputs("Failed to allocate messenger datastructure\n", stderr);
+        exit(0);
+    }
+
+    if (argc == argvoffset + 4) {
+        uint16_t port = htons(atoi(argv[argvoffset + 2]));
+        uint8_t *bootstrap_key = hex_string_to_bin(argv[argvoffset + 3]);
+        int res = DHT_bootstrap_from_address(m->dht, argv[argvoffset + 1],
+                                             ipv6enabled, port, bootstrap_key);
+        free(bootstrap_key);
+
+        if (!res) {
+            printf("Failed to convert \"%s\" into an IP address. Exiting...\n", argv[argvoffset + 1]);
+            exit(1);
+        }
     } else {
-        FILE *file = fopen(argv[1], "rb");
-        if ( file==NULL ){return 1;}
+        FILE *file = fopen(argv[argvoffset + 1], "rb");
+
+        if ( file == NULL ) {
+            printf("Failed to open \"%s\" - does it exist?\n", argv[argvoffset + 1]);
+            return 1;
+        }
+
         int read;
         uint8_t buffer[128000];
         read = fread(buffer, 1, 128000, file);
-        printf("Messenger loaded: %i\n", Messenger_load(buffer, read));
+        printf("Messenger loaded: %i\n", messenger_load(m, buffer, read));
         fclose(file);
-        
+
     }
-    m_callback_friendrequest(print_request);
-    m_callback_friendmessage(print_message);
-    
+
+    m_callback_friendrequest(m, print_request, NULL);
+    m_callback_friendmessage(m, print_message, NULL);
+
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++) {
-        if(self_public_key[i] < 16)
+    uint8_t address[FRIEND_ADDRESS_SIZE];
+    getaddress(m, address);
+
+    for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
+        if (address[i] < 16)
             printf("0");
-        printf("%hhX",self_public_key[i]);
-    }
-    
-    setname((uint8_t *)"Anon", 5);
-    
-    char temp_id[128];
-    printf("\nEnter the client_id of the friend you wish to add (32 bytes HEX format):\n");
-    if(scanf("%s", temp_id) != 1) {
-        return 1;
+
+        printf("%hhX", address[i]);
     }
-    int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
-    
+
+    setname(m, (uint8_t *)"Anon", 5);
+
+    char temp_hex_id[128];
+    printf("\nEnter the address of the friend you wish to add (38 bytes HEX format):\n");
+
+    if (!fgets(temp_hex_id, sizeof(temp_hex_id), stdin))
+        exit(0);
+
+    if ((strlen(temp_hex_id) > 0) && (temp_hex_id[strlen(temp_hex_id) - 1] == '\n'))
+        temp_hex_id[strlen(temp_hex_id) - 1] = '\0';
+
+
+    uint8_t *bin_id = hex_string_to_bin(temp_hex_id);
+    int num = m_addfriend(m, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo"));
+    free(bin_id);
+
     perror("Initialization");
 
-    while(1) {
+    while (1) {
         uint8_t name[128];
-        getname(num, name);
+        getname(m, num, name);
         printf("%s\n", name);
-        
-        m_sendmessage(num, (uint8_t*)"Test", 5);
-        doMessenger();
+
+        m_sendmessage(m, num, (uint8_t *)"Test", 5);
+        do_messenger(m);
         c_sleep(30);
         FILE *file = fopen("Save.bak", "wb");
-        if ( file==NULL ){return 1;}
-        uint8_t * buffer = malloc(Messenger_size());
-        Messenger_save(buffer);
-        fwrite(buffer, 1, Messenger_size(), file);
+
+        if ( file == NULL ) {
+            return 1;
+        }
+
+        uint8_t *buffer = malloc(messenger_size(m));
+        messenger_save(m, buffer);
+        size_t write_result = fwrite(buffer, 1, messenger_size(m), file);
+
+        if (write_result < messenger_size(m)) {
+            return 1;
+        }
+
         free(buffer);
         fclose(file);
-    }  
+    }
+
+    kill_messenger(m);
 }

data/ProjectTox-Core/testing/dns3_test.c

@@ -0,0 +1,115 @@
+
+
+#include "../toxdns/toxdns.h"
+#include "../toxcore/tox.h"
+#include "../toxcore/network.h"
+#include "misc_tools.c"
+
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
+
+#define c_sleep(x) Sleep(1*x)
+
+#else
+#define c_sleep(x) usleep(1000*x)
+
+#endif
+
+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 = AF_INET;
+    sock_t sock = socket(ip.family, SOCK_DGRAM, IPPROTO_UDP);
+
+    if (!sock_valid(sock))
+        return -1;
+
+    if (!addr_resolve_or_parse_ip(argv[1], &ip, 0))
+        return -1;
+
+    struct sockaddr_in target;
+    size_t addrsize = sizeof(struct sockaddr_in);
+    target.sin_family = AF_INET;
+    target.sin_addr = ip.ip4.in_addr;
+    target.sin_port = htons(53);
+
+    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]));
+    uint8_t packet[512];
+    uint8_t id = rand();
+    uint32_t p_len = create_packet(packet, string, strlen((char *)string), id);
+
+    if (sendto(sock, (char *) packet, p_len, 0, (struct sockaddr *)&target, addrsize) != p_len)
+        return -1;
+
+    uint8_t buffer[512] = {};
+    int r_len = recv(sock, buffer, sizeof(buffer), 0);
+
+    if (r_len < (int)p_len)
+        return -1;
+
+    for (i = r_len - 1; i != 0 && buffer[i] != '='; --i);
+
+    uint8_t tox_id[TOX_FRIEND_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_FRIEND_ADDRESS_SIZE; ++i) {
+        printf("%02hhX", tox_id[i]);
+    }
+
+    printf("\n");
+    return 0;
+}