ShaYmez
/
xlxd
mirror of https://github.com/ShaYmez/xlxd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #194 from narspt/patch-9 

allow connecting dextra clients to listen already streaming clients
This commit is contained in:
LX3JL 2021-07-06 09:17:22 +02:00 committed by GitHub
parent 2c7fae6c9f e6a5c7aed1
commit 52457403d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cdextraprotocol.cpp
View File

@ -118,6 +118,27 @@ void CDextraProtocol::Task(void)
// acknowledge the request
EncodeConnectAckPacket(&Buffer, ProtRev);
m_Socket.Send(Buffer, Ip);
// check if any client currently streaming on the module
CClients *clients = g_Reflector.GetClients();
for ( int i = 0; i < clients->GetSize(); i++ )
{
if ( clients->GetClient(i)->IsAMaster() && (clients->GetClient(i)->GetReflectorModule() == ToLinkModule) )
{
// found a client streaming on the module, encode a copy of the cached header packet
CBuffer buffer2;
if ( EncodeDvPacket(m_StreamsCache[g_Reflector.GetModuleIndex(ToLinkModule)].m_dvHeader, &buffer2) )
{
// and send it to the connecting client, so it can listen the already streaming client
for ( int j = 0; j < 5; j++ )
{
m_Socket.Send(buffer2, Ip);
}
}
break; // done, stop here
}
}
g_Reflector.ReleaseClients();
// create the client
CDextraClient *client = new CDextraClient(Callsign, Ip, ToLinkModule, ProtRev);
@ -216,6 +237,16 @@ void CDextraProtocol::HandleQueue(void)
CPacket *packet = m_Queue.front();
m_Queue.pop();
// get our sender's id
int iModId = g_Reflector.GetModuleIndex(packet->GetModuleId());
// check if it's header and update cache
if ( packet->IsDvHeader() )
{
// this relies on queue feeder setting valid module id
m_StreamsCache[iModId].m_dvHeader = CDvHeaderPacket((const CDvHeaderPacket &)*packet);
}
// encode it
CBuffer buffer;
if ( EncodeDvPacket(*packet, &buffer) )

12
src/cdextraprotocol.h
View File

@ -55,6 +55,15 @@
////////////////////////////////////////////////////////////////////////////////////////
// class
class CDextraStreamCacheItem
{
public:
CDextraStreamCacheItem() {}
~CDextraStreamCacheItem() {}
CDvHeaderPacket m_dvHeader;
};
class CDextraProtocol : public CProtocol
{
public:
@ -101,6 +110,9 @@ protected:
protected:
// time
CTimePoint m_LastKeepaliveTime;
// for queue header caches
std::array<CDextraStreamCacheItem, NB_OF_MODULES> m_StreamsCache;
};
////////////////////////////////////////////////////////////////////////////////////////