From f45807a0f2f9cbb165c5e0fbf5f804476af250d0 Mon Sep 17 00:00:00 2001 From: jfreegman Date: Tue, 14 Dec 2021 13:03:14 -0500 Subject: [PATCH] merge onion.c changes from new groupchats fork --- toxcore/onion.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/toxcore/onion.c b/toxcore/onion.c index 758015b8..5ddcc38a 100644 --- a/toxcore/onion.c +++ b/toxcore/onion.c @@ -466,8 +466,9 @@ static int handle_send_2(void *object, IP_Port source, const uint8_t *packet, ui return 1; } - if (plain[SIZE_IPPORT] != NET_PACKET_ANNOUNCE_REQUEST && - plain[SIZE_IPPORT] != NET_PACKET_ONION_DATA_REQUEST) { + const uint8_t packet_id = plain[SIZE_IPPORT]; + + if (packet_id != NET_PACKET_ANNOUNCE_REQUEST && packet_id != NET_PACKET_ONION_DATA_REQUEST) { return 1; } @@ -514,8 +515,9 @@ static int handle_recv_3(void *object, IP_Port source, const uint8_t *packet, ui return 1; } - if (packet[1 + RETURN_3] != NET_PACKET_ANNOUNCE_RESPONSE && - packet[1 + RETURN_3] != NET_PACKET_ONION_DATA_RESPONSE) { + const uint8_t packet_id = packet[1 + RETURN_3]; + + if (packet_id != NET_PACKET_ANNOUNCE_RESPONSE && packet_id != NET_PACKET_ONION_DATA_RESPONSE) { return 1; } @@ -560,8 +562,9 @@ static int handle_recv_2(void *object, IP_Port source, const uint8_t *packet, ui return 1; } - if (packet[1 + RETURN_2] != NET_PACKET_ANNOUNCE_RESPONSE && - packet[1 + RETURN_2] != NET_PACKET_ONION_DATA_RESPONSE) { + const uint8_t packet_id = packet[1 + RETURN_2]; + + if (packet_id != NET_PACKET_ANNOUNCE_RESPONSE && packet_id != NET_PACKET_ONION_DATA_RESPONSE) { return 1; } @@ -606,8 +609,9 @@ static int handle_recv_1(void *object, IP_Port source, const uint8_t *packet, ui return 1; } - if (packet[1 + RETURN_1] != NET_PACKET_ANNOUNCE_RESPONSE && - packet[1 + RETURN_1] != NET_PACKET_ONION_DATA_RESPONSE) { + const uint8_t packet_id = packet[1 + RETURN_1]; + + if (packet_id != NET_PACKET_ANNOUNCE_RESPONSE && packet_id != NET_PACKET_ONION_DATA_RESPONSE) { return 1; }