From d38bf58891aa1c859f39ece671784bba00b387d0 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Wed, 17 Nov 2021 06:44:30 -0700 Subject: [PATCH] move back to XLX --- reflector/Client.h | 22 ++++++++----------- reflector/Main.h | 6 ++--- reflector/Makefile | 2 +- reflector/{URFClient.cpp => XLXClient.cpp} | 4 ++-- reflector/{URFClient.h => XLXClient.h} | 18 ++++++--------- reflector/{URFPeer.cpp => XLXPeer.cpp} | 0 reflector/{URFPeer.h => XLXPeer.h} | 0 .../{URFProtocol.cpp => XLXProtocol.cpp} | 0 reflector/{URFProtocol.h => XLXProtocol.h} | 0 9 files changed, 22 insertions(+), 30 deletions(-) rename reflector/{URFClient.cpp => XLXClient.cpp} (94%) rename reflector/{URFClient.h => XLXClient.h} (61%) rename reflector/{URFPeer.cpp => XLXPeer.cpp} (100%) rename reflector/{URFPeer.h => XLXPeer.h} (100%) rename reflector/{URFProtocol.cpp => XLXProtocol.cpp} (100%) rename reflector/{URFProtocol.h => XLXProtocol.h} (100%) diff --git a/reflector/Client.h b/reflector/Client.h index 055c1e6..d4e329b 100644 --- a/reflector/Client.h +++ b/reflector/Client.h @@ -24,11 +24,7 @@ #include "Buffer.h" #include "Packet.h" -//////////////////////////////////////////////////////////////////////////////////////// -// - -//////////////////////////////////////////////////////////////////////////////////////// -// class +enum class EXLXProtocol { original, revised, ambe, m17 }; class CClient { @@ -57,14 +53,14 @@ public: void SetReflectorModule(char c) { m_ReflectorModule = c; } // identity - virtual EProtocol GetProtocol(void) const { return EProtocol::none; } - virtual int GetProtocolRevision(void) const { return 0; } - virtual ECodecType GetCodec(void) const { return ECodecType::none; } - virtual const char *GetProtocolName(void) const { return "none"; } - virtual bool IsNode(void) const { return false; } - virtual bool IsPeer(void) const { return false; } - virtual bool IsDextraDongle(void) const { return false; } - virtual void SetDextraDongle(void) { } + virtual EProtocol GetProtocol(void) const { return EProtocol::none; } + virtual EXLXProtocol GetProtocolRevision(void) const { return EXLXProtocol::m17; } + virtual ECodecType GetCodec(void) const { return ECodecType::none; } + virtual const char *GetProtocolName(void) const { return "none"; } + virtual bool IsNode(void) const { return false; } + virtual bool IsPeer(void) const { return false; } + virtual bool IsDextraDongle(void) const { return false; } + virtual void SetDextraDongle(void) { } // status virtual void Alive(void); diff --git a/reflector/Main.h b/reflector/Main.h index 099d410..f71fe79 100644 --- a/reflector/Main.h +++ b/reflector/Main.h @@ -57,9 +57,9 @@ // version ----------------------------------------------------- -#define VERSION_MAJOR 2 -#define VERSION_MINOR 4 -#define VERSION_REVISION 31 +#define VERSION_MAJOR 17 +#define VERSION_MINOR 0 +#define VERSION_REVISION 0 // global ------------------------------------------------------ diff --git a/reflector/Makefile b/reflector/Makefile index a7498a0..6e64c97 100644 --- a/reflector/Makefile +++ b/reflector/Makefile @@ -37,7 +37,7 @@ endif LDFLAGS=-pthread XRFSRCS = Buffer.cpp Callsign.cpp CallsignList.cpp CallsignListItem.cpp Client.cpp Clients.cpp DCSClient.cpp DCSProtocol.cpp DExtraClient.cpp DExtraPeer.cpp DExtraProtocol.cpp DPlusClient.cpp DPlusProtocol.cpp DVFramePacket.cpp DVHeaderPacket.cpp DVLastFramePacket.cpp GateKeeper.cpp IP.cpp Notification.cpp Packet.cpp PacketStream.cpp PeerCallsignList.cpp Peer.cpp Peers.cpp Protocol.cpp Protocols.cpp Reflector.cpp UDPSocket.cpp User.cpp Users.cpp Version.cpp Main.cpp -XLXSRCS = BMClient.cpp BMPeer.cpp BPTC19696.cpp CRC.cpp DMRIdDir.cpp DMRIdDirFile.cpp DMRIdDirHttp.cpp DMRMMDVMClient.cpp DMRMMDVMProtocol.cpp DMRPlusClient.cpp DMRPlusProtocol.cpp Golay2087.cpp Golay24128.cpp Hamming.cpp QR1676.cpp RS129.cpp Semaphore.cpp Utils.cpp WiresXCmd.cpp WiresXCmdHandler.cpp WiresXInfo.cpp URFClient.cpp URFProtocol.cpp URFPeer.cpp YSFClient.cpp YSFConvolution.cpp YSFFich.cpp YSFNode.cpp YSFNodeDir.cpp YSFNodeDirFile.cpp YSFNodeDirHttp.cpp YSFPayload.cpp YSFProtocol.cpp YSFUtils.cpp +XLXSRCS = BMClient.cpp BMPeer.cpp BPTC19696.cpp CRC.cpp DMRIdDir.cpp DMRIdDirFile.cpp DMRIdDirHttp.cpp DMRMMDVMClient.cpp DMRMMDVMProtocol.cpp DMRPlusClient.cpp DMRPlusProtocol.cpp Golay2087.cpp Golay24128.cpp Hamming.cpp QR1676.cpp RS129.cpp Semaphore.cpp Utils.cpp WiresXCmd.cpp WiresXCmdHandler.cpp WiresXInfo.cpp XLXClient.cpp XLXProtocol.cpp XLXPeer.cpp YSFClient.cpp YSFConvolution.cpp YSFFich.cpp YSFNode.cpp YSFNodeDir.cpp YSFNodeDirFile.cpp YSFNodeDirHttp.cpp YSFPayload.cpp YSFProtocol.cpp YSFUtils.cpp G3SRCS = G3Client.cpp G3Protocol.cpp RawSocket.cpp UDPMsgSocket.cpp SRCS = $(XRFSRCS) diff --git a/reflector/URFClient.cpp b/reflector/XLXClient.cpp similarity index 94% rename from reflector/URFClient.cpp rename to reflector/XLXClient.cpp index db85982..8608c2f 100644 --- a/reflector/URFClient.cpp +++ b/reflector/XLXClient.cpp @@ -26,10 +26,10 @@ CURFClient::CURFClient() { - m_ProtRev = XLX_PROTOCOL_REVISION_0; + m_ProtRev = EXLXProtocol::m17; } -CURFClient::CURFClient(const CCallsign &callsign, const CIp &ip, char reflectorModule, int protRev) +CURFClient::CURFClient(const CCallsign &callsign, const CIp &ip, char reflectorModule, EXLXProtocol protRev) : CClient(callsign, ip, reflectorModule) { m_ProtRev = protRev; diff --git a/reflector/URFClient.h b/reflector/XLXClient.h similarity index 61% rename from reflector/URFClient.h rename to reflector/XLXClient.h index ce6552d..722efb2 100644 --- a/reflector/URFClient.h +++ b/reflector/XLXClient.h @@ -20,27 +20,23 @@ #include "Client.h" -#define XLX_PROTOCOL_REVISION_0 0 // AMBE only, original connect mechanism -#define XLX_PROTOCOL_REVISION_1 1 // AMBE only, revised connect mechanism -#define XLX_PROTOCOL_REVISION_2 2 // Transcoded AMBE+AMBE2 interlink - class CURFClient : public CClient { public: // constructors CURFClient(); - CURFClient(const CCallsign &, const CIp &, char = ' ', int = XLX_PROTOCOL_REVISION_0); + CURFClient(const CCallsign &, const CIp &, char = ' ', EXLXProtocol = EXLXProtocol::m17); CURFClient(const CURFClient &); // destructor virtual ~CURFClient() {}; // identity - EProtocol GetProtocol(void) const { return EProtocol::ulx; } - int GetProtocolRevision(void) const { return m_ProtRev; } - const char *GetProtocolName(void) const { return "XLX"; } - ECodecType GetCodec(void) const { return ECodecType::none; } - bool IsPeer(void) const { return true; } + EProtocol GetProtocol(void) const { return EProtocol::ulx; } + EXLXProtocol GetProtocolRevision(void) const { return m_ProtRev; } + const char *GetProtocolName(void) const { return "XLX"; } + ECodecType GetCodec(void) const { return ECodecType::none; } + bool IsPeer(void) const { return true; } // status bool IsAlive(void) const; @@ -50,5 +46,5 @@ public: protected: // data - int m_ProtRev; + EXLXProtocol m_ProtRev; }; diff --git a/reflector/URFPeer.cpp b/reflector/XLXPeer.cpp similarity index 100% rename from reflector/URFPeer.cpp rename to reflector/XLXPeer.cpp diff --git a/reflector/URFPeer.h b/reflector/XLXPeer.h similarity index 100% rename from reflector/URFPeer.h rename to reflector/XLXPeer.h diff --git a/reflector/URFProtocol.cpp b/reflector/XLXProtocol.cpp similarity index 100% rename from reflector/URFProtocol.cpp rename to reflector/XLXProtocol.cpp diff --git a/reflector/URFProtocol.h b/reflector/XLXProtocol.h similarity index 100% rename from reflector/URFProtocol.h rename to reflector/XLXProtocol.h