2 files changed, 30 insertions, 9 deletions

diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 654b759f..63cb1b75 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -84,10 +84,23 @@ void manage_keys(DHT *dht)
 
 int main(int argc, char *argv[])
 {
+    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 */
+       Bind to ip 0.0.0.0 / [::] : PORT */
     IP ip;
-    ip.uint32 = 0;
+    ip_init(&ip, ipv6enabled);
+
     DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
     manage_keys(dht);
     printf("Public key: ");
@@ -111,14 +124,17 @@ int main(int argc, char *argv[])
 
     perror("Initialization.");
 
-    if (argc > 3) {
+    if (argc > argvoffset + 3) {
         printf("Trying to bootstrap into the network...\n");
-        IP_Port bootstrap_info;
-        bootstrap_info.ip.uint32 = inet_addr(argv[1]);
-        bootstrap_info.port = htons(atoi(argv[2]));
-        uint8_t *bootstrap_key = hex_string_to_bin(argv[3]);
-        DHT_bootstrap(dht, 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_ex(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);
+        }
     }
 
     int is_waiting_for_dht_connection = 1;
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index 0ef1f314..890085cc 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -305,7 +305,12 @@ struct server_conf_s configure_server(char *cfg_file)
                 printf("bootstrap_server %d: Invalid port.\n", i);
             }
 
+#ifdef TOX_ENABLE_IPV6
+            server_conf.info[i].conn.ip.family = AF_INET;
+            server_conf.info[i].conn.ip.ip4.uint32 = resolve_addr(strcpy(tmp_ip, bs_ip));
+#else
             server_conf.info[i].conn.ip.uint32 = resolve_addr(strcpy(tmp_ip, bs_ip));
+#endif
             server_conf.info[i].conn.port = htons(bs_port);
             b16_to_key(strcpy(tmp_pk, bs_pk), bs_pk_p);
         }
@@ -344,7 +349,7 @@ int main(int argc, char *argv[])
     /* Initialize networking
     bind to ip 0.0.0.0:PORT */
     IP ip;
-    ip.uint32 = 0;
+    ip_init(&ip, 0);
     DHT *dht = new_DHT(new_net_crypto(new_networking(ip, server_conf.port)));
     /* Read the config file */
     printf("PID file: %s\n", server_conf.pid_file);