oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2025-12-06 05:32:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into IPv6

Browse source
This commit is contained in:
Jonathan Naylor 2020-09-06 15:25:13 +01:00
parent 470ea37c0e 8c5d4e161d
commit c3944c9a05
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
YSFGateway/FCSNetwork.cpp
View file

@ -199,14 +199,14 @@ void CFCSNetwork::clock(unsigned int ms)
LogMessage("Linked to %s", m_print.c_str()); LogMessage("Linked to %s", m_print.c_str());
m_state = FCS_LINKED; m_state = FCS_LINKED;
writeInfo(); writeInfo();
writeOptions(); writeOptions(m_print);
} }
if (length == 10 && m_state == FCS_LINKING) { if (length == 10 && m_state == FCS_LINKING) {
LogMessage("Linked to %s", m_print.c_str()); LogMessage("Linked to %s", m_print.c_str());
m_state = FCS_LINKED; m_state = FCS_LINKED;
writeInfo(); writeInfo();
writeOptions(); writeOptions(m_print);
} }
if (length == 7 || length == 10 || length == 130) { if (length == 7 || length == 10 || length == 130) {
@ -284,7 +284,7 @@ void CFCSNetwork::writePing()
m_socket.write(m_ping, 25U, m_addr, m_addrLen); m_socket.write(m_ping, 25U, m_addr, m_addrLen);
} }
void CFCSNetwork::writeOptions() void CFCSNetwork::writeOptions(const std::string& reflector)
{ {
if (m_state != FCS_LINKED) if (m_state != FCS_LINKED)
return; return;
@ -293,7 +293,8 @@ void CFCSNetwork::writeOptions()
return; return;
::memset(m_options + 14U, 0x20U, 36U); ::memset(m_options + 14U, 0x20U, 36U);
::memcpy(m_options + 14U, m_opt.c_str(), m_opt.size()); ::memcpy(m_options + 4U, (reflector.substr(0,6)+reflector.substr(7,2)).c_str(), 8U);
::memcpy(m_options + 12U, m_opt.c_str(), m_opt.size());
if (m_debug) if (m_debug)
CUtils::dump(1U, "FCS Network Options Sent", m_options, 50U); CUtils::dump(1U, "FCS Network Options Sent", m_options, 50U);

2
YSFGateway/FCSNetwork.h
View file

@ -75,7 +75,7 @@ private:
CTimer m_resetTimer; CTimer m_resetTimer;
FCS_STATE m_state; FCS_STATE m_state;
void writeOptions(); void writeOptions(const std::string& reflector);
void writeInfo(); void writeInfo();
void writePing(); void writePing();
}; };