TeaSpeak/TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.4.10' into 1.4.10

Browse Source
This commit is contained in:
WolverinDEV 2021-02-07 18:05:09 +01:00
commit 261a237291
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -121,6 +121,13 @@ set(SOURCE_FILES
src/protocol/buffers_allocator_c.cpp src/protocol/buffers_allocator_c.cpp
src/protocol/CryptHandler.cpp src/protocol/CryptHandler.cpp
src/protocol/CompressionHandler.cpp src/protocol/CompressionHandler.cpp
src/protocol/ringbuffer.cpp
src/protocol/AcknowledgeManager.cpp
src/protocol/PacketLossCalculator.cpp
src/protocol/RawCommand.cpp
src/protocol/PacketDecoder.cpp
src/protocol/PingHandler.cpp
src/protocol/PacketStatistics.cpp
src/Properties.cpp src/Properties.cpp
src/Error.cpp src/Error.cpp
@ -134,13 +141,6 @@ set(SOURCE_FILES
src/bbcode/bbcodes.cpp src/bbcode/bbcodes.cpp
src/channel/TreeView.cpp src/channel/TreeView.cpp
src/protocol/ringbuffer.cpp
src/protocol/AcknowledgeManager.cpp
src/protocol/PacketLossCalculator.cpp
src/protocol/RawCommand.cpp
src/protocol/PacketDecoder.cpp
src/protocol/PingHandler.cpp
src/protocol/PacketStatistics.cpp
) )
set(HEADER_FILES set(HEADER_FILES
@ -189,6 +189,7 @@ endif()
if(FEATURE_LOGGING) if(FEATURE_LOGGING)
set(SOURCE_FILES ${SOURCE_FILES} src/misc/memtracker.cpp) set(SOURCE_FILES ${SOURCE_FILES} src/misc/memtracker.cpp)
set(HEADER_FILES ${HEADER_FILES} src/misc/memtracker.h) set(HEADER_FILES ${HEADER_FILES} src/misc/memtracker.h)
add_definitions(-DFEATURE_MEMTRACK)
else() else()
message("Missing logging support. Don't build mem tracker") message("Missing logging support. Don't build mem tracker")
endif() endif()

2
src/misc/memtracker.h
View File

@ -5,7 +5,7 @@
namespace memtrack { namespace memtrack {
#define TRACK_OBJECT_ALLOCATION #define TRACK_OBJECT_ALLOCATION
#ifdef TRACK_OBJECT_ALLOCATION #if defined(FEATURE_MEMTRACK) && defined(TRACK_OBJECT_ALLOCATION)
extern void allocated(const char* name, void* address); extern void allocated(const char* name, void* address);
extern void freed(const char* name, void* address); extern void freed(const char* name, void* address);
template <typename T> template <typename T>

4
src/protocol/PacketDecoder.h
View File

@ -12,10 +12,6 @@ namespace ts::connection {
class CryptHandler; class CryptHandler;
} }
namespace ts::stats {
class ConnectionStatistics;
}
namespace ts::protocol { namespace ts::protocol {
enum struct PacketProcessResult { enum struct PacketProcessResult {
SUCCESS, SUCCESS,

4
src/protocol/RawCommand.h
View File

@ -21,7 +21,11 @@ namespace ts::command {
CommandFragment(const CommandFragment& other) = default; CommandFragment(const CommandFragment& other) = default;
CommandFragment(CommandFragment&&) = default; CommandFragment(CommandFragment&&) = default;
}; };
/* Windows aligns stuff somewhat different */
#ifndef WIN32
static_assert(sizeof(CommandFragment) == 8 + sizeof(pipes::buffer)); static_assert(sizeof(CommandFragment) == 8 + sizeof(pipes::buffer));
#endif
struct ReassembledCommand { struct ReassembledCommand {
public: public: