oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-04-04 22:07:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverses PR #306, which broke FCS Remote/Dynamic linking

Browse source
This commit is contained in:
Chipster 2023-10-04 11:11:56 -05:00
parent 7cbac3bdab
commit bf6577e2ca
8 changed files with 12 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

33
YSFGateway/YSFReflectors.cpp
View file

@ -36,8 +36,6 @@ m_YSF2NXDNAddress(),
m_YSF2NXDNPort(0U),
m_YSF2P25Address(),
m_YSF2P25Port(0U),
m_YSFDirectAddress(),
m_YSFDirectPort(0U),
m_fcsRooms(),
m_newReflectors(),
m_currReflectors(),
@ -102,12 +100,6 @@ void CYSFReflectors::setYSF2P25(const std::string& address, unsigned short port)
m_YSF2P25Port = port;
}
void CYSFReflectors::setYSFDirect(const std::string& address, unsigned short port)
{
m_YSFDirectAddress = address;
m_YSFDirectPort = port;
}
void CYSFReflectors::addFCSRoom(const std::string& id, const std::string& name)
{
m_fcsRooms.push_back(std::make_pair(id, name));
@ -260,31 +252,6 @@ bool CYSFReflectors::load()
}
}
// Add the YSFDirect entry
if (m_YSFDirectPort > 0U) {
sockaddr_storage addr;
unsigned int addrLen;
if (CUDPSocket::lookup(m_YSFDirectAddress, m_YSFDirectPort, addr, addrLen) == 0) {
CYSFReflector* refl = new CYSFReflector;
refl->m_id = "00006";
refl->m_name = "YSFDIRECT ";
refl->m_desc = "Link YSFDirect";
refl->m_addr = addr;
refl->m_addrLen = addrLen;
refl->m_count = "000";
refl->m_type = YT_YSF;
refl->m_wiresX = true;
m_newReflectors.push_back(refl);
LogInfo("Loaded YSFDirect");
} else {
LogWarning("Unable to resolve the address of YSFDirect");
}
}
unsigned int id = 9U;
for (std::vector<std::pair<std::string, std::string>>::const_iterator it1 = m_fcsRooms.cbegin(); it1 != m_fcsRooms.cend(); ++it1) {
bool used;