TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed skip and negate flags

Browse Source
This commit is contained in:
WolverinDEV 2019-07-31 15:15:34 +02:00
parent 76dad7e100
commit 356822a0c5
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/client/ConnectedClientCommandHandler.cpp
View File

@ -1162,8 +1162,8 @@ CommandResult ConnectedClient::handleCommandChannelGroupAddPerm(Command &cmd) {
permission::v2::PermissionUpdateType::set_value, permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing, permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0, cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0 cmd[index]["permnegated"].as<bool>() ? 1 : 0
); );
updateList |= permission_is_group_property(permType); updateList |= permission_is_group_property(permType);
} }
@ -2335,8 +2335,9 @@ CommandResult ConnectedClient::handleCommandChannelAddPerm(Command &cmd) {
permission::v2::PermissionUpdateType::set_value, permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing, permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0 cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permnegated"].as<bool>() ? 1 : 0
); );
updateClients |= permission_is_client_property(permType); updateClients |= permission_is_client_property(permType);
update_view |= permType == permission::i_channel_needed_view_power; update_view |= permType == permission::i_channel_needed_view_power;
@ -2820,8 +2821,8 @@ CommandResult ConnectedClient::handleCommandServerGroupAddPerm(Command &cmd) {
permission::v2::PermissionUpdateType::set_value, permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing, permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0, cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0 cmd[index]["permnegated"].as<bool>() ? 1 : 0
); );
sgroupUpdate |= permission_is_group_property(permType); sgroupUpdate |= permission_is_group_property(permType);
checkTp |= permission_is_client_property(permType); checkTp |= permission_is_client_property(permType);
@ -2978,8 +2979,8 @@ CommandResult ConnectedClient::handleCommandServerGroupAutoAddPerm(ts::Command&
permission::v2::PermissionUpdateType::set_value, permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing, permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0, cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0 cmd[index]["permnegated"].as<bool>() ? 1 : 0
); );
} }
} }
@ -6456,7 +6457,7 @@ CommandResult ConnectedClient::handleCommandPlaylistAddPerm(ts::Command &cmd) {
playlist->permissions()->setPermissionGranted(permType, cmd[index]["permvalue"], nullptr); playlist->permissions()->setPermissionGranted(permType, cmd[index]["permvalue"], nullptr);
} else { } else {
playlist->permissions()->setPermission(permType, cmd[index]["permvalue"], nullptr, cmd[index]["permnegated"], cmd[index]["permskip"]); playlist->permissions()->setPermission(permType, cmd[index]["permvalue"], nullptr, cmd[index]["permskip"], cmd[index]["permnegated"]);
} }
} }

2
server/src/client/voice/VoiceClientConnection.cpp
View File

@ -228,7 +228,7 @@ void VoiceClientConnection::handleDatagramReceived(const pipes::buffer_view& buf
} else { } else {
//TODO: Needs rethinking because read_queue.push_back increases the index, but this has not to be the packet id //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))) { 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), CLIENT_STR_LOG_PREFIX_(this->client),
packet_type.name(), packet_type.name(),
read_queue.capacity(), read_queue.capacity(),

2
shared

@ -1 +1 @@
Subproject commit a0cca36eca11da410626a340dbe4377067d59c1b Subproject commit c8cae593a016b842031b5f73e103554a4f87cb66