diff --git a/README.md b/README.md index 914af52..9f3b35a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The sources are published under GPL Licenses. - In D-Star, Icom-G3Terminal, DExtra, DPLus and DCS - In DMR, DMRPlus (dongle) and DMRMmdvm -- In C4FM, YSF, Wires-X and IRMS +- In C4FM, YSF, Wires-X and IMRS - XLX Interlink protocol # Usage @@ -136,7 +136,7 @@ XLX Server requires the following ports to be open and forwarded properly for in - UDP port 10101 - 10199 (AMBE transcoding port) - UDP port 12345 - 12346 (Icom Terminal presence and request port) - UDP port 40000 (Icom Terminal dv port) - - UDP port 21110 (Yaesu IRMS protocol) + - UDP port 21110 (Yaesu IMRS protocol) # YSF Master Server diff --git a/src/cimrsprotocol.cpp b/src/cimrsprotocol.cpp index 4ad5fe3..1062646 100644 --- a/src/cimrsprotocol.cpp +++ b/src/cimrsprotocol.cpp @@ -126,10 +126,9 @@ void CImrsProtocol::Task(void) EncodePongPacket(&Buffer); m_Socket.Send(Buffer, Ip, IMRS_PORT); - // and our turn + // our turn EncodePingPacket(&Buffer); m_Socket.Send(Buffer, Ip, IMRS_PORT); - } else if ( IsValidConnectPacket(Buffer, &Callsign) ) { @@ -327,6 +326,9 @@ void CImrsProtocol::HandleQueue(void) m_Socket.Send(buffer, client->GetIp(), IMRS_PORT); //std::cout << "sending " << buffer.size() << " bytes to " << client->GetIp() << std::endl; } + // as DR-2X doesn't seems to respond to keepalives when receiving a stream + // tickle the keepalive timer here + client->Alive(); } g_Reflector.ReleaseClients(); } diff --git a/src/main.h b/src/main.h index 3752ea7..193fc12 100644 --- a/src/main.h +++ b/src/main.h @@ -53,7 +53,7 @@ #define VERSION_MAJOR 2 #define VERSION_MINOR 5 -#define VERSION_REVISION 0 +#define VERSION_REVISION 1 // global ------------------------------------------------------