Merge branch 'master' of github.com:gjedeer/tuntox

4 files changed, 116 insertions, 80 deletions

diff --git a/BUILD.md b/BUILD.md
index 6731aa2..2c68c9a 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -9,7 +9,7 @@ One reason to do so may be if you'd like to resolve hostnames on the tuntox serv
 
 Static linking breaks hostname resolution, but IMHO the pros overweight the cons.
 
-c-toxcore is the only direct dependency. c-toxcore requires libsodium and libevent_pthreads at the time of writing this, please refer to their install instructions for the current dependencies.
+c-toxcore is the only direct dependency. c-toxcore requires libsodium and libevent_pthreads at the time of writing this, please refer to their install instructions for the current dependencies. Also pkg-config is required.
 
 ## MacOS build
 Basically the same as above but:
diff --git a/main.c b/main.c
index 0d2e5e8..a16c040 100644
--- a/main.c
+++ b/main.c
@@ -71,6 +71,10 @@ fd_set master_server_fds;
 /* We keep two hash tables: one indexed by sockfd and another by "connection id" */
 tunnel *by_id = NULL;
 
+/* Tunnels need to be delete safely, outside FD_ISSET polling */
+/* See: tunnel_queue_delete() */
+tunnel_list *tunnels_to_delete = NULL;
+
 /* Highest used fd + 1 for select() */
 int select_nfds = 4;
 
@@ -144,9 +148,10 @@ tunnel *tunnel_create(int sockfd, int connid, uint32_t friendnumber)
     return t;
 }
 
+/* Please use tunnel_queue_delete() instead */
 void tunnel_delete(tunnel *t)
 {
-    log_printf(L_INFO, "Deleting tunnel #%d\n", t->connid);
+    log_printf(L_INFO, "Deleting tunnel #%d ptr %p\n", t->connid, t);
     if(t->sockfd)
     {
         close(t->sockfd);
@@ -156,6 +161,17 @@ void tunnel_delete(tunnel *t)
     free(t);
 }
 
+void tunnel_queue_delete(tunnel *t)
+{
+    tunnel_list *tunnel_list_entry = NULL;
+
+    log_printf(L_DEBUG2, "Queued deleting tunnel #%d ptr %p\n", t->connid, t);
+
+    tunnel_list_entry = calloc(sizeof(tunnel_list), 1);
+    tunnel_list_entry->tun = t;
+    LL_APPEND(tunnels_to_delete, tunnel_list_entry);
+}
+
 /* bootstrap to dht with bootstrap_nodes */
 /* From uTox/tox.c */
 static void do_bootstrap(Tox *tox)
@@ -342,7 +358,7 @@ int send_frame(protocol_frame *frame, uint8_t *data)
 
     if(i > 0 && rv >= 0)
     {
-        log_printf(L_DEBUG, "Packet succeeded at try %d\n", try);
+        log_printf(L_DEBUG, "Packet succeeded at try %d (friend %d tunnel %d)\n", try, frame->friendnumber, frame->connid);
     }
 
     return rv;
@@ -533,7 +549,8 @@ int handle_client_tcp_fin_frame(protocol_frame *rcvd_frame)
         return -1;
     }
     
-    tunnel_delete(tun);
+    log_printf(L_DEBUG2, "Deleting tunnel #%d (%p) in handle_client_tcp_fin_frame(), socket %d", rcvd_frame->connid, tun, tun->sockfd);
+    tunnel_queue_delete(tun);
 
     return 0;
 }
@@ -920,8 +937,8 @@ int do_server_loop()
         int select_rv = 0;
         sent_data = 0;
 
-        /* Let tox do its stuff */
-        tox_iterate(tox, NULL);
+        /* Let tox do its stuff */
+        tox_iterate(tox, NULL);
 
         /* Get the desired sleep time, used in select() later */
         tox_do_interval_ms = tox_iteration_interval(tox);
@@ -947,8 +964,8 @@ int do_server_loop()
 
         fds = master_server_fds;
 
