From d1e850c56c71d6b592a6b28d9319b59d3ed5cc1d Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 22 Nov 2023 23:58:07 +0000 Subject: [PATCH] fix: Add missing `htons` call when adding configured TCP relay. --- auto_tests/dht_getnodes_api_test.c | 2 +- other/bootstrap_daemon/docker/tox-bootstrapd.sha256 | 2 +- toxcore/Messenger.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/auto_tests/dht_getnodes_api_test.c b/auto_tests/dht_getnodes_api_test.c index d98e9f7d..3b54f1cc 100644 --- a/auto_tests/dht_getnodes_api_test.c +++ b/auto_tests/dht_getnodes_api_test.c @@ -123,7 +123,7 @@ static void test_dht_getnodes(AutoTox *autotoxes) tox_self_get_dht_id(autotoxes[i].tox, public_key_list[i]); tox_callback_dht_get_nodes_response(autotoxes[i].tox, getnodes_response_cb); - printf("Peer %zu dht closenode count total/annouce-capable: %d/%d\n", + printf("Peer %zu dht closenode count total/announce-capable: %d/%d\n", i, tox_dht_get_num_closelist(autotoxes[i].tox), tox_dht_get_num_closelist_announce_capable(autotoxes[i].tox) diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 index 8d607165..f2128277 100644 --- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 +++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 @@ -1 +1 @@ -05c389460de83d58533a658d0df625600bc3e6940bbcc738db9dddee249fac59 /usr/local/bin/tox-bootstrapd +1608abb52cd16775216d01d06569e6437d86ed11e9fc8dc6dc9c1c28668ccd8b /usr/local/bin/tox-bootstrapd diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c index 136838d1..8ee9842b 100644 --- a/toxcore/Messenger.c +++ b/toxcore/Messenger.c @@ -2627,7 +2627,7 @@ void do_messenger(Messenger *m, void *userdata) if (m->tcp_server != nullptr) { /* Add self tcp server. */ IP_Port local_ip_port; - local_ip_port.port = m->options.tcp_server_port; + local_ip_port.port = net_htons(m->options.tcp_server_port); local_ip_port.ip.family = net_family_ipv4(); local_ip_port.ip.ip.v4 = get_ip4_loopback(); add_tcp_relay(m->net_crypto, &local_ip_port, tcp_server_public_key(m->tcp_server));