diff --git a/reflector/Main.h b/reflector/Main.h index d71ba99..e72c4d3 100644 --- a/reflector/Main.h +++ b/reflector/Main.h @@ -152,6 +152,7 @@ enum class EProtocol { any, none, dextra, dplus, dcs, bm, urf, dmrplus, dmrmmdvm #define M17_RECONNECT_PERIOD 5 // P25 +#define P25_REFID 12345 // Reflector ID #define P25_PORT 41000 // UDP port #define P25_KEEPALIVE_PERIOD 1 // in seconds #define P25_KEEPALIVE_TIMEOUT (P25_KEEPALIVE_PERIOD*10) // in seconds @@ -159,6 +160,7 @@ enum class EProtocol { any, none, dextra, dplus, dcs, bm, urf, dmrplus, dmrmmdvm #define P25_AUTOLINK_MODULE 'A' // module for client to auto-link to // NXDN +#define NXDN_REFID 12345 // Reflector ID #define NXDN_PORT 41400 // UDP port #define NXDN_KEEPALIVE_PERIOD 3 // in seconds #define NXDN_KEEPALIVE_TIMEOUT (NXDN_KEEPALIVE_PERIOD*10) // in seconds diff --git a/reflector/NXDNProtocol.cpp b/reflector/NXDNProtocol.cpp index 3aba152..1643646 100644 --- a/reflector/NXDNProtocol.cpp +++ b/reflector/NXDNProtocol.cpp @@ -465,7 +465,8 @@ bool CNXDNProtocol::EncodeNXDNHeaderPacket(const CDvHeaderPacket &Header, CBuffe { Buffer.resize(43); uint16_t NXDNId = Header.GetMyCallsign().GetNXDNid(); - uint16_t RptrId = Header.GetRpt1Callsign().GetNXDNid(); + uint16_t RptrId = NXDN_REFID; + memcpy(Buffer.data(), "NXDND", 5); Buffer.data()[5U] = (NXDNId >> 8) & 0xFFU; Buffer.data()[6U] = (NXDNId >> 0) & 0xFFU; @@ -520,7 +521,7 @@ bool CNXDNProtocol::EncodeNXDNPacket(const CDvHeaderPacket &Header, uint32_t seq uint8_t ambe[28]; Buffer.resize(43); uint16_t NXDNId = Header.GetMyCallsign().GetNXDNid(); - uint16_t RptrId = Header.GetRpt1Callsign().GetNXDNid(); + uint16_t RptrId = NXDN_REFID; memcpy(Buffer.data(), "NXDND", 5); Buffer.data()[5U] = (NXDNId >> 8) & 0xFFU; diff --git a/reflector/P25Protocol.cpp b/reflector/P25Protocol.cpp index 1f75e5a..dc59a18 100644 --- a/reflector/P25Protocol.cpp +++ b/reflector/P25Protocol.cpp @@ -387,7 +387,7 @@ bool CP25Protocol::IsValidDvHeaderPacket(const CIp &Ip, const CBuffer &Buffer, s void CP25Protocol::EncodeP25Packet(const CDvHeaderPacket &Header, const CDvFramePacket &DvFrame, uint32_t iSeq, CBuffer &Buffer, bool islast) const { uint32_t uiSrcId = Header.GetMyCallsign().GetDmrid(); - uint32_t uiRptrId = Header.GetRpt1Callsign().GetDmrid(); + uint32_t uiRptrId = P25_REFID; if(uiSrcId == 0){ uiSrcId = DMRMMDVM_DEFAULTID;