move back to XLX

reflector/Client.h

@@ -24,11 +24,7 @@
 #include "Buffer.h"
 #include "Packet.h"
 
-////////////////////////////////////////////////////////////////////////////////////////
+enum class EXLXProtocol { original, revised, ambe, m17 };
-//
-
-////////////////////////////////////////////////////////////////////////////////////////
-// class
 
 class CClient
 {
@@ -57,14 +53,14 @@ public:
 	void SetReflectorModule(char c)                     { m_ReflectorModule = c; }
 
 	// identity
-	virtual EProtocol GetProtocol(void) const           { return EProtocol::none; }
+	virtual EProtocol GetProtocol(void) const            { return EProtocol::none; }
-	virtual int GetProtocolRevision(void) const         { return 0; }
+	virtual EXLXProtocol GetProtocolRevision(void) const { return EXLXProtocol::m17; }
-	virtual ECodecType GetCodec(void) const             { return ECodecType::none; }
+	virtual ECodecType GetCodec(void) const              { return ECodecType::none; }
-	virtual const char *GetProtocolName(void) const     { return "none"; }
+	virtual const char *GetProtocolName(void) const      { return "none"; }
-	virtual bool IsNode(void) const                     { return false; }
+	virtual bool IsNode(void) const                      { return false; }
-	virtual bool IsPeer(void) const                     { return false; }
+	virtual bool IsPeer(void) const                      { return false; }
-	virtual bool IsDextraDongle(void) const             { return false; }
+	virtual bool IsDextraDongle(void) const              { return false; }
-	virtual void SetDextraDongle(void)                  { }
+	virtual void SetDextraDongle(void)                   { }
 
 	// status
 	virtual void Alive(void);

reflector/Main.h

@@ -57,9 +57,9 @@
 
 // version -----------------------------------------------------
 
-#define VERSION_MAJOR                   2
+#define VERSION_MAJOR                   17
-#define VERSION_MINOR                   4
+#define VERSION_MINOR                   0
-#define VERSION_REVISION                31
+#define VERSION_REVISION                0
 
 // global ------------------------------------------------------
 

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)

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;

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; }
+	EProtocol GetProtocol(void) const            { return EProtocol::ulx; }
-	int GetProtocolRevision(void) const         { return m_ProtRev; }
+	EXLXProtocol GetProtocolRevision(void) const { return m_ProtRev; }
-	const char *GetProtocolName(void) const     { return "XLX"; }
+	const char *GetProtocolName(void) const      { return "XLX"; }
-	ECodecType GetCodec(void) const             { return ECodecType::none; }
+	ECodecType GetCodec(void) const              { return ECodecType::none; }
-	bool IsPeer(void) const                     { return true; }
+	bool IsPeer(void) const                      { return true; }
 
 	// status
 	bool IsAlive(void) const;
@@ -50,5 +46,5 @@ public:
 
 protected:
 	// data
-	int     m_ProtRev;
+	EXLXProtocol m_ProtRev;
 };