feat: allow the large custom NGC packets to be handled also by the cl…

…ient
TokTok · Jan 24, 2024 · 80ac793 · 80ac793
1 parent 6370d0f
commit 80ac793
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@@ -1 +1 @@
-9190d56ef3b346bc1632e6d7ee5fe5362be661bff58f2d6d88b5c1d1827394cd  /usr/local/bin/tox-bootstrapd
+cbc0080745e6606a0267be2e39cf56366010512be7e8167afe0dfad176441c7a  /usr/local/bin/tox-bootstrapd
diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c
@@ -5118,8 +5118,14 @@ non_null(1, 2, 3, 4) nullable(7)
 static int handle_gc_custom_packet(const GC_Session *c, const GC_Chat *chat, const GC_Peer *peer, const uint8_t *data,
                                    uint16_t length, bool lossless, void *userdata)
 {
-    if (!custom_gc_packet_length_is_valid(length, lossless)) {
-        return -1;
+    if (lossless) {
+        if (length > MAX_GC_CUSTOM_LOSSLESS_INCOMING_ASSEMBLED_PACKET_SIZE) {
+            return -1;
+        }
+    } else {
+        if (length > MAX_GC_CUSTOM_LOSSY_PACKET_SIZE) {
+            return -1;
+        }
     }
 
     if (data == nullptr || length == 0) {

diff --git a/toxcore/group_common.h b/toxcore/group_common.h
@@ -45,6 +45,12 @@
 /* Max size of a complete encrypted packet including headers. */
 #define MAX_GC_PACKET_SIZE (MAX_GC_PACKET_CHUNK_SIZE * 100)
 
+/* Allow incoming NGC custom packets to be up to the total max size of MAX_GC_PACKET_SIZE.
+ * The data itself can only be less than that because of NGC header overhead
+ */
+#define MAX_GC_CUSTOM_LOSSLESS_INCOMING_ASSEMBLED_PACKET_SIZE MAX_GC_PACKET_SIZE
+
+
 /* Max number of messages to store in the send/recv arrays */
 #define GCC_BUFFER_SIZE 8192