From 052cdfc6a5a8cd4dc2ec99d4b7df967d80fb8cf7 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Sat, 1 Aug 2020 09:43:18 -0700 Subject: [PATCH] changes to OnDvHeaderPacketIn for dextra and ysf --- src/cdextraprotocol.cpp | 4 +++- src/cysfpayload.h | 1 + src/cysfprotocol.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/cdextraprotocol.cpp b/src/cdextraprotocol.cpp index b5fedea..3ad0232 100644 --- a/src/cdextraprotocol.cpp +++ b/src/cdextraprotocol.cpp @@ -423,7 +423,9 @@ void CDextraProtocol::OnDvHeaderPacketIn(std::unique_ptr &Heade { // update Header RPT2 module letter with // the module the client is linked to - Header->SetRpt2Module(client->GetReflectorModule()); + auto m = client->GetReflectorModule(); + Header->SetRpt2Module(m); + rpt2.SetModule(m); } // and try to open the stream if ( (stream = g_Reflector.OpenStream(Header, client)) != nullptr ) diff --git a/src/cysfpayload.h b/src/cysfpayload.h index 3e45e6d..831343b 100644 --- a/src/cysfpayload.h +++ b/src/cysfpayload.h @@ -26,6 +26,7 @@ class CYSFPayload { public: + CYSFPayload() : m_uplink(nullptr), m_downlink(nullptr), m_source(nullptr), m_dest(nullptr) {} bool processHeaderData(unsigned char* bytes); void writeVDMode2Data(unsigned char* data, const unsigned char* dt); diff --git a/src/cysfprotocol.cpp b/src/cysfprotocol.cpp index c974fea..be37cc6 100644 --- a/src/cysfprotocol.cpp +++ b/src/cysfprotocol.cpp @@ -245,9 +245,11 @@ void CYsfProtocol::OnDvHeaderPacketIn(std::unique_ptr &Header, if ( client ) { // get client callsign - rpt2 = client->GetCallsign(); + rpt1 = client->GetCallsign(); // get module it's linked to - Header->SetRpt2Module(client->GetReflectorModule()); + auto m = client->GetReflectorModule(); + Header->SetRpt2Module(m); + rpt2.SetModule(m); // and try to open the stream if ( (stream = g_Reflector.OpenStream(Header, client)) != nullptr )