tox.*, Messenger.*:

- initialisation: argument added to enable/disable ipv6 as socket

Messenger_test.c:
- initialisation: ipv4 hardcoded for now
- delegating IP resolution to DHT_bootstrap_ex()

4 files changed, 16 insertions, 3 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index e18e9efc..48d40f43 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -650,15 +650,21 @@ static void LANdiscovery(Messenger *m)
 }
 
 /* Run this at startup. */
-Messenger *initMessenger(void)
+Messenger *initMessenger(uint8_t ipv6enabled)
 {
     Messenger *m = calloc(1, sizeof(Messenger));
 
     if ( ! m )
         return NULL;
 
+#ifdef NETWORK_IP_PORT_IS_IPV6
+    IPAny ip;
+    memset(&ip, 0, sizeof(ip));
+    ip.family = ipv6enabled ? AF_INET6 : AF_INET;
+#else
     IP4 ip;
     ip.uint32 = 0;
+#endif
     m->net = new_networking(ip, PORT);
 
     if (m->net == NULL) {
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index c512245c..34131a20 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -367,7 +367,7 @@ void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, in
  *  return allocated instance of Messenger on success.
  *  return 0 if there are problems.
  */
-Messenger *initMessenger(void);
+Messenger *initMessenger(uint8_t ipv6enabled);
 
 /* Run this before closing shop
  * Free all datastructures.
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 1507b2c5..d48de0d8 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -394,9 +394,13 @@ int tox_isconnected(void *tox)
  *  return allocated instance of tox on success.
  *  return 0 if there are problems.
  */
+void *tox_new_ex(uint8_t ipv6enabled)
+{
+    return initMessenger(ipv6enabled);
+}
 void *tox_new(void)
 {
-    return initMessenger();
+    return tox_new_ex(0);
 }
 
 /* Run this before closing shop.
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 77f0be7f..f8d7975f 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -50,6 +50,8 @@ typedef struct {
     uint16_t padding;
 } tox_IP_Port;
 
+#define TOX_IP_IS_IPV6 0
+
 /* Errors for m_addfriend
  * FAERR - Friend Add Error
  */
@@ -307,6 +309,7 @@ int tox_isconnected(Tox *tox);
  *  return 0 if there are problems.
  */
 Tox *tox_new(void);
+Tox *tox_new_ex(uint8_t ipv6enabled);
 
 /* Run this before closing shop.
  * Free all datastructures. */