Skip to content

Commit

Permalink
set correct settings for connection via tor proxy. have confirmed aga…
Browse files Browse the repository at this point in the history 
…in with toxcore devs that this is actually correct. this should fix no connecting when using tor for that first time
  • Loading branch information
@zoff99
zoff99 committed Jan 3, 2024
1 parent 6c9ea62 commit 0744ba5
Showing 1 changed file with 27 additions and 102 deletions.
129 changes: 27 additions & 102 deletions src/main/kotlin/com/zoffcc/applications/trifa/TrifaToxService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,46 +705,39 @@ class TrifaToxService
get_udp_nodelist_from_db(orma)
Log.i(TAG, "bootstrap_node_list[sort]=" + bootstrap_node_list.toString())

if (PREF__udp_enabled == 1)
try
{
try
{
Collections.shuffle(bootstrap_node_list)
Collections.shuffle(bootstrap_node_list)
} catch (e: java.lang.Exception)
{
e.printStackTrace()
}
Log.i(TAG, "bootstrap_node_list[rand]=" + bootstrap_node_list.toString())
try
Collections.shuffle(bootstrap_node_list)
Collections.shuffle(bootstrap_node_list)
} catch (e: java.lang.Exception)
{
e.printStackTrace()
}
Log.i(TAG, "bootstrap_node_list[rand]=" + bootstrap_node_list.toString())
try
{
val i2: Iterator<*> = bootstrap_node_list.iterator()
var ee: BootstrapNodeEntryDB
var used = 0
while (i2.hasNext())
{
val i2: Iterator<*> = bootstrap_node_list.iterator()
var ee: BootstrapNodeEntryDB
var used = 0
while (i2.hasNext())
ee = i2.next() as BootstrapNodeEntryDB
val bootstrap_result = bootstrap_single_wrapper(ee.ip, ee.port.toInt(), ee.key_hex)
Log.i(TAG, "bootstrap_single:res=$bootstrap_result")
if (bootstrap_result == 0)
{
ee = i2.next() as BootstrapNodeEntryDB
val bootstrap_result = bootstrap_single_wrapper(ee.ip, ee.port.toInt(), ee.key_hex)
Log.i(TAG, "bootstrap_single:res=$bootstrap_result")
if (bootstrap_result == 0)
{
used++
// Log.Log.i(TAG, "bootstrap_single:++:used=" + used);
}
if (used >= USE_MAX_NUMBER_OF_BOOTSTRAP_NODES)
{
Log.i(TAG, "bootstrap_single:break:used=$used")
break
}
used++
// Log.Log.i(TAG, "bootstrap_single:++:used=" + used);
}
if (used >= USE_MAX_NUMBER_OF_BOOTSTRAP_NODES)
{
Log.i(TAG, "bootstrap_single:break:used=$used")
break
}
} catch (e: java.lang.Exception)
{
e.printStackTrace()
}
}
else
} catch (e: java.lang.Exception)
{
bootstrap_single_wrapper("127.0.0.1", 7766, "2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1")
e.printStackTrace()
}
// ----- UDP ------
//
Expand Down Expand Up @@ -795,74 +788,6 @@ class TrifaToxService
bootstrapping = false
}

