MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2026-02-04 22:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into icom

Browse Source
This commit is contained in:
Jonathan Naylor
2018-03-22 07:14:09 +00:00
parent d1b389d5ce 52ec2f205c
commit 48300c0aa8
6 changed files with 162 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
MMDVMHost.cpp
View File

@@ -308,6 +308,32 @@ int CMMDVMHost::run()
return 1;
}
in_addr transparentAddress;
unsigned int transparentPort = 0U;
CUDPSocket* transparentSocket = NULL;
if (m_conf.getTransparentEnabled()) {
std::string remoteAddress = m_conf.getTransparentRemoteAddress();
unsigned int remotePort = m_conf.getTransparentRemotePort();
unsigned int localPort = m_conf.getTransparentLocalPort();
LogInfo("Transparent Data");
LogInfo(" Remote Address: %s", remoteAddress.c_str());
LogInfo(" Remote Port: %u", remotePort);
LogInfo(" Local Port: %u", localPort);
transparentAddress = CUDPSocket::lookup(remoteAddress);
transparentPort = remotePort;
transparentSocket = new CUDPSocket(localPort);
ret = transparentSocket->open();
if (!ret) {
LogWarning("Could not open the Transparent data socket, disabling");
delete transparentSocket;
transparentSocket = NULL;
}
}
if (m_conf.getCWIdEnabled()) {
unsigned int time = m_conf.getCWIdTime();
m_cwCallsign = m_conf.getCWIdCallsign();
@@ -686,6 +712,10 @@ int CMMDVMHost::run()
}
}
len = m_modem->readTransparentData(data);
if (transparentSocket != NULL && len > 0U)
transparentSocket->write(data, len, transparentAddress, transparentPort);
if (m_modeTimer.isRunning() && m_modeTimer.hasExpired())
setMode(MODE_IDLE);
@@ -811,6 +841,14 @@ int CMMDVMHost::run()
}
}
if (transparentSocket != NULL) {
in_addr address;
unsigned int port = 0U;
len = transparentSocket->read(data, 200U, address, port);
if (len > 0U)
m_modem->writeTransparentData(data, len);
}
unsigned int ms = stopWatch.elapsed();
stopWatch.start();
@@ -925,6 +963,11 @@ int CMMDVMHost::run()
delete m_nxdnNetwork;
}
if (transparentSocket != NULL) {
transparentSocket->close();
delete transparentSocket;
}
delete dstar;
delete dmr;
delete ysf;