g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-04-04 22:07: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

29
Common/GatewayCache.h
View file

@ -35,10 +35,9 @@
class CGatewayRecord {
public:
CGatewayRecord(const wxString& gateway, in_addr address, unsigned int g2Port, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock) :
CGatewayRecord(const wxString& gateway, in_addr address, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock) :
m_gateway(gateway),
m_address(address),
m_g2Port(g2Port),
m_protocol(DP_UNKNOWN),
m_addrLock(addrLock),
m_protoLock(false)
@ -54,11 +53,6 @@ public:
return m_gateway;
}
void setGateway(const wxString& gateway)
{
m_gateway = gateway;
}
in_addr getAddress() const
{
return m_address;
@ -69,11 +63,6 @@ public:
return m_protocol;
}
unsigned int getG2Port() const
{
return m_g2Port;
}
void setData(in_addr address, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock)
{
if (!m_addrLock) {
@ -89,20 +78,9 @@ public:
}
}
void setG2Data(in_addr address, unsigned int g2Port)
{
if (!m_addrLock) {
m_address = address;
}
m_g2Port = g2Port;
}
private:
wxString m_gateway;
in_addr m_address;
//the incoming G2 port, keep track of it and use it to answer back instead of the default one. This helps us defeat NAT with no port forwarding to G2_DVPORT
unsigned int m_g2Port;
in_addr m_address;
DSTAR_PROTOCOL m_protocol;
bool m_addrLock;
bool m_protoLock;
@ -118,13 +96,10 @@ public:
CGatewayRecord* find(const wxString& gateway);
void update(const wxString& gateway, const wxString& address, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock);
void updateG2(const wxString& gateway, in_addr address, unsigned int g2Port);
unsigned int getCount() const;
private:
CGatewayRecord* findByAddress(in_addr address);
CGatewayCache_t m_cache;
};