dominic
/
YSFClients
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'g4klx/master'

Browse Source
ycs232-kbc
Andy CA6JAU 6 years ago
parent 3eec7d741c 876111ee17
commit 5c0148bdc0
9 changed files with 139 additions and 40 deletions
Show Stats Download Patch File Download Diff File

8
YSFGateway/Conf.cpp
Unescape View File

@ -48,6 +48,7 @@ m_rptPort(0U),
m_myAddress(), m_myAddress(),
m_myPort(0U), m_myPort(0U),
m_wiresXMakeUpper(true), m_wiresXMakeUpper(true),
m_wiresXCommandPassthrough(false),
m_daemon(false), m_daemon(false),
m_rxFrequency(0U), m_rxFrequency(0U),
m_txFrequency(0U), m_txFrequency(0U),
@ -162,6 +163,8 @@ bool CConf::read()
m_myPort = (unsigned int)::atoi(value); m_myPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "WiresXMakeUpper") == 0) else if (::strcmp(key, "WiresXMakeUpper") == 0)
m_wiresXMakeUpper = ::atoi(value) == 1; m_wiresXMakeUpper = ::atoi(value) == 1;
else if (::strcmp(key, "WiresXCommandPassthrough") == 0)
m_wiresXCommandPassthrough = ::atoi(value) == 1;
else if (::strcmp(key, "Daemon") == 0) else if (::strcmp(key, "Daemon") == 0)
m_daemon = ::atoi(value) == 1; m_daemon = ::atoi(value) == 1;
} else if (section == SECTION_INFO) { } else if (section == SECTION_INFO) {
@ -299,6 +302,11 @@ bool CConf::getWiresXMakeUpper() const
return m_wiresXMakeUpper; return m_wiresXMakeUpper;
} }
bool CConf::getWiresXCommandPassthrough() const
{
return m_wiresXCommandPassthrough;
}
bool CConf::getDaemon() const bool CConf::getDaemon() const
{ {
return m_daemon; return m_daemon;

2
YSFGateway/Conf.h
Unescape View File

@ -38,6 +38,7 @@ public:
std::string getMyAddress() const; std::string getMyAddress() const;
unsigned int getMyPort() const; unsigned int getMyPort() const;
bool getWiresXMakeUpper() const; bool getWiresXMakeUpper() const;
bool getWiresXCommandPassthrough() const;
bool getDaemon() const; bool getDaemon() const;
// The Info section // The Info section
@ -104,6 +105,7 @@ private:
std::string m_myAddress; std::string m_myAddress;
unsigned int m_myPort; unsigned int m_myPort;
bool m_wiresXMakeUpper; bool m_wiresXMakeUpper;
bool m_wiresXCommandPassthrough;
bool m_daemon; bool m_daemon;
unsigned int m_rxFrequency; unsigned int m_rxFrequency;

97
YSFGateway/WiresX.cpp
Unescape View File

@ -31,6 +31,7 @@
const unsigned char DX_REQ[] = {0x5DU, 0x71U, 0x5FU}; const unsigned char DX_REQ[] = {0x5DU, 0x71U, 0x5FU};
const unsigned char CONN_REQ[] = {0x5DU, 0x23U, 0x5FU}; const unsigned char CONN_REQ[] = {0x5DU, 0x23U, 0x5FU};
const unsigned char DISC_REQ[] = {0x5DU, 0x2AU, 0x5FU}; const unsigned char DISC_REQ[] = {0x5DU, 0x2AU, 0x5FU};
const unsigned char DISC_REQ2[] = {0x5DU, 0x63U, 0x5FU};
const unsigned char ALL_REQ[] = {0x5DU, 0x66U, 0x5FU}; const unsigned char ALL_REQ[] = {0x5DU, 0x66U, 0x5FU};
const unsigned char CAT_REQ[] = {0x5DU, 0x67U, 0x5FU}; const unsigned char CAT_REQ[] = {0x5DU, 0x67U, 0x5FU};
@ -180,7 +181,7 @@ bool CWiresX::start()
return true; return true;
} }
WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft) WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft, bool wiresXCommandPassthrough)
{ {
assert(data != NULL); assert(data != NULL);
assert(source != NULL); assert(source != NULL);
@ -227,23 +228,50 @@ WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* sourc
if (!valid) if (!valid)
return WXS_NONE; return WXS_NONE;
if (::memcmp(m_command + 1U, DX_REQ, 3U) == 0) { // If we are using WiresX Passthrough (we already know we are on a YSF2xxx room from YSFGateway
processDX(source); if (wiresXCommandPassthrough) {
return WXS_NONE; if (::memcmp(m_command + 1U, DX_REQ, 3U) == 0) {
} else if (::memcmp(m_command + 1U, ALL_REQ, 3U) == 0) { return WXS_NONE;
processAll(source, m_command + 5U); } else if (::memcmp(m_command + 1U, ALL_REQ, 3U) == 0) {
return WXS_NONE; return WXS_NONE;
} else if (::memcmp(m_command + 1U, CONN_REQ, 3U) == 0) { } else if (::memcmp(m_command + 1U, CONN_REQ, 3U) == 0) {
return processConnect(source, m_command + 5U); return WXS_NONE;
} else if (::memcmp(m_command + 1U, DISC_REQ, 3U) == 0) { } else if (::memcmp(m_command + 1U, DISC_REQ, 3U) == 0) {
processDisconnect(source); processDisconnect(source);
return WXS_DISCONNECT; return WXS_DISCONNECT;
} else if (::memcmp(m_command + 1U, CAT_REQ, 3U) == 0) { } else if (::memcmp(m_command + 1U, DISC_REQ2, 3U) == 0) {
processCategory(source, m_command + 5U); processDisconnect(source);
return WXS_NONE; return WXS_DISCONNECT;
} else { } else if (::memcmp(m_command + 1U, CAT_REQ, 3U) == 0) {
CUtils::dump("Unknown Wires-X command", m_command, cmd_len); return WXS_NONE;
return WXS_NONE; } else {
CUtils::dump("Unknown Wires-X command", m_command, cmd_len);
return WXS_NONE;
}
}
// Origional Code Here
else {
if (::memcmp(m_command + 1U, DX_REQ, 3U) == 0) {
processDX(source);
return WXS_NONE;
} else if (::memcmp(m_command + 1U, ALL_REQ, 3U) == 0) {
processAll(source, m_command + 5U);
return WXS_NONE;
} else if (::memcmp(m_command + 1U, CONN_REQ, 3U) == 0) {
return processConnect(source, m_command + 5U);
} else if (::memcmp(m_command + 1U, DISC_REQ, 3U) == 0) {
processDisconnect(source);
return WXS_DISCONNECT;
} else if (::memcmp(m_command + 1U, DISC_REQ2, 3U) == 0) {
processDisconnect(source);
return WXS_DISCONNECT;
} else if (::memcmp(m_command + 1U, CAT_REQ, 3U) == 0) {
processCategory(source, m_command + 5U);
return WXS_NONE;
} else {
CUtils::dump("Unknown Wires-X command", m_command, cmd_len);
return WXS_NONE;
}
} }
} }
@ -408,11 +436,15 @@ void CWiresX::clock(unsigned int ms)
} }
} }
void CWiresX::createReply(const unsigned char* data, unsigned int length) void CWiresX::createReply(const unsigned char* data, unsigned int length, CYSFNetwork* network)
{ {
assert(data != NULL); assert(data != NULL);
assert(length > 0U); assert(length > 0U);
// If we don't explicitly pass a network, use the default one.
if (network == NULL)
network = m_network;
unsigned char bt = 0U; unsigned char bt = 0U;
if (length > 260U) { if (length > 260U) {
@ -454,7 +486,7 @@ void CWiresX::createReply(const unsigned char* data, unsigned int length)
buffer[34U] = seqNo; buffer[34U] = seqNo;
seqNo += 2U; seqNo += 2U;
m_network->write(buffer); network->write(buffer);
fich.setFI(YSF_FI_COMMUNICATIONS); fich.setFI(YSF_FI_COMMUNICATIONS);
@ -501,7 +533,7 @@ void CWiresX::createReply(const unsigned char* data, unsigned int length)
buffer[34U] = seqNo; buffer[34U] = seqNo;
seqNo += 2U; seqNo += 2U;
m_network->write(buffer); network->write(buffer);
fn++; fn++;
if (fn >= 8U) { if (fn >= 8U) {
@ -521,7 +553,7 @@ void CWiresX::createReply(const unsigned char* data, unsigned int length)
buffer[34U] = seqNo | 0x01U; buffer[34U] = seqNo | 0x01U;
m_network->write(buffer); network->write(buffer);
} }
unsigned char CWiresX::calculateFT(unsigned int length, unsigned int offset) const unsigned char CWiresX::calculateFT(unsigned int length, unsigned int offset) const
@ -616,6 +648,27 @@ void CWiresX::sendDXReply()
m_seqNo++; m_seqNo++;
} }
void CWiresX::sendConnect(CYSFNetwork* network)
{
unsigned char data[20U];
::memset(data, 0x00U, 20U);
::memset(data, ' ', 16U);
data[0U] = m_seqNo;
for (unsigned int i = 0U; i < 3U; i++)
data[i + 1U] = DX_REQ[i];
data[15U] = 0x03U; // End of data marker
data[16U] = CCRC::addCRC(data, 16U);
CUtils::dump(1U, "CONNECT", data, 20U);
createReply(data, 20U, network);
m_seqNo++;
}
void CWiresX::sendConnectReply() void CWiresX::sendConnectReply()
{ {
assert(m_reflector != NULL); assert(m_reflector != NULL);

7
YSFGateway/WiresX.h
Unescape View File

@ -56,7 +56,7 @@ public:
bool start(); bool start();
WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); WX_STATUS process(const unsigned char* data, const unsigned char* source, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft, bool wiresXCommandPassthrough);
CYSFReflector* getReflector() const; CYSFReflector* getReflector() const;
void setReflector(CYSFReflector* reflector); void setReflector(CYSFReflector* reflector);
@ -64,6 +64,8 @@ public:
void processConnect(CYSFReflector* reflector); void processConnect(CYSFReflector* reflector);
void processDisconnect(const unsigned char* source = NULL); void processDisconnect(const unsigned char* source = NULL);
void sendConnect(CYSFNetwork* network);
void clock(unsigned int ms); void clock(unsigned int ms);
private: private:
@ -87,6 +89,7 @@ private:
unsigned int m_start; unsigned int m_start;
std::string m_search; std::string m_search;
std::vector<CYSFReflector*> m_category; std::vector<CYSFReflector*> m_category;
bool m_wiresXCommandPassthrough;
WX_STATUS processConnect(const unsigned char* source, const unsigned char* data); WX_STATUS processConnect(const unsigned char* source, const unsigned char* data);
void processDX(const unsigned char* source); void processDX(const unsigned char* source);
@ -101,7 +104,7 @@ private:
void sendSearchNotFoundReply(); void sendSearchNotFoundReply();
void sendCategoryReply(); void sendCategoryReply();
void createReply(const unsigned char* data, unsigned int length); void createReply(const unsigned char* data, unsigned int length, CYSFNetwork* network = NULL);
unsigned char calculateFT(unsigned int length, unsigned int offset) const; unsigned char calculateFT(unsigned int length, unsigned int offset) const;
}; };

40
YSFGateway/YSFGateway.cpp
Unescape View File

@ -244,6 +244,7 @@ int CYSFGateway::run()
m_startup = m_conf.getNetworkStartup(); m_startup = m_conf.getNetworkStartup();
bool revert = m_conf.getNetworkRevert(); bool revert = m_conf.getNetworkRevert();
bool wiresXCommandPassthrough = m_conf.getWiresXCommandPassthrough();
startupLinking(); startupLinking();
@ -266,12 +267,25 @@ int CYSFGateway::run()
unsigned char fn = fich.getFN(); unsigned char fn = fich.getFN();
unsigned char ft = fich.getFT(); unsigned char ft = fich.getFT();
// Don't send out control data CYSFReflector* reflector = m_wiresX->getReflector();
m_exclude = (dt == YSF_DT_DATA_FR_MODE); if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && wiresXCommandPassthrough) {
if (reflector->m_wiresX) {
processWiresX(buffer, fi, dt, fn, ft); processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, true, wiresXCommandPassthrough);
processDTMF(buffer, dt); } else {
m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
}
} else if (wiresXCommandPassthrough) {
m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
} else {
m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
}
if (m_gps != NULL) if (m_gps != NULL)
m_gps->data(buffer + 14U, buffer + 35U, fi, dt, fn, ft); m_gps->data(buffer + 14U, buffer + 35U, fi, dt, fn, ft);
@ -507,11 +521,11 @@ void CYSFGateway::createWiresX(CYSFNetwork* rptNetwork)
m_wiresX->start(); m_wiresX->start();
} }
void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft) void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft, bool dontProcessWiresXLocal, bool wiresXCommandPassthrough)
{ {
assert(buffer != NULL); assert(buffer != NULL);
WX_STATUS status = m_wiresX->process(buffer + 35U, buffer + 14U, fi, dt, fn, ft); WX_STATUS status = m_wiresX->process(buffer + 35U, buffer + 14U, fi, dt, fn, ft, dontProcessWiresXLocal);
switch (status) { switch (status) {
case WXS_CONNECT_YSF: { case WXS_CONNECT_YSF: {
if (m_linkType == LINK_YSF) if (m_linkType == LINK_YSF)
@ -532,6 +546,12 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
m_inactivityTimer.start(); m_inactivityTimer.start();
m_lostTimer.start(); m_lostTimer.start();
m_linkType = LINK_YSF; m_linkType = LINK_YSF;
// If we are linking to a YSF2xxx mode, send the YSF2xxx gateway the link command too
if (reflector->m_wiresX && wiresXCommandPassthrough) {
LogMessage("Forward WiresX Connect to \"%s\"", reflector->m_name.c_str());
m_wiresX->sendConnect(m_ysfNetwork);
}
} }
break; break;
case WXS_CONNECT_FCS: { case WXS_CONNECT_FCS: {
@ -567,6 +587,10 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
case WXS_DISCONNECT: case WXS_DISCONNECT:
if (m_linkType == LINK_YSF) { if (m_linkType == LINK_YSF) {
LogMessage("Disconnect has been requested by %10.10s", buffer + 14U); LogMessage("Disconnect has been requested by %10.10s", buffer + 14U);
if ( (wiresXCommandPassthrough) && (::memcmp(buffer + 0U, "YSFD", 4U) == 0) ) {
// Send the disconnect to the YSF2xxx gateway too
m_ysfNetwork->write(buffer);
}
m_ysfNetwork->writeUnlink(3U); m_ysfNetwork->writeUnlink(3U);
m_ysfNetwork->clearDestination(); m_ysfNetwork->clearDestination();

2
YSFGateway/YSFGateway.h
Unescape View File

@ -66,7 +66,7 @@ private:
void startupLinking(); void startupLinking();
std::string calculateLocator(); std::string calculateLocator();
void processWiresX(const unsigned char* buffer, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft); void processWiresX(const unsigned char* buffer, unsigned char fi, unsigned char dt, unsigned char fn, unsigned char ft, bool dontProcessWiresXLocal, bool wiresXCommandPassthrough);
void processDTMF(unsigned char* buffer, unsigned char dt); void processDTMF(unsigned char* buffer, unsigned char dt);
void createWiresX(CYSFNetwork* rptNetwork); void createWiresX(CYSFNetwork* rptNetwork);
void createGPS(); void createGPS();

1
YSFGateway/YSFGateway.ini
Unescape View File

@ -8,6 +8,7 @@ RptPort=3200
LocalAddress=127.0.0.1 LocalAddress=127.0.0.1
LocalPort=4200 LocalPort=4200
WiresXMakeUpper=1 WiresXMakeUpper=1
WiresXCommandPassthrough=0
Daemon=0 Daemon=0
[Info] [Info]

18
YSFGateway/YSFReflectors.cpp
Unescape View File

@ -139,6 +139,7 @@ bool CYSFReflectors::load()
refl->m_port = (unsigned int)::atoi(p5); refl->m_port = (unsigned int)::atoi(p5);
refl->m_count = std::string(p6); refl->m_count = std::string(p6);
refl->m_type = YT_YSF; refl->m_type = YT_YSF;
refl->m_wiresX = false;
refl->m_name.resize(16U, ' '); refl->m_name.resize(16U, ' ');
refl->m_desc.resize(14U, ' '); refl->m_desc.resize(14U, ' ');
@ -164,6 +165,7 @@ bool CYSFReflectors::load()
refl->m_port = m_parrotPort; refl->m_port = m_parrotPort;
refl->m_count = "000"; refl->m_count = "000";
refl->m_type = YT_YSF; refl->m_type = YT_YSF;
refl->m_wiresX = false;
m_newReflectors.push_back(refl); m_newReflectors.push_back(refl);
@ -180,6 +182,7 @@ bool CYSFReflectors::load()
refl->m_port = m_YSF2DMRPort; refl->m_port = m_YSF2DMRPort;
refl->m_count = "000"; refl->m_count = "000";
refl->m_type = YT_YSF; refl->m_type = YT_YSF;
refl->m_wiresX = true;
m_newReflectors.push_back(refl); m_newReflectors.push_back(refl);
@ -196,6 +199,7 @@ bool CYSFReflectors::load()
refl->m_port = m_YSF2NXDNPort; refl->m_port = m_YSF2NXDNPort;
refl->m_count = "000"; refl->m_count = "000";
refl->m_type = YT_YSF; refl->m_type = YT_YSF;
refl->m_wiresX = true;
m_newReflectors.push_back(refl); m_newReflectors.push_back(refl);
@ -212,6 +216,7 @@ bool CYSFReflectors::load()
refl->m_port = m_YSF2P25Port; refl->m_port = m_YSF2P25Port;
refl->m_count = "000"; refl->m_count = "000";
refl->m_type = YT_YSF; refl->m_type = YT_YSF;
refl->m_wiresX = true;
m_newReflectors.push_back(refl); m_newReflectors.push_back(refl);
@ -227,12 +232,13 @@ bool CYSFReflectors::load()
std::string desc = it->second; std::string desc = it->second;
CYSFReflector* refl = new CYSFReflector; CYSFReflector* refl = new CYSFReflector;
refl->m_id = text; refl->m_id = text;
refl->m_name = name; refl->m_name = name;
refl->m_desc = desc; refl->m_desc = desc;
refl->m_port = 0U; refl->m_port = 0U;
refl->m_count = "000"; refl->m_count = "000";
refl->m_type = YT_FCS; refl->m_type = YT_FCS;
refl->m_wiresX = false;
refl->m_name.resize(16U, ' '); refl->m_name.resize(16U, ' ');
refl->m_desc.resize(14U, ' '); refl->m_desc.resize(14U, ' ');

4
YSFGateway/YSFReflectors.h
Unescape View File

@ -39,7 +39,8 @@ public:
m_count("000"), m_count("000"),
m_address(), m_address(),
m_port(0U), m_port(0U),
m_type(YT_YSF) m_type(YT_YSF),
m_wiresX(false)
{ {
} }
@ -50,6 +51,7 @@ public:
in_addr m_address; in_addr m_address;
unsigned int m_port; unsigned int m_port;
YSF_TYPE m_type; YSF_TYPE m_type;
bool m_wiresX;
}; };
class CYSFReflectors { class CYSFReflectors {

Write Preview
Loading…
Cancel
Save