dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Reset outgoing DG-IDs to zero for compatibility reasons.

Browse source
This commit is contained in:
Jonathan Naylor 2020-08-20 09:23:14 +01:00
parent 70f956a0df
commit e6a196f3a7
9 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DGIdGateway/DGIdGateway.cpp
View file

@ -370,8 +370,13 @@ int CDGIdGateway::run()
if (currentDGId != 0U && dgIdNetwork[currentDGId] != NULL) {
// Only allow the wanted modes through
if ((dgIdNetwork[currentDGId]->m_modes & dt) != 0U)
dgIdNetwork[currentDGId]->write(currentDGId, buffer);
if ((dgIdNetwork[currentDGId]->m_modes & dt) != 0U) {
// Set the DG-ID to zero for compatibility
fich.setDGId(0U);
fich.encode(buffer + 35U);
dgIdNetwork[currentDGId]->write(currentDGId, dt, buffer);
}
inactivityTimer.setTimeout(dgIdNetwork[currentDGId]->m_rfHangTime);
inactivityTimer.start();
@ -396,7 +401,7 @@ int CDGIdGateway::run()
fich.setDGId(i);
fich.encode(buffer + 35U);
rptNetwork.write(0U, buffer);
rptNetwork.write(0U, 0U, buffer);
inactivityTimer.setTimeout(dgIdNetwork[i]->m_netHangTime);
inactivityTimer.start();

2
DGIdGateway/DGIdNetwork.h
View file

@ -28,7 +28,7 @@ public:
virtual void link() = 0;
virtual void write(unsigned int dgId, const unsigned char* data) = 0;
virtual void write(unsigned int dgId, unsigned char dt, const unsigned char* data) = 0;
virtual unsigned int read(unsigned int dgid, unsigned char* data) = 0;

2
DGIdGateway/FCSNetwork.cpp
View file

@ -81,7 +81,7 @@ bool CFCSNetwork::open()
return m_socket.open();
}
void CFCSNetwork::write(unsigned int dgid, const unsigned char* data)
void CFCSNetwork::write(unsigned int dgid, unsigned char dt, const unsigned char* data)
{
assert(data != NULL);

2
DGIdGateway/FCSNetwork.h
View file

@ -44,7 +44,7 @@ public:
virtual void link();
virtual void write(unsigned int dgId, const unsigned char* data);
virtual void write(unsigned int dgId, unsigned char dt, const unsigned char* data);
virtual unsigned int read(unsigned int dgId, unsigned char* data);

2
DGIdGateway/IMRSNetwork.cpp
View file

@ -55,7 +55,7 @@ bool CIMRSNetwork::open()
return m_socket.open();
}
void CIMRSNetwork::write(unsigned int dgId, const unsigned char* data)
void CIMRSNetwork::write(unsigned int dgId, unsigned char dt, const unsigned char* data)
{
assert(data != NULL);

2
DGIdGateway/IMRSNetwork.h
View file

@ -58,7 +58,7 @@ public:
virtual void link();
virtual void write(unsigned int dgId, const unsigned char* data);
virtual void write(unsigned int dgId, unsigned char dt, const unsigned char* data);
virtual unsigned int read(unsigned int dgId, unsigned char* data);

2
DGIdGateway/Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H)
#define VERSION_H
const char* VERSION = "20200819";
const char* VERSION = "20200820";
#endif

2
DGIdGateway/YSFNetwork.cpp
View file

@ -93,7 +93,7 @@ bool CYSFNetwork::open()
return m_socket.open();
}
void CYSFNetwork::write(unsigned int dgid, const unsigned char* data)
void CYSFNetwork::write(unsigned int dgid, unsigned char dt, const unsigned char* data)
{
assert(data != NULL);

2
DGIdGateway/YSFNetwork.h
View file

@ -38,7 +38,7 @@ public:
virtual void link();
virtual void write(unsigned int dgId, const unsigned char* data);
virtual void write(unsigned int dgId, unsigned char dt, const unsigned char* data);
virtual unsigned int read(unsigned int dgId, unsigned char* data);