ffi-tox 0.1.1 → 0.1.3

data/ProjectTox-Core/other/DHT_bootstrap.c

@@ -1,12 +1,7 @@
+
 /* DHT boostrap
  *
- * A simple DHT boostrap server for tox.
- *
- * Build commands (use one or the other):
- *                gcc -O2 -Wall -D VANILLA_NACL -o bootstrap_server ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../core/DHT.c ../core/friend_requests.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} DHT_bootstrap.c
- *
- *                gcc -O2 -Wall -o bootstrap_server ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../core/DHT.c ../core/friend_requests.c -lsodium DHT_bootstrap.c
- * 
+ * A simple DHT boostrap node for tox.
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
  *
@@ -24,15 +19,35 @@
  *
  *  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/DHT.h"
-#include "../core/friend_requests.h"
-#include "../testing/misc_tools.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "../toxcore/DHT.h"
+#include "../toxcore/LAN_discovery.h"
+#include "../toxcore/friend_requests.h"
+#include "../toxcore/util.h"
+
+#define TCP_RELAY_ENABLED
+
+#ifdef TCP_RELAY_ENABLED
+#include "../toxcore/TCP_server.h"
+#endif
+
+#include "../testing/misc_tools.c"
+
+#ifdef DHT_NODE_EXTRA_PACKETS
+#include "./bootstrap_node_packets.c"
+
+#define DHT_VERSION_NUMBER 1
+#define DHT_MOTD "This is a test motd"
+#endif
 
-//Sleep function (x = milliseconds)
-#ifdef WIN32
+/* Sleep function (x = milliseconds) */
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define c_sleep(x) Sleep(1*x)
 #else
 #include <unistd.h>
@@ -43,32 +58,37 @@
 #define PORT 33445
 
 
-
-void manage_keys()
+void manage_keys(DHT *dht)
 {
     const uint32_t KEYS_SIZE = crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES;
     uint8_t keys[KEYS_SIZE];
 
     FILE *keys_file = fopen("key", "r");
+
     if (keys_file != NULL) {
-        //if file was opened successfully -- load keys
+        /* If file was opened successfully -- load keys,
+           otherwise save new keys */
         size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keys_file);
+
         if (read_size != KEYS_SIZE) {
             printf("Error while reading the key file\nExiting.\n");
             exit(1);
         }
-        load_keys(keys);
-        printf("Keys loaded successfully\n");
+
+        memcpy(dht->self_public_key, keys, crypto_box_PUBLICKEYBYTES);
+        memcpy(dht->self_secret_key, keys + crypto_box_PUBLICKEYBYTES, crypto_box_SECRETKEYBYTES);
+        printf("Keys loaded successfully.\n");
     } else {
-        //otherwise save new keys
-        new_keys();
-        save_keys(keys);
+        memcpy(keys, dht->self_public_key, crypto_box_PUBLICKEYBYTES);
+        memcpy(keys + crypto_box_PUBLICKEYBYTES, dht->self_secret_key, crypto_box_SECRETKEYBYTES);
         keys_file = fopen("key", "w");
+
         if (fwrite(keys, sizeof(uint8_t), KEYS_SIZE, keys_file) != KEYS_SIZE) {
             printf("Error while writing the key file.\nExiting.\n");
             exit(1);
         }
-        printf("Keys saved successfully\n");
+
+        printf("Keys saved successfully.\n");
     }
 
     fclose(keys_file);
