add 2 nodes when list is empty

git-svn-id: http://svn.miranda-ng.org/main/trunk@12114 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 16 insertions, 131 deletions

diff --git a/protocols/Tox/Tox_12.vcxproj b/protocols/Tox/Tox_12.vcxproj
index b36a9cfdb1..9c9acb5b39 100644
--- a/protocols/Tox/Tox_12.vcxproj
+++ b/protocols/Tox/Tox_12.vcxproj
@@ -203,7 +203,6 @@
     <ClInclude Include="src\common.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\tox_address.h" />

-    <ClInclude Include="src\tox_bootstrap.h" />

     <ClInclude Include="src\tox_dns.h" />

     <ClInclude Include="src\tox_proto.h" />

     <ClInclude Include="src\tox_transfer.h" />

diff --git a/protocols/Tox/Tox_12.vcxproj.filters b/protocols/Tox/Tox_12.vcxproj.filters
index 6af6a29155..18bc3e9a83 100644
--- a/protocols/Tox/Tox_12.vcxproj.filters
+++ b/protocols/Tox/Tox_12.vcxproj.filters
@@ -30,9 +30,6 @@
     <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\tox_bootstrap.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\tox_dns.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/protocols/Tox/src/tox_account.cpp b/protocols/Tox/src/tox_account.cpp
index 9195cace09..08124f9238 100644
--- a/protocols/Tox/src/tox_account.cpp
+++ b/protocols/Tox/src/tox_account.cpp
@@ -1,5 +1,4 @@
 #include "common.h"

-#include "tox_bootstrap.h"

 

 bool CToxProto::IsOnline()

 {

@@ -139,6 +138,22 @@ void CToxProto::UninitToxCore()
 void CToxProto::DoBootstrap()

 {

 	int NodeCount = db_get_b(NULL, "TOX", "NodeCount", 0);

+	if (!NodeCount) {

+		db_set_ts(NULL, "TOX", "Node_1_IPv4", _T("192.254.75.102"));

+		db_set_ts(NULL, "TOX", "Node_1_IPv6", _T("2607:5600:284::2"));

+		db_set_ts(NULL, "TOX", "Node_1_ClientID", _T("951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F"));

+		db_set_dw(NULL, "TOX", "Node_1_Port", 33445);

+

+		db_set_ts(NULL, "TOX", "Node_2_IPv4", _T("104.219.184.206"));

+		db_set_ts(NULL, "TOX", "Node_2_IPv6", _T("-"));

+		db_set_ts(NULL, "TOX", "Node_2_ClientID", _T("8CD087E31C67568103E8C2A28653337E90E6B8EDA0D765D57C6B5172B4F1F04C"));

+		db_set_dw(NULL, "TOX", "Node_2_Port", 443);

+

+		db_set_b(NULL, "TOX", "NodeCount", 2);

+		NodeCount = 2;

+

+	}

+

 	for (int i = 0; i < NodeCount; i++) {

 		char buff[MAX_PATH];

 		mir_snprintf(buff, SIZEOF(buff), "Node_%d_IPv4", i + 1);

diff --git a/protocols/Tox/src/tox_bootstrap.h b/protocols/Tox/src/tox_bootstrap.h
deleted file mode 100644
index 7bffdc4c86..0000000000
--- a/protocols/Tox/src/tox_bootstrap.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef _TOX_BOOTSTRAP_H_

-#define _TOX_BOOTSTRAP_H_

-

-struct bootstrap_node {

-	char *address;

-	uint16_t port;

-	uint8_t key[32];

-} bootstrap_nodes[] = {

-	{

-		"192.254.75.98",

-		33445,

-		{

-			0x95, 0x1C, 0x88, 0xB7, 0xE7, 0x5C, 0x86, 0x74, 0x18, 0xAC, 0xDB, 0x5D, 0x27, 0x38, 0x21, 0x37,

-			0x2B, 0xB5, 0xBD, 0x65, 0x27, 0x40, 0xBC, 0xDF, 0x62, 0x3A, 0x4F, 0xA2, 0x93, 0xE7, 0x5D, 0x2F

-		}

-	},

-

-	{

-		"31.7.57.236",

-		443,

-		{

-			0x95, 0x1C, 0x88, 0xB7, 0xE7, 0x5C, 0x86, 0x74, 0x18, 0xAC, 0xDB, 0x5D, 0x27, 0x38, 0x21, 0x37,

-			0x2B, 0xB5, 0xBD, 0x65, 0x27, 0x40, 0xBC, 0xDF, 0x62, 0x3A, 0x4F, 0xA2, 0x93, 0xE7, 0x5D, 0x2F

-		}

-	},

-

-	{

-		"107.161.17.51",

-		33445,

-		{

-			0x7B, 0xE3, 0x95, 0x1B, 0x97, 0xCA, 0x4B, 0x9E, 0xCD, 0xDA, 0x76, 0x8E, 0x8C, 0x52, 0xBA, 0x19,

-			0xE9, 0xE2, 0x69, 0x0A, 0xB5, 0x84, 0x78, 0x7B, 0xF4, 0xC9, 0x0E, 0x04, 0xDB, 0xB7, 0x51, 0x11

-		}

-	},

-

-	{

-		"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

-		}

-	},

-

-	{

-		"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

-		}

-	},

-

-	{

-		"37.59.102.176",

-		33445,

-		{

-			0xB9, 0x8A, 0x2C, 0xEA, 0xA6, 0xC6, 0xA2, 0xFA, 0xDC, 0x2C, 0x36, 0x32, 0xD2, 0x84, 0x31, 0x8B,

-			0x60, 0xFE, 0x53, 0x75, 0xCC, 0xB4, 0x1E, 0xFA, 0x08, 0x1A, 0xB6, 0x7F, 0x50, 0x0C, 0x1B, 0x0B

-		}

-	},

-

-	{

-		"37.187.46.132",

-		33445,

-		{

-			0x2A, 0x4B, 0x50, 0xD1, 0xD5, 0x25, 0xDA, 0x2E, 0x66, 0x95, 0x92, 0xA2, 0x0C, 0x32, 0x7B, 0x5F,

-			0xAD, 0x6C, 0x7E, 0x59, 0x62, 0xDC, 0x69, 0x29, 0x6F, 0x9F, 0xEC, 0x77, 0xC4, 0x43, 0x6E, 0x4E

-		}

-	},

-

-	{

-		"178.21.112.187",

-		33445,

-		{

-			0x4B, 0x2C, 0x19, 0xE9, 0x24, 0x97, 0x2C, 0xB9, 0xB5, 0x77, 0x32, 0xFB, 0x17, 0x2F, 0x8A, 0x86,

-			0x04, 0xDE, 0x13, 0xEE, 0xDA, 0x2A, 0x62, 0x34, 0xE3, 0x48, 0x98, 0x33, 0x44, 0xB2, 0x30, 0x57

-		}

-	},

-

-	{

-		"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

-		}

-	},

-

-	{

-		"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

-		}

-	},

