Unfix address and port

This commit is contained in:
Geoffrey Merck F4FXL - KC3FRA 2018-11-17 18:18:28 +01:00
parent 05e66c15d1
commit 21b1b967be
5 changed files with 33 additions and 26 deletions

View file

@ -505,15 +505,15 @@ void CStarNetServerThread::processDCS()
void CStarNetServerThread::processG2()
{
in_addr incomingAddress;
unsigned int incomingPort;
for (;;) {
G2_TYPE type = m_g2Handler->read();
G2_TYPE type = m_g2Handler->read(incomingAddress, incomingPort);
switch (type) {
case GT_NONE:
return;
case GT_HEADER: {
CHeaderData* header = m_g2Handler->readHeader();
CHeaderData* header = m_g2Handler->readHeader(incomingAddress, incomingPort);
if (header != NULL) {
// wxLogMessage(wxT("G2 header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X"), header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str(), header->getFlag1(), header->getFlag2(), header->getFlag3());
CG2Handler::process(*header);
@ -523,13 +523,17 @@ void CStarNetServerThread::processG2()
break;
case GT_AMBE: {
CAMBEData* data = m_g2Handler->readAMBE();
CAMBEData* data = m_g2Handler->readAMBE(incomingAddress, incomingPort);
if (data != NULL) {
CG2Handler::process(*data);
delete data;
}
}
break;
default:
//Probably someone punching a UDP hole to us
return;
}
}
}