Skip to content

Commit

Permalink
allow the large custom NGC packets to be handled also by the client
Browse files Browse the repository at this point in the history
  • Loading branch information
zoff99 committed Jan 9, 2024
1 parent 05ce5c1 commit d747c15
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
18 changes: 17 additions & 1 deletion toxcore/group_chats.c
Original file line number Diff line number Diff line change
Expand Up @@ -4993,6 +4993,22 @@ static bool custom_gc_packet_length_is_valid(uint16_t length, bool lossless)
return true;
}

/** @brief Returns false if a custom incoming (non private) packet is too large. */
static bool custom_gc_incoming_non_private_packet_length_is_valid(uint16_t length, bool lossless)
{
if (lossless) {
if (length > MAX_GC_CUSTOM_LOSSLESS_INCOMING_ASSEMBLED_PACKET_SIZE) {
return false;
}
} else {
if (length > MAX_GC_CUSTOM_LOSSY_PACKET_SIZE) {
return false;
}
}

return true;
}

int gc_send_custom_private_packet(const GC_Chat *chat, bool lossless, uint32_t peer_id, const uint8_t *message,
uint16_t length)
{
Expand Down Expand Up @@ -5089,7 +5105,7 @@ 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)) {
if (!custom_gc_incoming_non_private_packet_length_is_valid(length, lossless)) {
return -1;
}

Expand Down
6 changes: 6 additions & 0 deletions toxcore/group_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 that are non private to be up to the total max size of MAX_GC_PACKET_SIZE
* which is 50000 bytes. 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

Expand Down

0 comments on commit d747c15

Please sign in to comment.