-

-	{

-		"63.165.243.15",

-		443,

-		{

-			0x8C, 0xD0, 0x87, 0xE3, 0x1C, 0x67, 0x56, 0x81, 0x03, 0xE8, 0xC2, 0xA2, 0x86, 0x53, 0x33, 0x7E,

-			0x90, 0xE6, 0xB8, 0xED, 0xA0, 0xD7, 0x65, 0xD5, 0x7C, 0x6B, 0x51, 0x72, 0xB4, 0xF1, 0xF0, 0x4C

-		}

-	},

-

-	{

-		"195.154.119.113",

-		33445,

-		{

-			0xE3, 0x98, 0xA6, 0x96, 0x46, 0xB8, 0xCE, 0xAC, 0xA9, 0xF0, 0xB8, 0x4F, 0x55, 0x37, 0x26, 0xC1,

-			0xC4, 0x92, 0x70, 0x55, 0x8C, 0x57, 0xDF, 0x5F, 0x3C, 0x36, 0x8F, 0x05, 0xA7, 0xD7, 0x13, 0x54

-		}

-	},

-	{

-		"104.219.184.206",

-		443,

-		{

-			0x8C, 0xD0, 0x87, 0xE3, 0x1C, 0x67, 0x56, 0x81, 0x03, 0xE8, 0xC2, 0xA2, 0x86, 0x53, 0x33, 0x7E,

-			0x90, 0xE6, 0xB8, 0xED, 0xA0, 0xD7, 0x65, 0xD5, 0x7C, 0x6B, 0x51, 0x72, 0xB4, 0xF1, 0xF0, 0x4C

-		}

-	},

-};

-

-#endif //_TOX_BOOTSTRAP_H_
\ No newline at end of file