fun bootstrap_me__obsolete()
{
Log.i(TAG, "bootstrap_me") // ----- UDP ------
if (PREF__udp_enabled == 1)
{
bootstrap_single_wrapper("144.217.167.73",33445,"7E5668E0EE09E19F320AD47902419331FFEE147BB3606769CFBE921A2A2FD34C")
bootstrap_single_wrapper("tox.abilinski.com",33445,"10C00EB250C3233E343E2AEBA07115A5C28920E9C8D29492F6D00B29049EDC7E")
bootstrap_single_wrapper("198.199.98.108",33445,"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F")
bootstrap_single_wrapper("2604:a880:1:20::32f:1001",33445,"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F")
bootstrap_single_wrapper("tox.kurnevsky.net",33445,"82EF82BA33445A1F91A7DB27189ECFC0C013E06E3DA71F588ED692BED625EC23")
bootstrap_single_wrapper("2a03:b0c0:0:1010::4c:5001",33445,"82EF82BA33445A1F91A7DB27189ECFC0C013E06E3DA71F588ED692BED625EC23")
bootstrap_single_wrapper("205.185.115.131",53,"3091C6BEB2A993F1C6300C16549FABA67098FF3D62C6D253828B531470B53D68")
bootstrap_single_wrapper("tox2.abilinski.com",33445,"7A6098B590BDC73F9723FC59F82B3F9085A64D1B213AAF8E610FD351930D052D")
bootstrap_single_wrapper("2604:180:1:4ab::2",33445,"7A6098B590BDC73F9723FC59F82B3F9085A64D1B213AAF8E610FD351930D052D")
bootstrap_single_wrapper("46.101.197.175",33445,"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707")
bootstrap_single_wrapper("2a03:b0c0:3:d0::ac:5001",33445,"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707")
bootstrap_single_wrapper("tox1.mf-net.eu",33445,"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506")
bootstrap_single_wrapper("2a01:4f8:c2c:89f7::1",33445,"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506")
bootstrap_single_wrapper("tox2.mf-net.eu",33445,"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F")
bootstrap_single_wrapper("2001:41d0:8:7a96::1",33445,"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F")
bootstrap_single_wrapper("195.201.7.101",33445,"B84E865125B4EC4C368CD047C72BCE447644A2DC31EF75BD2CDA345BFD310107")
bootstrap_single_wrapper("tox4.plastiras.org",33445,"836D1DA2BE12FE0E669334E437BE3FB02806F1528C2B2782113E0910C7711409")
bootstrap_single_wrapper("188.225.9.167",33445,"1911341A83E02503AB1FD6561BD64AF3A9D6C3F12B5FBB656976B2E678644A67")
bootstrap_single_wrapper("209:dead:ded:4991:49f3:b6c0:9869:3019",33445,"1911341A83E02503AB1FD6561BD64AF3A9D6C3F12B5FBB656976B2E678644A67")
bootstrap_single_wrapper("122.116.39.151",33445,"5716530A10D362867C8E87EE1CD5362A233BAFBBA4CF47FA73B7CAD368BD5E6E")
bootstrap_single_wrapper("2001:b011:8:2f22:1957:7f9d:e31f:96dd",33445,"5716530A10D362867C8E87EE1CD5362A233BAFBBA4CF47FA73B7CAD368BD5E6E")
bootstrap_single_wrapper("tox3.plastiras.org",33445,"4B031C96673B6FF123269FF18F2847E1909A8A04642BBECD0189AC8AEEADAF64")
bootstrap_single_wrapper("2a01:4f8:211:c97::2",33445,"4B031C96673B6FF123269FF18F2847E1909A8A04642BBECD0189AC8AEEADAF64")
bootstrap_single_wrapper("104.225.141.59",43334,"933BA20B2E258B4C0D475B6DECE90C7E827FE83EFA9655414E7841251B19A72C")
bootstrap_single_wrapper("139.162.110.188",33445,"F76A11284547163889DDC89A7738CF271797BF5E5E220643E97AD3C7E7903D55")
bootstrap_single_wrapper("2400:8902::f03c:93ff:fe69:bf77",33445,"F76A11284547163889DDC89A7738CF271797BF5E5E220643E97AD3C7E7903D55")
bootstrap_single_wrapper("198.98.49.206",33445,"28DB44A3CEEE69146469855DFFE5F54DA567F5D65E03EFB1D38BBAEFF2553255")
} else
{
bootstrap_single_wrapper("127.0.0.1", 7766, "2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1")
}
// ----- UDP ------
//
// ----- TCP ------
add_tcp_relay_single_wrapper("144.217.167.73",33445,"7E5668E0EE09E19F320AD47902419331FFEE147BB3606769CFBE921A2A2FD34C")
add_tcp_relay_single_wrapper("144.217.167.73",3389,"7E5668E0EE09E19F320AD47902419331FFEE147BB3606769CFBE921A2A2FD34C")
add_tcp_relay_single_wrapper("tox.abilinski.com",33445,"10C00EB250C3233E343E2AEBA07115A5C28920E9C8D29492F6D00B29049EDC7E")
add_tcp_relay_single_wrapper("198.199.98.108",33445,"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F")
add_tcp_relay_single_wrapper("2604:a880:1:20::32f:1001",33445,"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F")
add_tcp_relay_single_wrapper("198.199.98.108",3389,"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F")
add_tcp_relay_single_wrapper("2604:a880:1:20::32f:1001",3389,"BEF0CFB37AF874BD17B9A8F9FE64C75521DB95A37D33C5BDB00E9CF58659C04F")
add_tcp_relay_single_wrapper("205.185.115.131",443,"3091C6BEB2A993F1C6300C16549FABA67098FF3D62C6D253828B531470B53D68")
add_tcp_relay_single_wrapper("205.185.115.131",3389,"3091C6BEB2A993F1C6300C16549FABA67098FF3D62C6D253828B531470B53D68")
add_tcp_relay_single_wrapper("205.185.115.131",53,"3091C6BEB2A993F1C6300C16549FABA67098FF3D62C6D253828B531470B53D68")
add_tcp_relay_single_wrapper("205.185.115.131",33445,"3091C6BEB2A993F1C6300C16549FABA67098FF3D62C6D253828B531470B53D68")
add_tcp_relay_single_wrapper("tox2.abilinski.com",33445,"7A6098B590BDC73F9723FC59F82B3F9085A64D1B213AAF8E610FD351930D052D")
add_tcp_relay_single_wrapper("2604:180:1:4ab::2",33445,"7A6098B590BDC73F9723FC59F82B3F9085A64D1B213AAF8E610FD351930D052D")
add_tcp_relay_single_wrapper("46.101.197.175",3389,"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707")
add_tcp_relay_single_wrapper("2a03:b0c0:3:d0::ac:5001",3389,"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707")
add_tcp_relay_single_wrapper("46.101.197.175",33445,"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707")
add_tcp_relay_single_wrapper("2a03:b0c0:3:d0::ac:5001",33445,"CD133B521159541FB1D326DE9850F5E56A6C724B5B8E5EB5CD8D950408E95707")
add_tcp_relay_single_wrapper("tox1.mf-net.eu",33445,"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506")
add_tcp_relay_single_wrapper("2a01:4f8:c2c:89f7::1",33445,"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506")
add_tcp_relay_single_wrapper("tox1.mf-net.eu",3389,"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506")
add_tcp_relay_single_wrapper("2a01:4f8:c2c:89f7::1",3389,"B3E5FA80DC8EBD1149AD2AB35ED8B85BD546DEDE261CA593234C619249419506")
add_tcp_relay_single_wrapper("tox2.mf-net.eu",33445,"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F")
add_tcp_relay_single_wrapper("2001:41d0:8:7a96::1",33445,"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F")
add_tcp_relay_single_wrapper("tox2.mf-net.eu",3389,"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F")
add_tcp_relay_single_wrapper("2001:41d0:8:7a96::1",3389,"70EA214FDE161E7432530605213F18F7427DC773E276B3E317A07531F548545F")
add_tcp_relay_single_wrapper("195.201.7.101",33445,"B84E865125B4EC4C368CD047C72BCE447644A2DC31EF75BD2CDA345BFD310107")
// ----- TCP ------
}

// --------------- JNI ---------------
// --------------- JNI ---------------
// --------------- JNI ---------------
Expand Down

0 comments on commit 0744ba5

Please sign in to comment.