From 2ac8d26687e8c197d350b2ffd78203586bf3fb53 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Mon, 29 Jul 2019 20:58:01 +0200 Subject: [PATCH] Added a new property --- server/src/client/ConnectedClientCommandHandler.cpp | 1 + server/src/client/voice/VoiceClientConnection.cpp | 4 ++-- shared | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/client/ConnectedClientCommandHandler.cpp b/server/src/client/ConnectedClientCommandHandler.cpp index f0e5bde..3fbe1bb 100644 --- a/server/src/client/ConnectedClientCommandHandler.cpp +++ b/server/src/client/ConnectedClientCommandHandler.cpp @@ -499,6 +499,7 @@ CommandResult ConnectedClient::handleCommandServerEdit(Command &cmd) { SERVEREDIT_CHK_PROP_CACHED("virtualserver_default_client_description", permission::b_virtualserver_modify_default_messages, string) } SERVEREDIT_CHK_PROP_CACHED("virtualserver_default_channel_description", permission::b_virtualserver_modify_default_messages, string) } SERVEREDIT_CHK_PROP_CACHED("virtualserver_default_channel_topic", permission::b_virtualserver_modify_default_messages, string) } + SERVEREDIT_CHK_PROP_CACHED("virtualserver_country_code", permission::b_virtualserver_modify_country_code, string) } SERVEREDIT_CHK_PROP2("virtualserver_max_download_total_bandwidth", permission::b_virtualserver_modify_ft_settings, uint64_t, int64_t) if(cmd["virtualserver_max_download_total_bandwidth"].string().find('-') == string::npos) toApplay["virtualserver_max_download_total_bandwidth"] = to_string((int64_t) cmd["virtualserver_max_download_total_bandwidth"].as()); diff --git a/server/src/client/voice/VoiceClientConnection.cpp b/server/src/client/voice/VoiceClientConnection.cpp index 987381f..b24fd85 100644 --- a/server/src/client/voice/VoiceClientConnection.cpp +++ b/server/src/client/voice/VoiceClientConnection.cpp @@ -228,7 +228,7 @@ void VoiceClientConnection::handleDatagramReceived(const pipes::buffer_view& buf } else { //TODO: Needs rethinking because read_queue.push_back increases the index, but this has not to be the packet id if(!read_queue.push_back(move(packet))) { - debugMessage(this->client->getServerId(), "{} Got unordered packet of type {} which is out of the buffer range of {}. Packet ID: {}. Dropping packet.", + debugMessage(this->client->getServerId(), "{} Got unordered packet of type {} which is out of the buffer capacity of {}. Packet ID: {}. Dropping packet.", CLIENT_STR_LOG_PREFIX_(this->client), packet_type.name(), read_queue.capacity(), @@ -237,7 +237,7 @@ void VoiceClientConnection::handleDatagramReceived(const pipes::buffer_view& buf ); } { - //A max entropie of 16 packets should not happen. This indicates more that 16 or more packets got lost + //A max entropy of 16 packets should not happen. This indicates more that 16 or more packets got lost auto current_index = read_queue.current_index(); if(current_index + 16 < packet_id) read_queue.set_full_index_to(packet_id); diff --git a/shared b/shared index 290b915..c8cae59 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 290b915074eb27e33901a0a7bd6808220a6e60eb +Subproject commit c8cae593a016b842031b5f73e103554a4f87cb66