@@ -76,64 +96,107 @@ void manage_keys()
 
 int main(int argc, char *argv[])
 {
-    manage_keys();
+    if (argc == 2 && !strncasecmp(argv[1], "-h", 3)) {
+        printf("Usage (connected)  : %s [--ipv4|--ipv6] IP PORT KEY\n", argv[0]);
+        printf("Usage (unconnected): %s [--ipv4|--ipv6]\n", argv[0]);
+        exit(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);
+
+    /* Initialize networking -
+       Bind to ip 0.0.0.0 / [::] : PORT */
+    IP ip;
+    ip_init(&ip, ipv6enabled);
+
+    DHT *dht = new_DHT(new_networking(ip, PORT));
+    Onion *onion = new_onion(dht);
+    Onion_Announce *onion_a = new_onion_announce(dht);
+
+#ifdef DHT_NODE_EXTRA_PACKETS
+    bootstrap_set_callbacks(dht->net, DHT_VERSION_NUMBER, DHT_MOTD, sizeof(DHT_MOTD));
+#endif
+
+    if (!(onion && onion_a)) {
+        printf("Something failed to initialize.\n");
+        exit(1);
+    }
+
+    perror("Initialization");
+
+    manage_keys(dht);
     printf("Public key: ");
     uint32_t i;
 
+#ifdef TCP_RELAY_ENABLED
+#define NUM_PORTS 3
+    uint16_t ports[NUM_PORTS] = {443, 3389, PORT};
+    TCP_Server *tcp_s = new_TCP_server(ipv6enabled, NUM_PORTS, ports, dht->self_public_key, dht->self_secret_key, onion);
+
+    if (tcp_s == NULL) {
+        printf("TCP server failed to initialize.\n");
+        exit(1);
+    }
+
+#endif
+
     FILE *file;
     file = fopen("PUBLIC_ID.txt", "w");
 
-    for(i = 0; i < 32; i++)
-    {
-        if(self_public_key[i] < 16)
-            printf("0");
-        printf("%hhX",self_public_key[i]);
-        fprintf(file, "%hhX",self_public_key[i]);
+    for (i = 0; i < 32; i++) {
+        printf("%02hhX", dht->self_public_key[i]);
+        fprintf(file, "%02hhX", dht->self_public_key[i]);
     }
 
     fclose(file);
 
     printf("\n");
-    printf("Port: %u\n", PORT);
-    //initialize networking
-    //bind to ip 0.0.0.0:PORT
-    IP ip;
-    ip.i = 0;
-    init_networking(ip, PORT);
+    printf("Port: %u\n", ntohs(dht->net->port));
 
-    perror("Initialization");
-
-    if (argc > 3) {
+    if (argc > argvoffset + 3) {
         printf("Trying to bootstrap into the network...\n");
-        IP_Port bootstrap_info;
-        bootstrap_info.ip.i = inet_addr(argv[1]);
-        bootstrap_info.port = htons(atoi(argv[2]));
-        uint8_t *bootstrap_key = hex_string_to_bin(argv[3]);
-        DHT_bootstrap(bootstrap_info, bootstrap_key);
+        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(dht, argv[argvoffset + 1],
+                                             ipv6enabled, port, bootstrap_key);
         free(bootstrap_key);
-    }
 
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
+        if (!res) {
+            printf("Failed to convert \"%s\" into an IP address. Exiting...\n", argv[argvoffset + 1]);
+            exit(1);
+        }
+    }
 
     int is_waiting_for_dht_connection = 1;
-    while(1)
-    {
-        if (is_waiting_for_dht_connection && DHT_isconnected())
-        {
-            printf("Connected to other bootstrap server successfully.\n");
+
+    uint64_t last_LANdiscovery = 0;
+    LANdiscovery_init(dht);
+
+    while (1) {
+        if (is_waiting_for_dht_connection && DHT_isconnected(dht)) {
+            printf("Connected to other bootstrap node successfully.\n");
             is_waiting_for_dht_connection = 0;
         }
-        doDHT();
 
-        while(receivepacket(&ip_port, data, &length) != -1)
-        {
-            DHT_handlepacket(data, length, ip_port);
-            friendreq_handlepacket(data, length, ip_port);
+        do_DHT(dht);
+
+        if (is_timeout(last_LANdiscovery, is_waiting_for_dht_connection ? 5 : LAN_DISCOVERY_INTERVAL)) {
+            send_LANdiscovery(htons(PORT), dht);
+            last_LANdiscovery = unix_time();
         }
+
+#ifdef TCP_RELAY_ENABLED
+        do_TCP_server(tcp_s);
+#endif
+        networking_poll(dht->net);
+
         c_sleep(1);
     }
-    shutdown_networking();
+
     return 0;
 }

data/ProjectTox-Core/other/DHTnodes

@@ -0,0 +1,3 @@
+As maintaining 2 separate lists of the same information seemed redundant, this list has been phased out.
+
+For a current DHT node list please visit http://wiki.tox.im/nodes

data/ProjectTox-Core/other/Makefile.inc

@@ -0,0 +1,20 @@
+bin_PROGRAMS += DHT_bootstrap
+
+DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \
+                        ../toxcore/DHT.h \
+                        ../toxcore/friend_requests.h
+
+DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
+                        $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS)
+
+DHT_bootstrap_LDADD =   $(LIBSODIUM_LDFLAGS) \
+                        $(NACL_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(NACL_LIBS) \
+                        $(WINSOCK2_LIBS)
+
+EXTRA_DIST +=           $(top_srcdir)/other/DHTnodes \
+                        $(top_srcdir)/other/tox.png

data/ProjectTox-Core/other/bootstrap_node_packets.c

@@ -0,0 +1,65 @@
+/* bootstrap_node_packets.c
+ *
+ * Special bootstrap node only packets.
+ *
+ * Include it in your bootstrap node and use: bootstrap_set_callbacks() to enable.
+ *
+ *  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/>.
+ *
+ */
+
+#define MAX_MOTD_LENGTH 256 /* I recommend you use a maximum of 96 bytes. The hard maximum is this though. */
+
+#define INFO_REQUEST_PACKET_LENGTH 78
+
+static uint32_t bootstrap_version;
+static uint8_t bootstrap_motd[MAX_MOTD_LENGTH];
+static uint16_t bootstrap_motd_length;
+
+/* To request this packet just send a packet of length INFO_REQUEST_PACKET_LENGTH
+ * with the first byte being BOOTSTRAP_INFO_PACKET_ID
+ */
+static int handle_info_request(void *object, IP_Port source, const uint8_t *packet, uint32_t length)
+{
+    if (length != INFO_REQUEST_PACKET_LENGTH)
+        return 1;
+
+    uint8_t data[1 + sizeof(bootstrap_version) + MAX_MOTD_LENGTH];
+    data[0] = BOOTSTRAP_INFO_PACKET_ID;
+    memcpy(data + 1, &bootstrap_version, sizeof(bootstrap_version));
+    uint16_t len = 1 + sizeof(bootstrap_version) + bootstrap_motd_length;
+    memcpy(data + 1 + sizeof(bootstrap_version), bootstrap_motd, bootstrap_motd_length);
+
+    if (sendpacket(object, source, data, len) == len)
+        return 0;
+
+    return 1;
+}
+
+int bootstrap_set_callbacks(Networking_Core *net, uint32_t version, uint8_t *motd, uint16_t motd_length)
+{
+    if (motd_length > MAX_MOTD_LENGTH)
+        return -1;
+
+    bootstrap_version = htonl(version);
+    memcpy(bootstrap_motd, motd, motd_length);
+    bootstrap_motd_length = motd_length;
+
+    networking_registerhandler(net, BOOTSTRAP_INFO_PACKET_ID, &handle_info_request, net);
+    return 0;
+}

data/ProjectTox-Core/testing/DHT_test.c

@@ -1,11 +1,11 @@
 /* DHT test
  * A file with a main that runs our DHT for testing.
- * 
+ *
  * Compile with: gcc -O2 -Wall -D VANILLA_NACL -o test ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} DHT_test.c
- * 
+ *
  * Command line arguments are the ip, port and public key of a node.
  * EX: ./test 127.0.0.1 33445 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- * 
+ *
  * The test will then ask you for the id (in hex format) of the friend you wish to add
  *
  *  Copyright (C) 2013 Tox project All Rights Reserved.
@@ -24,18 +24,22 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
- 
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 //#include "../core/network.h"
-#include "../core/DHT.c"
-#include "../core/friend_requests.c"
-#include "misc_tools.h"
+#include "../toxcore/DHT.h"
+#include "../toxcore/friend_requests.h"
+#include "misc_tools.c"
 
 #include <string.h>
 
 //Sleep function (x = milliseconds)
-#ifdef WIN32
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 
 #define c_sleep(x) Sleep(1*x)
 
@@ -48,135 +52,203 @@
 
 #define PORT 33445
 
-void print_clientlist()
+uint8_t zeroes_cid[CLIENT_ID_SIZE];
+
+void print_client_id(uint8_t *client_id)
 {
-    uint32_t i, j;
-    IP_Port p_ip;
+    uint32_t j;
+
+    for (j = 0; j < CLIENT_ID_SIZE; j++) {
+        printf("%02hhX", client_id[j]);
+    }
+}
+
+void print_hardening(Hardening *h)
+{
+    printf("Hardening:\n");
+    printf("routes_requests_ok: %hhu\n", h->routes_requests_ok);
+    printf("routes_requests_timestamp: %llu\n", (long long unsigned int)h->routes_requests_timestamp);
+    printf("routes_requests_pingedid: ");
+    print_client_id(h->routes_requests_pingedid);
+    printf("\nsend_nodes_ok: %hhu\n", h->send_nodes_ok);
+    printf("send_nodes_timestamp: %llu\n", (long long unsigned int)h->send_nodes_timestamp);
+    printf("send_nodes_pingedid: ");
+    print_client_id(h->send_nodes_pingedid);
+    printf("\ntesting_requests: %hhu\n", h->testing_requests);
+    printf("testing_timestamp: %llu\n", (long long unsigned int)h->testing_timestamp);
+    printf("testing_pingedid: ");
+    print_client_id(h->testing_pingedid);
+    printf("\n\n");
+}
+
+void print_assoc(IPPTsPng *assoc, uint8_t ours)
+{
+    IP_Port *ipp = &assoc->ip_port;
+    printf("\nIP: %s Port: %u", ip_ntoa(&ipp->ip), ntohs(ipp->port));
+    printf("\nTimestamp: %llu", (long long unsigned int) assoc->timestamp);
+    printf("\nLast pinged: %llu\n", (long long unsigned int) assoc->last_pinged);
+
+    ipp = &assoc->ret_ip_port;
+
+    if (ours)
+        printf("OUR IP: %s Port: %u\n", ip_ntoa(&ipp->ip), ntohs(ipp->port));
+    else
+        printf("RET IP: %s Port: %u\n", ip_ntoa(&ipp->ip), ntohs(ipp->port));
+
+    printf("Timestamp: %llu\n", (long long unsigned int) assoc->ret_timestamp);
+    print_hardening(&assoc->hardening);
+
+}
+
+void print_clientlist(DHT *dht)
+{
+    uint32_t i;
     printf("___________________CLOSE________________________________\n");
-    for(i = 0; i < 4; i++) {
+
+    for (i = 0; i < LCLIENT_LIST; i++) {
+        Client_data *client = &dht->close_clientlist[i];
+
+        if (memcmp(client->client_id, zeroes_cid, CLIENT_ID_SIZE) == 0)
+            continue;
+
         printf("ClientID: ");
-        for(j = 0; j < 32; j++) {
-            printf("%c", close_clientlist[i].client_id[j]);
-        }
-        p_ip = close_clientlist[i].ip_port;
-        printf("\nIP: %u.%u.%u.%u Port: %u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("\nTimestamp: %u", close_clientlist[i].timestamp);
-        printf("\nLast pinged: %u\n", close_clientlist[i].last_pinged);
-        p_ip = close_clientlist[i].ret_ip_port;
-        printf("OUR IP: %u.%u.%u.%u Port: %u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("Timestamp: %u\n", close_clientlist[i].ret_timestamp);
-    }  
+        print_client_id(client->client_id);
+
+        print_assoc(&client->assoc4, 1);
+        print_assoc(&client->assoc6, 1);
+    }
 }
 
-void print_friendlist()
+void print_friendlist(DHT *dht)
 {
-    uint32_t i, j, k;
+    uint32_t i, k;
     IP_Port p_ip;
     printf("_________________FRIENDS__________________________________\n");
-    for(k = 0; k < num_friends; k++) {
+
+    for (k = 0; k < dht->num_friends; k++) {
         printf("FRIEND %u\n", k);
         printf("ID: ");
-        for(j = 0; j < 32; j++) {
-            printf("%c", friends_list[k].client_id[j]);
-        }
-        p_ip = DHT_getfriendip(friends_list[k].client_id);
-        printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
+
+        print_client_id(dht->friends_list[k].client_id);
+
+        int friendok = DHT_getfriendip(dht, dht->friends_list[k].client_id, &p_ip);
+        printf("\nIP: %s:%u (%d)", ip_ntoa(&p_ip.ip), ntohs(p_ip.port), friendok);
 
         printf("\nCLIENTS IN LIST:\n\n");
-        
-        for(i = 0; i < 4; i++) {
+
+        for (i = 0; i < MAX_FRIEND_CLIENTS; i++) {
+            Client_data *client = &dht->friends_list[k].client_list[i];
+
+            if (memcmp(client->client_id, zeroes_cid, CLIENT_ID_SIZE) == 0)
+                continue;
+
             printf("ClientID: ");
-            for(j = 0; j < 32; j++) {
-                if(friends_list[k].client_list[i].client_id[j] < 16)
-                    printf("0");
-                printf("%hhX", friends_list[k].client_list[i].client_id[j]);
-            }
-            p_ip = friends_list[k].client_list[i].ip_port;
-            printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-            printf("\nTimestamp: %u", friends_list[k].client_list[i].timestamp);
-            printf("\nLast pinged: %u\n", friends_list[k].client_list[i].last_pinged);
-            p_ip = friends_list[k].client_list[i].ret_ip_port;
-            printf("ret IP: %u.%u.%u.%u:%u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-            printf("Timestamp: %u\n", friends_list[k].client_list[i].ret_timestamp);
+            print_client_id(client->client_id);
+
+            print_assoc(&client->assoc4, 0);
+            print_assoc(&client->assoc6, 0);
         }
     }
 }
 
-void printpacket(uint8_t * data, uint32_t length, IP_Port ip_port)
+void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
 {
     uint32_t i;
     printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
     printf("--------------------BEGIN-----------------------------\n");
-    for(i = 0; i < length; i++) {
-        if(data[i] < 16)
+
+    for (i = 0; i < length; i++) {
+        if (data[i] < 16)
             printf("0");
-        printf("%hhX",data[i]);
+
+        printf("%hhX", data[i]);
     }
+
     printf("\n--------------------END-----------------------------\n\n\n");
 }
 
 int main(int argc, char *argv[])
 {
-    //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
-    
     if (argc < 4) {
-        printf("usage %s ip port public_key\n", argv[0]);
+        printf("Usage: %s [--ipv4|--ipv6] ip port public_key\n", argv[0]);
         exit(0);
     }
-    new_keys();
+
+    /* 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);
+
+    //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
+    /* initialize networking */
+    /* bind to ip 0.0.0.0:PORT */
+    IP ip;
+    ip_init(&ip, ipv6enabled);
+
+    DHT *dht = new_DHT(new_networking(ip, PORT));
     printf("OUR ID: ");
     uint32_t i;
-    for(i = 0; i < 32; i++) {
-        if(self_public_key[i] < 16)
+
+    for (i = 0; i < 32; i++) {
+        if (dht->self_public_key[i] < 16)
             printf("0");
-        printf("%hhX",self_public_key[i]);
+
+        printf("%hhX", dht->self_public_key[i]);
     }
-    
+
     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)
+
+    if (!fgets(temp_id, sizeof(temp_id), stdin))
         exit(0);
-    
-    DHT_addfriend(hex_string_to_bin(temp_id));
-    
-    /* initialize networking */
-    /* bind to ip 0.0.0.0:PORT */
-    IP ip;
-    ip.i = 0;
-    init_networking(ip, PORT);
-    
+
+    if ((strlen(temp_id) > 0) && (temp_id[strlen(temp_id) - 1] == '\n'))
+        temp_id[strlen(temp_id) - 1] = '\0';
+
+    uint8_t *bin_id = hex_string_to_bin(temp_id);
+    DHT_addfriend(dht, bin_id);
+    free(bin_id);
 
     perror("Initialization");
-    IP_Port bootstrap_ip_port;
-    bootstrap_ip_port.port = htons(atoi(argv[2]));
-    /* bootstrap_ip_port.ip.c[0] = 127;
-     * bootstrap_ip_port.ip.c[1] = 0;
-     * bootstrap_ip_port.ip.c[2] = 0;
-     * bootstrap_ip_port.ip.c[3] = 1; */
-    bootstrap_ip_port.ip.i = inet_addr(argv[1]);
-    DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
-    
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-    
-    while(1) {
-            
-        doDHT();
-        
-        while(receivepacket(&ip_port, data, &length) != -1) {
-            if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) {
-                //unhandled packet
-                printpacket(data, length, ip_port);
-            } else {
-                printf("Received handled packet with length: %u\n", length);
-            }
-        }
-        print_clientlist();
-        print_friendlist();
+
+    uint16_t port = htons(atoi(argv[argvoffset + 2]));
+    unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]);
+    int res = DHT_bootstrap_from_address(dht, argv[argvoffset + 1], ipv6enabled, port, binary_string);
+    free(binary_string);
+
+    if (!res) {
+        printf("Failed to convert \"%s\" into an IP address. Exiting...\n", argv[argvoffset + 1]);
+        return 1;
+    }
+
+    /*
+        IP_Port ip_port;
+        uint8_t data[MAX_UDP_PACKET_SIZE];
+        uint32_t length;
+    */
+
+    while (1) {
+
+        do_DHT(dht);
+
+        /* slvrTODO:
+                while(receivepacket(&ip_port, data, &length) != -1) {
+                    if(DHT_handlepacket(data, length, ip_port) && friendreq_handlepacket(data, length, ip_port)) {
+                        //unhandled packet
+                        printpacket(data, length, ip_port);
+                    } else {
+                        printf("Received handled packet with length: %u\n", length);
+                    }
+                }
+        */
+        networking_poll(dht->net);
+
+        print_clientlist(dht);
+        print_friendlist(dht);
         c_sleep(300);
     }
-    
-    shutdown_networking();
-    return 0;   
+
+    return 0;
 }