From 2725c57f2e8c75a2bd8eae1ff477de3a33241cc9 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 23 Apr 2020 15:36:56 +0200 Subject: [PATCH] 1.4.14 ;) --- src/PermissionManager.cpp | 1 + src/PermissionManager.h | 1 + src/protocol/CompressionHandler.cpp | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PermissionManager.cpp b/src/PermissionManager.cpp index 8df3448..ea4ecd4 100644 --- a/src/PermissionManager.cpp +++ b/src/PermissionManager.cpp @@ -321,6 +321,7 @@ deque> ts::permission::availablePermissions make_shared(PermissionType::i_client_needed_talk_power, PermissionGroup::client_basic, "i_client_needed_talk_power", "Needed client talk power"), make_shared(PermissionType::i_client_poke_power, PermissionGroup::client_basic, "i_client_poke_power", "Client poke power"), make_shared(PermissionType::i_client_needed_poke_power, PermissionGroup::client_basic, "i_client_needed_poke_power", "Needed client poke power"), + make_shared(PermissionType::i_client_poke_max_clients, PermissionGroup::client_basic, "i_client_poke_max_clients", "Max amount of clients which could be poked at once"), make_shared(PermissionType::b_client_set_flag_talker, PermissionGroup::client_basic, "b_client_set_flag_talker", "Set the talker flag for clients and allow them to speak"), make_shared(PermissionType::i_client_whisper_power, PermissionGroup::client_basic, "i_client_whisper_power", "Client whisper power"), make_shared(PermissionType::i_client_needed_whisper_power, PermissionGroup::client_basic, "i_client_needed_whisper_power", "Client needed whisper power"), diff --git a/src/PermissionManager.h b/src/PermissionManager.h index c0ffd74..af66e84 100644 --- a/src/PermissionManager.h +++ b/src/PermissionManager.h @@ -424,6 +424,7 @@ namespace ts { i_client_needed_talk_power, i_client_poke_power, i_client_needed_poke_power, + i_client_poke_max_clients, b_client_set_flag_talker, i_client_whisper_power, i_client_needed_whisper_power, diff --git a/src/protocol/CompressionHandler.cpp b/src/protocol/CompressionHandler.cpp index 321296a..066ce1a 100644 --- a/src/protocol/CompressionHandler.cpp +++ b/src/protocol/CompressionHandler.cpp @@ -81,8 +81,7 @@ namespace ts::compression { size_t qlz_compressed_size(const void* payload, size_t payload_length) { assert(payload_length >= 9); - //// "Always allocate size + 400 bytes for the destination buffer when compressing." <= http://www.quicklz.com/manual.html - return max(min(payload_length * 2, (size_t) (payload_length + 400ULL)), (size_t) 24ULL); /* at least 12 bytes (QLZ header) */ + return payload_length + 400; // http://www.quicklz.com/manual.html } bool qlz_compress_payload(const void* payload, size_t payload_length, void* buffer, size_t* buffer_length) {