Update nodelist

2 files changed, 51 insertions, 53 deletions

diff --git a/config.def.h b/config.def.h
index 242cc34..68ebb3f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -2,67 +2,63 @@
 
 static struct node nodes[] = {
 	{
-		"95.85.13.245",
-		33445,
-		{
-			0x71, 0x87, 0x96, 0x9B, 0xB1, 0x0B, 0x54, 0xC9, 0x85, 0x38, 0xBA, 0xE9, 0x4C, 0x06, 0x9C, 0xE5,
-			0xC8, 0x4E, 0x65, 0x0D, 0x54, 0xF7, 0xE5, 0x96, 0x54, 0x3D, 0x8F, 0xB1, 0xEC, 0xF4, 0xCF, 0x23
-		}
+		.addr = "192.254.75.98",
+		.port = 33445,
+		.idstr = "951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F"
 	},
 	{
-		"37.187.46.132",
-		33445,
-		{
-			0xA9, 0xD9, 0x82, 0x12, 0xB3, 0xF9, 0x72, 0xBD, 0x11, 0xDA, 0x52, 0xBE, 0xB0, 0x65, 0x8C, 0x32,
-			0x6F, 0xCC, 0xC1, 0xBF, 0xD4, 0x9F, 0x34, 0x7F, 0x9C, 0x2D, 0x3D, 0x8B, 0x61, 0xE1, 0xB9, 0x27
-		}
+		.addr = "31.7.57.236",
+		.port = 443,
+		.idstr = "2A4B50D1D525DA2E669592A20C327B5FAD6C7E5962DC69296F9FEC77C4436E4E"
 	},
 	{
-		"144.76.60.215",
-		33445,
-		{
-			0x04, 0x11, 0x9E, 0x83, 0x5D, 0xF3, 0xE7, 0x8B, 0xAC, 0xF0, 0xF8, 0x42, 0x35, 0xB3, 0x00, 0x54,
-			0x6A, 0xF8, 0xB9, 0x36, 0xF0, 0x35, 0x18, 0x5E, 0x2A, 0x8E, 0x9E, 0x0A, 0x67, 0xC8, 0x92, 0x4F
-		}
+		.addr = "107.161.17.51",
+		.port = 33445,
+		.idstr = "7BE3951B97CA4B9ECDDA768E8C52BA19E9E2690AB584787BF4C90E04DBB75111"
 	},
 	{
-		"23.226.230.47",
-		33445,
-		{
-			0xA0, 0x91, 0x62, 0xD6, 0x86, 0x18, 0xE7, 0x42, 0xFF, 0xBC, 0xA1, 0xC2, 0xC7, 0x03, 0x85, 0xE6,
-			0x67, 0x96, 0x04, 0xB2, 0xD8, 0x0E, 0xA6, 0xE8, 0x4A, 0xD0, 0x99, 0x6A, 0x1A, 0xC8, 0xA0, 0x74
-		}
+		.addr = "144.76.60.215",
+		.port = 33445,
+		.idstr = "04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F",
 	},
 	{
-		"54.199.139.199",
-		33445,
-		{
-			0x7F, 0x9C, 0x31, 0xFE, 0x85, 0x0E, 0x97, 0xCE, 0xFD, 0x4C, 0x45, 0x91, 0xDF, 0x93, 0xFC, 0x75,
-			0x7C, 0x7C, 0x12, 0x54, 0x9D, 0xDD, 0x55, 0xF8, 0xEE, 0xAE, 0xCC, 0x34, 0xFE, 0x76, 0xC0, 0x29
-		}
+		.addr = "23.226.230.47",
+		.port = 33445,
+		.idstr = "A09162D68618E742FFBCA1C2C70385E6679604B2D80EA6E84AD0996A1AC8A074"
 	},
 	{
-		"109.169.46.133",
-		33445,
-		{
-			0x7F, 0x31, 0xBF, 0xC9, 0x3B, 0x8E, 0x40, 0x16, 0xA9, 0x02, 0x14, 0x4D, 0x0B, 0x11, 0x0C, 0x3E,
-			0xA9, 0x7C, 0xB7, 0xD4, 0x3F, 0x1C, 0x4D, 0x21, 0xBC, 0xAE, 0x99, 0x8A, 0x7C, 0x83, 0x88, 0x21
-		}
+		.addr = "37.59.102.176",
+		.port = 33445,
+		.idstr = "B98A2CEAA6C6A2FADC2C3632D284318B60FE5375CCB41EFA081AB67F500C1B0B"
 	},
 	{
-		"192.210.149.121",
-		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
-		}
+		.addr = "37.187.46.132",
+		.port = 33445,
+		.idstr = "5EB67C51D3FF5A9D528D242B669036ED2A30F8A60E674C45E7D43010CB2E1331"
 	},
 	{
-		"76.191.23.96",
-		33445,
-		{
-			0x4B, 0xA5, 0x76, 0x60, 0xDE, 0x3E, 0x85, 0x4C, 0x53, 0x0E, 0xED, 0x60, 0x1B, 0xF8, 0xD5, 0x4B,
-			0x7E, 0xFA, 0xE9, 0x60, 0x52, 0x3B, 0x6C, 0xFC, 0x10, 0x21, 0x0C, 0xC0, 0x8E, 0x2C, 0xB8, 0x08
-		}
+		.addr = "178.21.112.187",
+		.port = 33445,
+		.idstr = "4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057"
 	},
+	{
+		.addr = "192.210.149.121",
+		.port = 33445,
+		.idstr = "F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67",
+	},
+	{
+		.addr = "54.199.139.199",
+		.port = 33445,
+		.idstr = "7F9C31FE850E97CEFD4C4591DF93FC757C7C12549DDD55F8EEAECC34FE76C029"
+	},
+	{
+		.addr = "63.165.243.15",
+		.port = 443,
+		.idstr = "8CD087E31C67568103E8C2A28653337E90E6B8EDA0D765D57C6B5172B4F1F04C"
+	},
+	{
+		.addr = "195.154.119.113",
+		.port = 33445,
+		.idstr = "E398A69646B8CEACA9F0B84F553726C1C49270558C57DF5F3C368F05A7D71354"
+	}
 };
diff --git a/ratox.c b/ratox.c
index 27cd6f9..84f2291 100644
--- a/ratox.c
+++ b/ratox.c
@@ -37,9 +37,9 @@ const char *reqerr[] = {
 };
 
 struct node {
-	const char *addr;
+	char *addr;
 	uint16_t port;
-	uint8_t key[TOX_CLIENT_ID_SIZE];
+	char *idstr;
 };
 
 #include "config.h"
@@ -736,12 +736,14 @@ toxinit(void)
 static int
 toxconnect(void)
 {
-	struct node *bn;
+	struct node *n;
+	uint8_t id[TOX_CLIENT_ID_SIZE];
 	size_t i;
 
 	for (i = 0; i < LEN(nodes); i++) {
-		bn = &nodes[i];
-		tox_bootstrap_from_address(tox, bn->addr, bn->port, bn->key);
+		n = &nodes[i];
+		str2id(n->idstr, id);
+		tox_bootstrap_from_address(tox, n->addr, n->port, id);
 	}
 	return 0;
 }