From 2ed3b28de69ca51f9390556d9c02b795aa669331 Mon Sep 17 00:00:00 2001 From: LX3JL Date: Mon, 18 Apr 2016 09:59:32 +0200 Subject: [PATCH] xlxd 1.3.6 --- dashboard/img/flags/nie.png | Bin 0 -> 3180 bytes dashboard/pgs/country.csv | 9 +++--- readme | 2 +- src/cdcsprotocol.cpp | 40 ++++++++++++++++-------- src/cdextraprotocol.cpp | 32 +++++++++++++------ src/cdplusprotocol.cpp | 60 ++++++++++++++++++++---------------- src/creflector.h | 2 +- src/cxlxprotocol.cpp | 8 +---- src/main.h | 8 ++--- 9 files changed, 96 insertions(+), 65 deletions(-) create mode 100755 dashboard/img/flags/nie.png mode change 100644 => 100755 dashboard/pgs/country.csv diff --git a/dashboard/img/flags/nie.png b/dashboard/img/flags/nie.png new file mode 100755 index 0000000000000000000000000000000000000000..83c133da724af498765cab6db6e187932d060598 GIT binary patch literal 3180 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 SCO{Ja0000AddClient(client); - g_Reflector.ReleaseClients(); + // valid module ? + if ( g_Reflector.IsValidModule(ToLinkModule) ) + { + // acknowledge the request + EncodeConnectAckPacket(Callsign, ToLinkModule, &Buffer); + m_Socket.Send(Buffer, Ip); + + // create the client + CDcsClient *client = new CDcsClient(Callsign, Ip, ToLinkModule); + + // and append + g_Reflector.GetClients()->AddClient(client); + g_Reflector.ReleaseClients(); + } + else + { + std::cout << "DCS node " << Callsign << " connect attempt on non-existing module" << std::endl; + + // deny the request + EncodeConnectNackPacket(Callsign, ToLinkModule, &Buffer); + m_Socket.Send(Buffer, Ip); + } } else { @@ -149,12 +161,16 @@ void CDcsProtocol::Task(void) { std::cout << "DCS disconnect packet from " << Callsign << " at " << Ip << std::endl; - // find client & remove it + // find client CClients *clients = g_Reflector.GetClients(); CClient *client = clients->FindClient(Ip, PROTOCOL_DCS); if ( client != NULL ) { + // remove it clients->RemoveClient(client); + // and acknowledge the disconnect + EncodeConnectNackPacket(Callsign, ' ', &Buffer); + m_Socket.Send(Buffer, Ip); } g_Reflector.ReleaseClients(); } diff --git a/src/cdextraprotocol.cpp b/src/cdextraprotocol.cpp index 4708603..43c1123 100644 --- a/src/cdextraprotocol.cpp +++ b/src/cdextraprotocol.cpp @@ -112,16 +112,28 @@ void CDextraProtocol::Task(void) // callsign authorized? if ( g_GateKeeper.MayLink(Callsign, Ip, PROTOCOL_DEXTRA) ) { - // acknowledge the request - EncodeConnectAckPacket(&Buffer, ProtRev); - m_Socket.Send(Buffer, Ip); - - // create the client - CDextraClient *client = new CDextraClient(Callsign, Ip, ToLinkModule, ProtRev); - - // and append - g_Reflector.GetClients()->AddClient(client); - g_Reflector.ReleaseClients(); + // valid module ? + if ( g_Reflector.IsValidModule(ToLinkModule) ) + { + // acknowledge the request + EncodeConnectAckPacket(&Buffer, ProtRev); + m_Socket.Send(Buffer, Ip); + + // create the client + CDextraClient *client = new CDextraClient(Callsign, Ip, ToLinkModule, ProtRev); + + // and append + g_Reflector.GetClients()->AddClient(client); + g_Reflector.ReleaseClients(); + } + else + { + std::cout << "DExtra node " << Callsign << " connect attempt on non-existing module" << std::endl; + + // deny the request + EncodeConnectNackPacket(&Buffer); + m_Socket.Send(Buffer, Ip); + } } else { diff --git a/src/cdplusprotocol.cpp b/src/cdplusprotocol.cpp index 03427c5..f56ab7f 100644 --- a/src/cdplusprotocol.cpp +++ b/src/cdplusprotocol.cpp @@ -202,36 +202,44 @@ bool CDplusProtocol::OnDvHeaderPacketIn(CDvHeaderPacket *Header, const CIp &Ip) // no stream open yet, open a new one CCallsign via(Header->GetRpt1Callsign()); - // find this client - CClient *client = g_Reflector.GetClients()->FindClient(Ip, PROTOCOL_DPLUS); - if ( client != NULL ) + // first, check module is valid + if ( g_Reflector.IsValidModule(Header->GetRpt1Module()) ) { - // now we knwo if it's a dextra dongle or a genuine dplus node - if ( Header->GetRpt2Callsign().HasSameCallsignWithWidlcard(CCallsign("XRF*")) ) + // find this client + CClient *client = g_Reflector.GetClients()->FindClient(Ip, PROTOCOL_DPLUS); + if ( client != NULL ) { - client->SetDextraDongle(); - } - // now we know its module, let's update it - if ( !client->HasModule() ) - { - client->SetModule(Header->GetRpt1Module()); - } - // get client callsign - via = client->GetCallsign(); - // and try to open the stream - if ( (stream = g_Reflector.OpenStream(Header, client)) != NULL ) - { - // keep the handle - m_Streams.push_back(stream); - newstream = true; + // now we know if it's a dextra dongle or a genuine dplus node + if ( Header->GetRpt2Callsign().HasSameCallsignWithWidlcard(CCallsign("XRF*")) ) + { + client->SetDextraDongle(); + } + // now we know its module, let's update it + if ( !client->HasModule() ) + { + client->SetModule(Header->GetRpt1Module()); + } + // get client callsign + via = client->GetCallsign(); + // and try to open the stream + if ( (stream = g_Reflector.OpenStream(Header, client)) != NULL ) + { + // keep the handle + m_Streams.push_back(stream); + newstream = true; + } } + // release + g_Reflector.ReleaseClients(); + + // update last heard + g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via); + g_Reflector.ReleaseUsers(); + } + else + { + std::cout << "DPlus node " << via << " link attempt on non-existing module" << std::endl; } - // release - g_Reflector.ReleaseClients(); - - // update last heard - g_Reflector.GetUsers()->Hearing(Header->GetMyCallsign(), via); - g_Reflector.ReleaseUsers(); } else { diff --git a/src/creflector.h b/src/creflector.h index 2370280..341a1a2 100644 --- a/src/creflector.h +++ b/src/creflector.h @@ -77,7 +77,7 @@ public: void ReleaseUsers(void) { m_Users.Unlock(); } // get - bool IsValidModule(char c) const { return true; } + bool IsValidModule(char c) const { return (GetModuleIndex(c) >= 0); } int GetModuleIndex(char) const; char GetModuleLetter(int i) const { return 'A' + (char)i; } diff --git a/src/cxlxprotocol.cpp b/src/cxlxprotocol.cpp index 9643bdb..b277925 100644 --- a/src/cxlxprotocol.cpp +++ b/src/cxlxprotocol.cpp @@ -131,11 +131,8 @@ void CXlxProtocol::Task(void) m_Socket.Send(Buffer, Ip); } } - // done g_Reflector.ReleaseClients(); - - } else if ( IsValidDisconnectPacket(Buffer, &Callsign) ) { @@ -223,12 +220,10 @@ void CXlxProtocol::HandleQueue(void) { // is this client busy ? // here check that origin module of the stream is listed in client xlx - // TODO: and check that client of origin is not another XLX to avoid loops if ( !client->IsAMaster() && client->HasThisReflectorModule(packet->GetModuleId()) ) { // no, send the packet m_Socket.Send(buffer, client->GetIp()); - } } g_Reflector.ReleaseClients(); @@ -278,8 +273,7 @@ void CXlxProtocol::HandleKeepalives(void) // remove it std::cout << "XLX peer " << client->GetCallsign() << " keepalive timeout" << std::endl; clients->RemoveClient(client); - } - + } } g_Reflector.ReleaseClients(); } diff --git a/src/main.h b/src/main.h index ab40281..b99a70b 100644 --- a/src/main.h +++ b/src/main.h @@ -48,7 +48,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 -#define VERSION_REVISION 5 +#define VERSION_REVISION 6 // global ------------------------------------------------------ @@ -57,7 +57,7 @@ // reflector --------------------------------------------------- -#define NB_OF_MODULES 4 +#define NB_OF_MODULES 8 // protocols --------------------------------------------------- @@ -87,8 +87,8 @@ // XLX #define XLX_PORT 10002 // UDP port -#define XLX_KEEPALIVE_PERIOD 3 // in seconds -#define XLX_KEEPALIVE_TIMEOUT (XLX_KEEPALIVE_PERIOD*10) // in seconds +#define XLX_KEEPALIVE_PERIOD 1 // in seconds +#define XLX_KEEPALIVE_TIMEOUT (XLX_KEEPALIVE_PERIOD*30) // in seconds // xml & json reporting -----------------------------------------