-        /* Poll for data from our client connection */
-        select_rv = select(select_nfds, &fds, NULL, NULL, &tv);
+        /* Poll for data from our client connection */
+        select_rv = select(select_nfds, &fds, NULL, NULL, &tv);
         if(select_rv == -1 || select_rv == 0)
         {
             if(select_rv == -1)
@@ -963,8 +980,14 @@ int do_server_loop()
         }
         else
         {
+            tunnel_list *tunnel_list_entry = NULL, *list_tmp = NULL;
+            tmp = NULL;
+            tun = NULL;
+
+            log_printf(L_DEBUG, "Starting tunnel iteration...");
             HASH_ITER(hh, by_id, tun, tmp)
             {
+                log_printf(L_DEBUG, "Current tunnel: %p", tun);
                 if(FD_ISSET(tun->sockfd, &fds))
                 {
                     int nbytes = recv(tun->sockfd, 
@@ -996,7 +1019,7 @@ int do_server_loop()
                         send_frame(frame, data);
                         sent_data = 1;
 
-                        tunnel_delete(tun);
+                        tunnel_queue_delete(tun);
                                             
                         continue;
                     }
@@ -1015,6 +1038,14 @@ int do_server_loop()
                     }
                 }
             }
+            log_printf(L_DEBUG, "Tunnel iteration done");
+
+            LL_FOREACH_SAFE(tunnels_to_delete, tunnel_list_entry, list_tmp)
+            {
+                tunnel_delete(tunnel_list_entry->tun);
+                LL_DELETE(tunnels_to_delete, tunnel_list_entry);
+                free(tunnel_list_entry);
+            }
         }
 
         gettimeofday(&tv_end, NULL);
@@ -1218,7 +1249,7 @@ int main(int argc, char *argv[])
 
     log_init();
 
