From f78bca7269cb3fa4123261f3aed9aa3b5c8aab53 Mon Sep 17 00:00:00 2001
From: "Coren[m]" <Break@Ocean>
Date: Sun, 15 Sep 2013 09:22:23 +0200
Subject: [PATCH] Adapted to ipv6-enabled tox

main.c:
- init_tox(): tox_new() => tox_new(TOX_ENABLE_IPV6_DEFAULT) (enables dual-stack per default)
- resolv_addr(): killed
- init_connection(): use tox_bootstrap_from_address(), which does the resolving

prompt.c:
- cmd_connect(): use tox_bootstrap_from_address(), which does the resolving
---
 src/main.c   | 72 +++-------------------------------------------------
 src/prompt.c | 11 ++------
 2 files changed, 5 insertions(+), 78 deletions(-)

diff --git a/src/main.c b/src/main.c
index 3f79bcb..8a2db7f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,7 +90,7 @@ static void init_term()
 static Tox *init_tox()
 {
     /* Init core */
-    Tox *m = tox_new();
+    Tox *m = tox_new(TOX_ENABLE_IPV6_DEFAULT);
     if (m == NULL)
         return NULL;
 
@@ -114,65 +114,6 @@ static Tox *init_tox()
     return m;
 }
 
-/*
-  resolve_addr():
-    address should represent IPv4 or a hostname with A record
-
-    returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
-    returns 0 on failure
-
-    TODO: Fix ipv6 support
-*/
-uint32_t resolve_addr(const char *address)
-{
-    struct addrinfo *server = NULL;
-    struct addrinfo  hints;
-    int              rc;
-    uint32_t         addr;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family   = AF_INET;    // IPv4 only right now.
-    hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
-
-#ifdef _WIN32
-    int res;
-    WSADATA wsa_data;
-
-    res = WSAStartup(MAKEWORD(2, 2), &wsa_data);
-    if (res != 0)
-    {
-        return 0;
-    }
-#endif
-    rc = getaddrinfo(address, "echo", &hints, &server);
-
-    // Lookup failed.
-    if (rc != 0) {
-#ifdef _WIN32
-        WSACleanup();
-#endif
-        return 0;
-    }
-
-    // IPv4 records only..
-    if (server->ai_family != AF_INET) {
-        freeaddrinfo(server);
-#ifdef _WIN32
-        WSACleanup();
-#endif
-        return 0;
-    }
-
-
-    addr = ((struct sockaddr_in *)server->ai_addr)->sin_addr.s_addr;
-
-    freeaddrinfo(server);
-#ifdef _WIN32
-        WSACleanup();
-#endif
-    return addr;
-}
-
 #define MAXLINE 90    /* Approx max number of chars in a sever line (IP + port + key) */
 #define MINLINE 70
 #define MAXSERVERS 50
@@ -211,16 +152,9 @@ int init_connection(Tox *m)
     if (ip == NULL || port == NULL || key == NULL)
         return 3;
 
-    tox_IP_Port dht;
-    dht.port = htons(atoi(port));
-    uint32_t resolved_address = resolve_addr(ip);
-
-    if (resolved_address == 0)
-        return 0;
-
-    dht.ip.i = resolved_address;
     uint8_t *binary_string = hex_string_to_bin(key);
-    tox_bootstrap(m, dht, binary_string);
+    tox_bootstrap_from_address(m, ip, TOX_ENABLE_IPV6_DEFAULT,
+                               htons(atoi(port)), binary_string);
     free(binary_string);
     return 0;
 }
diff --git a/src/prompt.c b/src/prompt.c
index 6bf48e9..fb6fda8 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -285,16 +285,9 @@ void cmd_connect(ToxWindow *self, Tox *m, int argc, char **argv)
         return;
     }
 
-    dht.port = htons(atoi(port));
-    uint32_t resolved_address = resolve_addr(ip);
-
-    if (resolved_address == 0) {
-        return;
-    }
-
-    dht.ip.i = resolved_address;
     uint8_t *binary_string = hex_string_to_bin(key);
-    tox_bootstrap(m, dht, binary_string);
+    tox_bootstrap_from_address(m, ip, TOX_ENABLE_IPV6_DEFAULT,
+                               htons(atoi(port)), binary_string);
     free(binary_string);
 }