g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-04-05 14:25:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge pull request #16 from F4FXL/UDPHolePunching"

Browse source 
This reverts commit cc2c68aff9, reversing
changes made to 05e66c15d1.
This commit is contained in:
Jonathan Naylor 2019-01-15 20:50:58 +00:00
parent fe42c30df0
commit d87d121c8d
16 changed files with 53 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

16
StarNetServer/StarNetServerThread.cpp
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(incomingAddress, incomingPort);
G2_TYPE type = m_g2Handler->read();
switch (type) {
case GT_NONE:
return;
case GT_HEADER: {
CHeaderData* header = m_g2Handler->readHeader(incomingAddress, incomingPort);
CHeaderData* header = m_g2Handler->readHeader();
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,17 +523,13 @@ void CStarNetServerThread::processG2()
break;
case GT_AMBE: {
CAMBEData* data = m_g2Handler->readAMBE(incomingAddress, incomingPort);
CAMBEData* data = m_g2Handler->readAMBE();
if (data != NULL) {
CG2Handler::process(*data);
delete data;
}
}
break;
default:
//Probably someone punching a UDP hole to us
return;
}
}
}