-    while ((oc = getopt(argc, argv, "L:pi:C:s:f:P:dqhSF:DU:t:u:")) != -1)
+    while ((oc = getopt(argc, argv, "L:pi:C:s:f:W:dqhSF:DU:t:u:")) != -1)
     {
         switch(oc)
         {
diff --git a/main.h b/main.h
index 106525f..90f393e 100644
--- a/main.h
+++ b/main.h
@@ -57,6 +57,11 @@ typedef struct tunnel_t {
         UT_hash_handle hh;
 } tunnel;
 
+typedef struct tunnel_list_t {
+    tunnel *tun;
+    struct tunnel_list_t *next;
+} tunnel_list;
+
 typedef struct allowed_toxid {
         uint8_t toxid[TOX_ADDRESS_SIZE];
         struct allowed_toxid *next;
diff --git a/tox_bootstrap.h b/tox_bootstrap.h
index 0f8d142..88f0fc9 100644
--- a/tox_bootstrap.h
+++ b/tox_bootstrap.h
@@ -1,7 +1,7 @@
 
 /*
  * Generated with generate_tox_bootstrap.py by GDR!
- * from https://nodes.tox.chat/json on 2017-10-20 22:00:19.930069
+ * from https://nodes.tox.chat/json on 2017-10-28 14:39:07.047671
  */
 struct bootstrap_node {
     char *address;
@@ -235,7 +235,7 @@ struct bootstrap_node {
     },
 
     {
-        "61.230.160.183",
+        "61.230.173.150",
         33445,
         {
             0x3F, 0x0A, 0x45, 0xA2, 0x68, 0x36, 0x7C, 0x1B, 0xEA, 0x65, 0x2F, 0x25, 0x8C, 0x85, 0xF4, 0xA6,
@@ -298,15 +298,6 @@ struct bootstrap_node {
     },
 
     {
-        "85.21.144.224",
-        33445,
-        {
-            0x8F, 0x73, 0x8B, 0xBC, 0x8F, 0xA9, 0x39, 0x46, 0x70, 0xBC, 0xAB, 0x14, 0x6C, 0x67, 0xA5, 0x07,
-            0xB9, 0x90, 0x7C, 0x8E, 0x56, 0x4E, 0x28, 0xC2, 0xB5, 0x9B, 0xEB, 0xB2, 0xFF, 0x68, 0x71, 0x1B
-        }
-    },
-
-    {
         "104.207.131.136",
         33445,
         {
@@ -343,6 +334,15 @@ struct bootstrap_node {
     },
 
     {
+        "95.215.46.114",
+        33445,
+        {
+            0x58, 0x23, 0xFB, 0x94, 0x7F, 0xF2, 0x4C, 0xF8, 0x3D, 0xDF, 0xAC, 0x3F, 0x3B, 0xAA, 0x18, 0xF9,
+            0x6E, 0xA2, 0x01, 0x8B, 0x16, 0xCC, 0x08, 0x42, 0x9C, 0xB9, 0x7F, 0xA5, 0x02, 0xF4, 0x0C, 0x23
+        }
+    },
+
+    {
         "23.101.75.197",
         33445,
         {
@@ -446,7 +446,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "198.46.138.44",
-        3389,
+        33445,
         {
             0xF4, 0x04, 0xAB, 0xAA, 0x1C, 0x99, 0xA9, 0xD3, 0x7D, 0x61, 0xAB, 0x54, 0x89, 0x8F, 0x56, 0x79,
             0x3E, 0x1D, 0xEF, 0x8B, 0xD4, 0x6B, 0x10, 0x38, 0xB9, 0xD8, 0x22, 0xE8, 0x46, 0x0F, 0xAB, 0x67
@@ -455,7 +455,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "198.46.138.44",
-        33445,
+        3389,
         {
             0xF4, 0x04, 0xAB, 0xAA, 0x1C, 0x99, 0xA9, 0xD3, 0x7D, 0x61, 0xAB, 0x54, 0x89, 0x8F, 0x56, 0x79,
             0x3E, 0x1D, 0xEF, 0x8B, 0xD4, 0x6B, 0x10, 0x38, 0xB9, 0xD8, 0x22, 0xE8, 0x46, 0x0F, 0xAB, 0x67
@@ -509,7 +509,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "198.98.51.198",
-        3389,
+        33445,
         {
             0x1D, 0x5A, 0x5F, 0x2F, 0x5D, 0x62, 0x33, 0x05, 0x8B, 0xF0, 0x25, 0x9B, 0x09, 0x62, 0x2F, 0xB4,
             0x0B, 0x48, 0x2E, 0x4F, 0xA0, 0x93, 0x1E, 0xB8, 0xFD, 0x3A, 0xB8, 0xE7, 0xBF, 0x7D, 0xAF, 0x6F
@@ -518,7 +518,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "198.98.51.198",
-        33445,
+        3389,
         {
             0x1D, 0x5A, 0x5F, 0x2F, 0x5D, 0x62, 0x33, 0x05, 0x8B, 0xF0, 0x25, 0x9B, 0x09, 0x62, 0x2F, 0xB4,
             0x0B, 0x48, 0x2E, 0x4F, 0xA0, 0x93, 0x1E, 0xB8, 0xFD, 0x3A, 0xB8, 0xE7, 0xBF, 0x7D, 0xAF, 0x6F
@@ -536,7 +536,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "194.249.212.109",
-        33445,
+        3389,
         {
             0x3C, 0xEE, 0x1F, 0x05, 0x40, 0x81, 0xE7, 0xA0, 0x11, 0x23, 0x48, 0x83, 0xBC, 0x4F, 0xC3, 0x9F,
             0x66, 0x1A, 0x55, 0xB7, 0x36, 0x37, 0xA5, 0xAC, 0x29, 0x3D, 0xDF, 0x12, 0x51, 0xD9, 0x43, 0x2B
@@ -545,7 +545,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "194.249.212.109",
-        3389,
+        33445,
         {
             0x3C, 0xEE, 0x1F, 0x05, 0x40, 0x81, 0xE7, 0xA0, 0x11, 0x23, 0x48, 0x83, 0xBC, 0x4F, 0xC3, 0x9F,
             0x66, 0x1A, 0x55, 0xB7, 0x36, 0x37, 0xA5, 0xAC, 0x29, 0x3D, 0xDF, 0x12, 0x51, 0xD9, 0x43, 0x2B
@@ -554,7 +554,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.25.116.107",
-        33445,
+        3389,
         {
             0xDA, 0x4E, 0x4E, 0xD4, 0xB6, 0x97, 0xF2, 0xE9, 0xB0, 0x00, 0xEE, 0xFE, 0x3A, 0x34, 0xB5, 0x54,
             0xAC, 0xD3, 0xF4, 0x5F, 0x5C, 0x96, 0xEA, 0xEA, 0x25, 0x16, 0xDD, 0x7F, 0xF9, 0xAF, 0x7B, 0x43
@@ -563,7 +563,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.25.116.107",
-        3389,
+        33445,
         {
             0xDA, 0x4E, 0x4E, 0xD4, 0xB6, 0x97, 0xF2, 0xE9, 0xB0, 0x00, 0xEE, 0xFE, 0x3A, 0x34, 0xB5, 0x54,
             0xAC, 0xD3, 0xF4, 0x5F, 0x5C, 0x96, 0xEA, 0xEA, 0x25, 0x16, 0xDD, 0x7F, 0xF9, 0xAF, 0x7B, 0x43
@@ -572,7 +572,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.189.176.217",
-        33445,
+        5190,
         {
             0x2B, 0x21, 0x37, 0xE0, 0x94, 0xF7, 0x43, 0xAC, 0x8B, 0xD4, 0x46, 0x52, 0xC5, 0x5F, 0x41, 0xDF,
             0xAC, 0xC5, 0x02, 0xF1, 0x25, 0xE9, 0x9E, 0x4F, 0xE2, 0x4D, 0x40, 0x53, 0x74, 0x89, 0xE3, 0x2F
@@ -590,7 +590,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.189.176.217",
-        5190,
+        33445,
         {
             0x2B, 0x21, 0x37, 0xE0, 0x94, 0xF7, 0x43, 0xAC, 0x8B, 0xD4, 0x46, 0x52, 0xC5, 0x5F, 0x41, 0xDF,
             0xAC, 0xC5, 0x02, 0xF1, 0x25, 0xE9, 0x9E, 0x4F, 0xE2, 0x4D, 0x40, 0x53, 0x74, 0x89, 0xE3, 0x2F
@@ -599,7 +599,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "217.182.143.254",
-        443,
+        33445,
         {
             0x7A, 0xED, 0x21, 0xF9, 0x4D, 0x82, 0xB0, 0x57, 0x74, 0xF6, 0x97, 0xB2, 0x09, 0x62, 0x8C, 0xD5,
             0xA9, 0xAD, 0x17, 0xE0, 0xC0, 0x73, 0xD9, 0x32, 0x90, 0x76, 0xA4, 0xC2, 0x8E, 0xD2, 0x81, 0x47
@@ -617,7 +617,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "217.182.143.254",
-        33445,
+        443,
         {
             0x7A, 0xED, 0x21, 0xF9, 0x4D, 0x82, 0xB0, 0x57, 0x74, 0xF6, 0x97, 0xB2, 0x09, 0x62, 0x8C, 0xD5,
             0xA9, 0xAD, 0x17, 0xE0, 0xC0, 0x73, 0xD9, 0x32, 0x90, 0x76, 0xA4, 0xC2, 0x8E, 0xD2, 0x81, 0x47
@@ -644,7 +644,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "138.201.117.204",
-        33445,
+        3389,
         {
             0x1C, 0x52, 0x93, 0xAE, 0xF2, 0x11, 0x47, 0x17, 0x54, 0x7B, 0x39, 0xDA, 0x8E, 0xA6, 0xF1, 0xE3,
             0x31, 0xE5, 0xE3, 0x58, 0xB3, 0x5F, 0x9B, 0x6B, 0x5F, 0x19, 0x31, 0x79, 0x11, 0xC5, 0xF9, 0x76
@@ -653,7 +653,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "138.201.117.204",
-        3389,
+        33445,
         {
             0x1C, 0x52, 0x93, 0xAE, 0xF2, 0x11, 0x47, 0x17, 0x54, 0x7B, 0x39, 0xDA, 0x8E, 0xA6, 0xF1, 0xE3,
             0x31, 0xE5, 0xE3, 0x58, 0xB3, 0x5F, 0x9B, 0x6B, 0x5F, 0x19, 0x31, 0x79, 0x11, 0xC5, 0xF9, 0x76
@@ -671,7 +671,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "51.254.84.212",
-        33445,
+        3389,
         {
             0xAE, 0xC2, 0x04, 0xB9, 0xA4, 0x50, 0x14, 0x12, 0xD5, 0xF0, 0xBB, 0x67, 0xD9, 0xC8, 0x1B, 0x5D,
             0xB3, 0xEE, 0x6A, 0xDA, 0x64, 0x12, 0x2D, 0x32, 0xA3, 0xE9, 0xB0, 0x93, 0xD5, 0x44, 0x32, 0x7D
@@ -680,7 +680,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "51.254.84.212",
-        3389,
+        33445,
         {
             0xAE, 0xC2, 0x04, 0xB9, 0xA4, 0x50, 0x14, 0x12, 0xD5, 0xF0, 0xBB, 0x67, 0xD9, 0xC8, 0x1B, 0x5D,
             0xB3, 0xEE, 0x6A, 0xDA, 0x64, 0x12, 0x2D, 0x32, 0xA3, 0xE9, 0xB0, 0x93, 0xD5, 0x44, 0x32, 0x7D
@@ -689,7 +689,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "88.99.133.52",
-        3389,
+        33445,
         {
             0x2D, 0x32, 0x0F, 0x97, 0x1E, 0xF2, 0xCA, 0x18, 0x00, 0x44, 0x16, 0xC2, 0xAA, 0xE7, 0xBA, 0x52,
             0xBF, 0x79, 0x49, 0xDB, 0x34, 0xEA, 0x8E, 0x2E, 0x21, 0xAF, 0x67, 0xBD, 0x36, 0x7B, 0xE2, 0x11
@@ -698,7 +698,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "88.99.133.52",
-        33445,
+        3389,
         {
             0x2D, 0x32, 0x0F, 0x97, 0x1E, 0xF2, 0xCA, 0x18, 0x00, 0x44, 0x16, 0xC2, 0xAA, 0xE7, 0xBA, 0x52,
             0xBF, 0x79, 0x49, 0xDB, 0x34, 0xEA, 0x8E, 0x2E, 0x21, 0xAF, 0x67, 0xBD, 0x36, 0x7B, 0xE2, 0x11
@@ -734,7 +734,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "174.127.245.27",
-        3389,
+        33445,
         {
             0x1A, 0x56, 0xEA, 0x3E, 0xDF, 0x5D, 0xF4, 0xC0, 0xAE, 0xAB, 0xBF, 0x3C, 0x2E, 0x4E, 0x60, 0x38,
             0x90, 0xF8, 0x7E, 0x98, 0x3C, 0xAC, 0x8A, 0x0D, 0x53, 0x2A, 0x33, 0x5F, 0x2C, 0x6E, 0x3E, 0x1F
@@ -743,7 +743,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "174.127.245.27",
-        33445,
+        3389,
         {
             0x1A, 0x56, 0xEA, 0x3E, 0xDF, 0x5D, 0xF4, 0xC0, 0xAE, 0xAB, 0xBF, 0x3C, 0x2E, 0x4E, 0x60, 0x38,
             0x90, 0xF8, 0x7E, 0x98, 0x3C, 0xAC, 0x8A, 0x0D, 0x53, 0x2A, 0x33, 0x5F, 0x2C, 0x6E, 0x3E, 0x1F
@@ -788,7 +788,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "163.172.136.118",
-        3389,
+        33445,
         {
             0x2C, 0x28, 0x9F, 0x9F, 0x37, 0xC2, 0x0D, 0x09, 0xDA, 0x83, 0x56, 0x55, 0x88, 0xBF, 0x49, 0x6F,
             0xAB, 0x37, 0x64, 0x85, 0x3F, 0xA3, 0x81, 0x41, 0x81, 0x7A, 0x72, 0xE3, 0xF1, 0x8A, 0xCA, 0x0B
@@ -797,7 +797,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "163.172.136.118",
-        33445,
+        3389,
         {
             0x2C, 0x28, 0x9F, 0x9F, 0x37, 0xC2, 0x0D, 0x09, 0xDA, 0x83, 0x56, 0x55, 0x88, 0xBF, 0x49, 0x6F,
             0xAB, 0x37, 0x64, 0x85, 0x3F, 0xA3, 0x81, 0x41, 0x81, 0x7A, 0x72, 0xE3, 0xF1, 0x8A, 0xCA, 0x0B
@@ -806,7 +806,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "144.76.31.180",
-        3389,
+        33445,
         {
             0x02, 0x80, 0x7C, 0xF4, 0xF8, 0xBB, 0x8F, 0xB3, 0x90, 0xCC, 0x37, 0x94, 0xBD, 0xF1, 0xE8, 0x44,
             0x9E, 0x9A, 0x83, 0x92, 0xC5, 0xD3, 0xF2, 0x20, 0x00, 0x19, 0xDA, 0x9F, 0x1E, 0x81, 0x2E, 0x46
@@ -815,7 +815,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "144.76.31.180",
-        33445,
+        3389,
         {
             0x02, 0x80, 0x7C, 0xF4, 0xF8, 0xBB, 0x8F, 0xB3, 0x90, 0xCC, 0x37, 0x94, 0xBD, 0xF1, 0xE8, 0x44,
             0x9E, 0x9A, 0x83, 0x92, 0xC5, 0xD3, 0xF2, 0x20, 0x00, 0x19, 0xDA, 0x9F, 0x1E, 0x81, 0x2E, 0x46
@@ -833,7 +833,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "80.87.193.193",
-        33445,
+        3389,
         {
             0xB3, 0x82, 0x55, 0xEE, 0x4B, 0x05, 0x49, 0x24, 0xF6, 0xD7, 0x9A, 0x5E, 0x6E, 0x58, 0x89, 0xEC,
             0x94, 0xB6, 0xAD, 0xF6, 0xFE, 0x99, 0x06, 0xF9, 0x7A, 0x3D, 0x01, 0xE3, 0xD0, 0x83, 0x22, 0x3A
@@ -842,7 +842,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "80.87.193.193",
-        3389,
+        33445,
         {
             0xB3, 0x82, 0x55, 0xEE, 0x4B, 0x05, 0x49, 0x24, 0xF6, 0xD7, 0x9A, 0x5E, 0x6E, 0x58, 0x89, 0xEC,
             0x94, 0xB6, 0xAD, 0xF6, 0xFE, 0x99, 0x06, 0xF9, 0x7A, 0x3D, 0x01, 0xE3, 0xD0, 0x83, 0x22, 0x3A
@@ -850,7 +850,7 @@ struct bootstrap_node tcp_relays[] = {
     },
 
     {
-        "61.230.160.183",
+        "61.230.173.150",
         33445,
         {
             0x3F, 0x0A, 0x45, 0xA2, 0x68, 0x36, 0x7C, 0x1B, 0xEA, 0x65, 0x2F, 0x25, 0x8C, 0x85, 0xF4, 0xA6,
@@ -859,7 +859,7 @@ struct bootstrap_node tcp_relays[] = {
     },
 
     {
-        "61.230.160.183",
+        "61.230.173.150",
         3389,
         {
             0x3F, 0x0A, 0x45, 0xA2, 0x68, 0x36, 0x7C, 0x1B, 0xEA, 0x65, 0x2F, 0x25, 0x8C, 0x85, 0xF4, 0xA6,
@@ -914,7 +914,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "144.217.86.39",
-        3389,
+        33445,
         {
             0x7E, 0x56, 0x68, 0xE0, 0xEE, 0x09, 0xE1, 0x9F, 0x32, 0x0A, 0xD4, 0x79, 0x02, 0x41, 0x93, 0x31,
             0xFF, 0xEE, 0x14, 0x7B, 0xB3, 0x60, 0x67, 0x69, 0xCF, 0xBE, 0x92, 0x1A, 0x2A, 0x2F, 0xD3, 0x4C
@@ -923,7 +923,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "144.217.86.39",
-        33445,
+        3389,
         {
             0x7E, 0x56, 0x68, 0xE0, 0xEE, 0x09, 0xE1, 0x9F, 0x32, 0x0A, 0xD4, 0x79, 0x02, 0x41, 0x93, 0x31,
             0xFF, 0xEE, 0x14, 0x7B, 0xB3, 0x60, 0x67, 0x69, 0xCF, 0xBE, 0x92, 0x1A, 0x2A, 0x2F, 0xD3, 0x4C
@@ -932,7 +932,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.14.30.213",
-        443,
+        33445,
         {
             0x25, 0x55, 0x76, 0x3C, 0x8C, 0x46, 0x04, 0x95, 0xB1, 0x41, 0x57, 0xD2, 0x34, 0xDD, 0x56, 0xB8,
             0x63, 0x00, 0xA2, 0x39, 0x55, 0x54, 0xBC, 0xAE, 0x46, 0x21, 0xAC, 0x34, 0x5B, 0x8C, 0x1B, 0x1B
@@ -941,7 +941,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "185.14.30.213",
-        33445,
+        443,
         {
             0x25, 0x55, 0x76, 0x3C, 0x8C, 0x46, 0x04, 0x95, 0xB1, 0x41, 0x57, 0xD2, 0x34, 0xDD, 0x56, 0xB8,
             0x63, 0x00, 0xA2, 0x39, 0x55, 0x54, 0xBC, 0xAE, 0x46, 0x21, 0xAC, 0x34, 0x5B, 0x8C, 0x1B, 0x1B
@@ -958,24 +958,6 @@ struct bootstrap_node tcp_relays[] = {
     },
 
     {
-        "85.21.144.224",
-        3389,
-        {
-            0x8F, 0x73, 0x8B, 0xBC, 0x8F, 0xA9, 0x39, 0x46, 0x70, 0xBC, 0xAB, 0x14, 0x6C, 0x67, 0xA5, 0x07,
-            0xB9, 0x90, 0x7C, 0x8E, 0x56, 0x4E, 0x28, 0xC2, 0xB5, 0x9B, 0xEB, 0xB2, 0xFF, 0x68, 0x71, 0x1B
-        }
-    },
-
-    {
-        "85.21.144.224",
-        33445,
-        {
-            0x8F, 0x73, 0x8B, 0xBC, 0x8F, 0xA9, 0x39, 0x46, 0x70, 0xBC, 0xAB, 0x14, 0x6C, 0x67, 0xA5, 0x07,
-            0xB9, 0x90, 0x7C, 0x8E, 0x56, 0x4E, 0x28, 0xC2, 0xB5, 0x9B, 0xEB, 0xB2, 0xFF, 0x68, 0x71, 0x1B
-        }
-    },
-
-    {
         "104.207.131.136",
         33445,
         {
@@ -986,7 +968,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "37.187.122.30",
-        33445,
+        3389,
         {
             0xBE, 0xB7, 0x1F, 0x97, 0xED, 0x9C, 0x99, 0xC0, 0x4B, 0x84, 0x89, 0xBB, 0x75, 0x57, 0x9E, 0xB4,
             0xDC, 0x6A, 0xB6, 0xF4, 0x41, 0xB6, 0x03, 0xD6, 0x35, 0x33, 0x12, 0x2F, 0x18, 0x58, 0xB5, 0x1D
@@ -995,7 +977,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "37.187.122.30",
-        3389,
+        33445,
         {
             0xBE, 0xB7, 0x1F, 0x97, 0xED, 0x9C, 0x99, 0xC0, 0x4B, 0x84, 0x89, 0xBB, 0x75, 0x57, 0x9E, 0xB4,
             0xDC, 0x6A, 0xB6, 0xF4, 0x41, 0xB6, 0x03, 0xD6, 0x35, 0x33, 0x12, 0x2F, 0x18, 0x58, 0xB5, 0x1D
@@ -1004,7 +986,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "136.243.141.187",
-        33445,
+        443,
         {
             0x6E, 0xE1, 0xFA, 0xDE, 0x9F, 0x55, 0xCC, 0x79, 0x38, 0x23, 0x4C, 0xC0, 0x7C, 0x86, 0x40, 0x81,
             0xFC, 0x60, 0x6D, 0x8F, 0xE7, 0xB7, 0x51, 0xED, 0xA2, 0x17, 0xF2, 0x68, 0xF1, 0x07, 0x8A, 0x39
@@ -1013,7 +995,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "136.243.141.187",
-        3389,
+        33445,
         {
             0x6E, 0xE1, 0xFA, 0xDE, 0x9F, 0x55, 0xCC, 0x79, 0x38, 0x23, 0x4C, 0xC0, 0x7C, 0x86, 0x40, 0x81,
             0xFC, 0x60, 0x6D, 0x8F, 0xE7, 0xB7, 0x51, 0xED, 0xA2, 0x17, 0xF2, 0x68, 0xF1, 0x07, 0x8A, 0x39
@@ -1022,7 +1004,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "136.243.141.187",
-        443,
+        3389,
         {
             0x6E, 0xE1, 0xFA, 0xDE, 0x9F, 0x55, 0xCC, 0x79, 0x38, 0x23, 0x4C, 0xC0, 0x7C, 0x86, 0x40, 0x81,
             0xFC, 0x60, 0x6D, 0x8F, 0xE7, 0xB7, 0x51, 0xED, 0xA2, 0x17, 0xF2, 0x68, 0xF1, 0x07, 0x8A, 0x39
@@ -1039,6 +1021,24 @@ struct bootstrap_node tcp_relays[] = {
     },
 
     {
+        "95.215.46.114",
+        3389,
+        {
+            0x58, 0x23, 0xFB, 0x94, 0x7F, 0xF2, 0x4C, 0xF8, 0x3D, 0xDF, 0xAC, 0x3F, 0x3B, 0xAA, 0x18, 0xF9,
+            0x6E, 0xA2, 0x01, 0x8B, 0x16, 0xCC, 0x08, 0x42, 0x9C, 0xB9, 0x7F, 0xA5, 0x02, 0xF4, 0x0C, 0x23
+        }
+    },
+
+    {
+        "95.215.46.114",
+        33445,
+        {
+            0x58, 0x23, 0xFB, 0x94, 0x7F, 0xF2, 0x4C, 0xF8, 0x3D, 0xDF, 0xAC, 0x3F, 0x3B, 0xAA, 0x18, 0xF9,
+            0x6E, 0xA2, 0x01, 0x8B, 0x16, 0xCC, 0x08, 0x42, 0x9C, 0xB9, 0x7F, 0xA5, 0x02, 0xF4, 0x0C, 0x23
+        }
+    },
+
+    {
         "23.101.75.197",
         33445,
         {
@@ -1103,7 +1103,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.79.75.37",
-        33445,
+        3389,
         {
             0xD5, 0x27, 0xE5, 0x84, 0x7F, 0x83, 0x30, 0xD6, 0x28, 0xDA, 0xB1, 0x81, 0x4F, 0x0A, 0x42, 0x2F,
             0x6D, 0xC9, 0xD0, 0xA3, 0x00, 0xE6, 0xC3, 0x57, 0x63, 0x4E, 0xE2, 0xDA, 0x88, 0xC3, 0x54, 0x63
@@ -1112,7 +1112,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "5.79.75.37",
-        3389,
+        33445,
         {
             0xD5, 0x27, 0xE5, 0x84, 0x7F, 0x83, 0x30, 0xD6, 0x28, 0xDA, 0xB1, 0x81, 0x4F, 0x0A, 0x42, 0x2F,
             0x6D, 0xC9, 0xD0, 0xA3, 0x00, 0xE6, 0xC3, 0x57, 0x63, 0x4E, 0xE2, 0xDA, 0x88, 0xC3, 0x54, 0x63
@@ -1175,7 +1175,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "46.101.197.175",
-        3389,
+        33445,
         {
             0xCD, 0x13, 0x3B, 0x52, 0x11, 0x59, 0x54, 0x1F, 0xB1, 0xD3, 0x26, 0xDE, 0x98, 0x50, 0xF5, 0xE5,
             0x6A, 0x6C, 0x72, 0x4B, 0x5B, 0x8E, 0x5E, 0xB5, 0xCD, 0x8D, 0x95, 0x04, 0x08, 0xE9, 0x57, 0x07
@@ -1184,7 +1184,7 @@ struct bootstrap_node tcp_relays[] = {
 
     {
         "46.101.197.175",
-        33445,
+        3389,
         {
             0xCD, 0x13, 0x3B, 0x52, 0x11, 0x59, 0x54, 0x1F, 0xB1, 0xD3, 0x26, 0xDE, 0x98, 0x50, 0xF5, 0xE5,
             0x6A, 0x6C, 0x72, 0x4B, 0x5B, 0x8E, 0x5E, 0xB5, 0xCD, 0x8D, 0x95, 0x04, 0x08, 0xE9, 0x57, 0x07