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

Merge branch 'master' into 1.4.0

Browse Source
This commit is contained in:
WolverinDEV 2019-08-01 11:56:50 +02:00
commit f7cb93d768
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/CMakeLists.txt
View File

@ -3,7 +3,7 @@ project(TeaSpeak-Server)
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
#--allow-multiple-definition #--allow-multiple-definition
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wall -Wno-reorder -Wno-sign-compare -static-libgcc -static-libstdc++ -g -Wl,-no-whole-archive -pthread ${MEMORY_DEBUG_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wall -Wno-reorder -Wno-sign-compare -static-libgcc -static-libstdc++ -g -Wl,-no-whole-archive,--no-undefined -pthread ${MEMORY_DEBUG_FLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")

2
server/src/client/ConnectedClientNotifyHandler.cpp
View File

@ -99,7 +99,7 @@ bool ConnectedClient::notifyGroupPermList(const std::shared_ptr<Group>& group, b
} else { } else {
cmd[index]["permid"] = (uint16_t) (type->type | PERM_ID_GRANT); cmd[index]["permid"] = (uint16_t) (type->type | PERM_ID_GRANT);
} }
cmd[index]["permvalue"] = permission.values.value; cmd[index]["permvalue"] = permission.values.grant;
cmd[index]["permnegated"] = permission.flags.negate; cmd[index]["permnegated"] = permission.flags.negate;
cmd[index]["permskip"] = permission.flags.skip; cmd[index]["permskip"] = permission.flags.skip;
index++; index++;

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

@ -352,7 +352,9 @@ unique_ptr<protocol::ClientPacket> VoiceClientConnection::next_reassembled_packe
} }
if(current_packet->type() != PacketTypeInfo::Command && current_packet->type() != PacketTypeInfo::CommandLow) { if(current_packet->type() != PacketTypeInfo::Command && current_packet->type() != PacketTypeInfo::CommandLow) {
return buffer->pop_front(); /* we don't have to reassemble anything */ auto tmp = buffer->pop_front(); /* we don't have to reassemble anything */
more |= buffer->front_set(); /* set the more flag if we know that we have more of this packet */
return tmp;
} }
unique_ptr<ClientPacket> final_packet; unique_ptr<ClientPacket> final_packet;
@ -435,6 +437,7 @@ unique_ptr<protocol::ClientPacket> VoiceClientConnection::next_reassembled_packe
} }
} }
more |= buffer->front_set(); /* set the more flag if we have more to process */
buffer_lock.unlock(); buffer_lock.unlock();
std::string error = "success"; std::string error = "success";

2
server/src/server/VoiceServer.cpp
View File

@ -519,7 +519,7 @@ void VoiceServer::handleMessageWrite(int fd, short events, void *_event_handle)
voice_client->socket, voice_client->socket,
event_handle->socket_id, event_handle->socket_id,
voice_server->io->resolve_file_descriptor(voice_client), voice_server->io->resolve_file_descriptor(voice_client),
voice_client->isAddressV4() ? "v4" : voice_client->isAddressV4() ? "v6" : "v?", voice_client->isAddressV4() ? "v4" : voice_client->isAddressV6() ? "v6" : "v?",
event_handle->family == AF_INET ? "v4" : "v6" event_handle->family == AF_INET ? "v4" : "v6"
); );
} else { } else {