From a20dec80ca831ff2f874c422c005a3db99e00c6b Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 6 Sep 2020 21:16:19 +0100 Subject: [PATCH] Add the Options to the YSF network in the DG-Id Gateway. --- DGIdGateway/DGIdGateway.cpp | 15 ++++++++------- DGIdGateway/DGIdGateway.ini | 3 ++- DGIdGateway/YSFNetwork.cpp | 34 +++++++++++++++++++++++++++++----- DGIdGateway/YSFNetwork.h | 5 ++++- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/DGIdGateway/DGIdGateway.cpp b/DGIdGateway/DGIdGateway.cpp index 204059c..43b60b5 100644 --- a/DGIdGateway/DGIdGateway.cpp +++ b/DGIdGateway/DGIdGateway.cpp @@ -240,12 +240,13 @@ int CDGIdGateway::run() dgIdNetwork[dgid]->m_rfHangTime = rfHangTime; dgIdNetwork[dgid]->m_netHangTime = netHangTime; } else if (type == "YSF") { - std::string name = (*it)->m_name; - unsigned int local = (*it)->m_local; + std::string name = (*it)->m_name; + unsigned int local = (*it)->m_local; + std::string options = (*it)->m_options; CYSFReflector* reflector = reflectors->findByName(name); if (reflector != NULL) { - dgIdNetwork[dgid] = new CYSFNetwork(local, reflector->m_name, reflector->m_addr, reflector->m_addrLen, m_callsign, debug);; + dgIdNetwork[dgid] = new CYSFNetwork(local, reflector->m_name, reflector->m_addr, reflector->m_addrLen, m_callsign, options, debug);; dgIdNetwork[dgid]->m_modes = DT_VD_MODE1 | DT_VD_MODE2 | DT_VOICE_FR_MODE | DT_DATA_FR_MODE; dgIdNetwork[dgid]->m_static = statc; dgIdNetwork[dgid]->m_rfHangTime = rfHangTime; @@ -285,7 +286,7 @@ int CDGIdGateway::run() sockaddr_storage addr; unsigned int addrLen; if (CUDPSocket::lookup((*it)->m_address, (*it)->m_port, addr, addrLen) == 0) { - dgIdNetwork[dgid] = new CYSFNetwork(local, "PARROT", addr, addrLen, m_callsign, debug); + dgIdNetwork[dgid] = new CYSFNetwork(local, "PARROT", addr, addrLen, m_callsign, "", debug); dgIdNetwork[dgid]->m_modes = DT_VD_MODE1 | DT_VD_MODE2 | DT_VOICE_FR_MODE | DT_DATA_FR_MODE; dgIdNetwork[dgid]->m_static = statc; dgIdNetwork[dgid]->m_rfHangTime = rfHangTime; @@ -299,7 +300,7 @@ int CDGIdGateway::run() sockaddr_storage addr; unsigned int addrLen; if (CUDPSocket::lookup((*it)->m_address, (*it)->m_port, addr, addrLen) == 0) { - dgIdNetwork[dgid] = new CYSFNetwork(local, "YSF2DMR", addr, addrLen, m_callsign, debug); + dgIdNetwork[dgid] = new CYSFNetwork(local, "YSF2DMR", addr, addrLen, m_callsign, "", debug); dgIdNetwork[dgid]->m_modes = DT_VD_MODE1 | DT_VD_MODE2; dgIdNetwork[dgid]->m_static = statc; dgIdNetwork[dgid]->m_rfHangTime = rfHangTime; @@ -313,7 +314,7 @@ int CDGIdGateway::run() sockaddr_storage addr; unsigned int addrLen; if (CUDPSocket::lookup((*it)->m_address, (*it)->m_port, addr, addrLen) == 0) { - dgIdNetwork[dgid] = new CYSFNetwork(local, "YSF2NXDN", addr, addrLen, m_callsign, debug); + dgIdNetwork[dgid] = new CYSFNetwork(local, "YSF2NXDN", addr, addrLen, m_callsign, "", debug); dgIdNetwork[dgid]->m_modes = DT_VD_MODE1 | DT_VD_MODE2; dgIdNetwork[dgid]->m_static = statc; dgIdNetwork[dgid]->m_rfHangTime = rfHangTime; @@ -327,7 +328,7 @@ int CDGIdGateway::run() sockaddr_storage addr; unsigned int addrLen; if (CUDPSocket::lookup((*it)->m_address, (*it)->m_port, addr, addrLen) == 0) { - dgIdNetwork[dgid] = new CYSFNetwork(local, "YSF2P25", addr, addrLen, m_callsign, debug); + dgIdNetwork[dgid] = new CYSFNetwork(local, "YSF2P25", addr, addrLen, m_callsign, "", debug); dgIdNetwork[dgid]->m_modes = DT_VOICE_FR_MODE; dgIdNetwork[dgid]->m_static = statc; dgIdNetwork[dgid]->m_rfHangTime = rfHangTime; diff --git a/DGIdGateway/DGIdGateway.ini b/DGIdGateway/DGIdGateway.ini index 77a0e64..9ca73e8 100644 --- a/DGIdGateway/DGIdGateway.ini +++ b/DGIdGateway/DGIdGateway.ini @@ -108,6 +108,7 @@ Type=YSF Static=0 Name=0-0-CQ-UK-ROOM Local=42023 +#Options=20;21; #RFHangTime=120 #NetHangTime=60 Debug=0 @@ -118,7 +119,7 @@ Type=FCS Static=0 Name=FCS00101 Local=42025 -# Options=20;21; +#Options=20;21; #RFHangTime=120 #NetHangTime=60 Debug=0 diff --git a/DGIdGateway/YSFNetwork.cpp b/DGIdGateway/YSFNetwork.cpp index cc1ffe2..acac223 100644 --- a/DGIdGateway/YSFNetwork.cpp +++ b/DGIdGateway/YSFNetwork.cpp @@ -33,6 +33,7 @@ m_debug(debug), m_addr(addr), m_addrLen(addrLen), m_poll(NULL), +m_options(NULL), m_unlink(NULL), m_buffer(1000U, "YSF Network Buffer"), m_pollTimer(1000U, 5U), @@ -49,17 +50,18 @@ m_linked(true) node.resize(YSF_CALLSIGN_LENGTH, ' '); for (unsigned int i = 0U; i < YSF_CALLSIGN_LENGTH; i++) { - m_poll[i + 4U] = node.at(i); - m_unlink[i + 4U] = node.at(i); + m_poll[i + 4U] = node.at(i); + m_unlink[i + 4U] = node.at(i); } } -CYSFNetwork::CYSFNetwork(unsigned int localPort, const std::string& name, const sockaddr_storage& addr, unsigned int addrLen, const std::string& callsign, bool debug) : +CYSFNetwork::CYSFNetwork(unsigned int localPort, const std::string& name, const sockaddr_storage& addr, unsigned int addrLen, const std::string& callsign, const std::string& options, bool debug) : m_socket(localPort), m_debug(debug), m_addr(addr), m_addrLen(addrLen), m_poll(NULL), +m_options(NULL), m_unlink(NULL), m_buffer(1000U, "YSF Network Buffer"), m_pollTimer(1000U, 5U), @@ -76,14 +78,30 @@ m_linked(false) node.resize(YSF_CALLSIGN_LENGTH, ' '); for (unsigned int i = 0U; i < YSF_CALLSIGN_LENGTH; i++) { - m_poll[i + 4U] = node.at(i); - m_unlink[i + 4U] = node.at(i); + m_poll[i + 4U] = node.at(i); + m_unlink[i + 4U] = node.at(i); + } + + std::string opt = options; + if (!opt.empty()) { + m_options = new unsigned char[50U]; + ::memcpy(m_options + 0U, "YSFO", 4U); + + for (unsigned int i = 0U; i < YSF_CALLSIGN_LENGTH; i++) + m_options[i + 4U] = node.at(i); + + opt.resize(50, ' '); + + for (unsigned int i = 0U; i < (50U - 4U - YSF_CALLSIGN_LENGTH); i++) + m_options[i + 4U + YSF_CALLSIGN_LENGTH] = opt.at(i); } } CYSFNetwork::~CYSFNetwork() { delete[] m_poll; + delete[] m_unlink; + delete[] m_options; } std::string CYSFNetwork::getDesc(unsigned int dgId) @@ -126,6 +144,9 @@ void CYSFNetwork::writePoll() m_pollTimer.start(); m_socket.write(m_poll, 14U, m_addr, m_addrLen); + + if (m_options != NULL) + m_socket.write(m_options, 50U, m_addr, m_addrLen); } void CYSFNetwork::unlink() @@ -163,6 +184,9 @@ void CYSFNetwork::clock(unsigned int ms) LogMessage("Linked to %s", m_name.c_str()); m_linked = true; + + if (m_options != NULL) + m_socket.write(m_options, 50U, m_addr, m_addrLen); } if (m_debug) diff --git a/DGIdGateway/YSFNetwork.h b/DGIdGateway/YSFNetwork.h index 36eda05..afa3eb0 100644 --- a/DGIdGateway/YSFNetwork.h +++ b/DGIdGateway/YSFNetwork.h @@ -31,9 +31,11 @@ class CYSFNetwork : public CDGIdNetwork { public: CYSFNetwork(const std::string& localAddress, unsigned int localPort, const std::string& name, const sockaddr_storage& addr, unsigned int addrLen, const std::string& callsign, bool debug); - CYSFNetwork(unsigned int localPort, const std::string& name, const sockaddr_storage& addr, unsigned int addrLen, const std::string& callsign, bool debug); + CYSFNetwork(unsigned int localPort, const std::string& name, const sockaddr_storage& addr, unsigned int addrLen, const std::string& callsign, const std::string& options, bool debug); virtual ~CYSFNetwork(); + void setOptions(const std::string& options); + virtual std::string getDesc(unsigned int dgId); virtual bool open(); @@ -56,6 +58,7 @@ private: sockaddr_storage m_addr; unsigned int m_addrLen; unsigned char* m_poll; + unsigned char* m_options; unsigned char* m_unlink; CRingBuffer m_buffer; CTimer m_pollTimer;