From f2f05479dc08854e9211d9888dda90b265f812b2 Mon Sep 17 00:00:00 2001 From: KimLS Date: Tue, 28 Jan 2025 14:43:09 -0800 Subject: [PATCH] Change streams type --- common/net/daybreak_connection.cpp | 10 ++++++++++ common/net/daybreak_connection.h | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp index f2ab79787..f1a55cfbb 100644 --- a/common/net/daybreak_connection.cpp +++ b/common/net/daybreak_connection.cpp @@ -337,10 +337,20 @@ EQ::Net::DaybreakConnection::DaybreakConnection(DaybreakConnectionManager *owner m_combined[1] = OP_Combined; m_last_session_stats = Clock::now(); m_outgoing_budget = owner->m_options.outgoing_data_rate; + m_streams = new DaybreakStream*[4]; + m_streams[0] = nullptr; + m_streams[1] = nullptr; + m_streams[2] = nullptr; + m_streams[3] = nullptr; } EQ::Net::DaybreakConnection::~DaybreakConnection() { + for (int i = 0; i < 4; ++i) { + if (m_streams[i] != nullptr) { + delete m_streams[i]; + } + } } void EQ::Net::DaybreakConnection::Close() diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h index bff61a8bb..a93b9bad4 100644 --- a/common/net/daybreak_connection.h +++ b/common/net/daybreak_connection.h @@ -190,15 +190,16 @@ namespace EQ size_t resend_delay; }; - struct DaybreakStream + class DaybreakStream { + public: DaybreakStream() { sequence_in = 0; sequence_out = 0; fragment_current_bytes = 0; fragment_total_bytes = 0; } - + //private: uint16_t sequence_in; uint16_t sequence_out; std::map packet_queue; @@ -210,7 +211,7 @@ namespace EQ std::map sent_packets; }; - DaybreakStream* m_streams[4]; + DaybreakStream** m_streams; std::weak_ptr m_self; void Process();