g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-01-03 15:09:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make repeaterhandler aware of cached G2 Port

Browse source
This commit is contained in:
Geoffrey Merck F4FXL - KC3FRA 2018-11-18 18:41:13 +01:00
parent 9f1a1d841a
commit ee9f3e1816
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Common/CacheManager.cpp
View file

@ -54,7 +54,7 @@ CUserData* CCacheManager::findUser(const wxString& user)
if (gr == NULL)
return NULL;
return new CUserData(user, ur->getRepeater(), gr->getGateway(), gr->getAddress());
return new CUserData(user, ur->getRepeater(), gr->getGateway(), gr->getAddress(), gr->getG2Port());
}
CGatewayData* CCacheManager::findGateway(const wxString& gateway)

11
Common/CacheManager.h
View file

@ -33,11 +33,12 @@
class CUserData {
public:
CUserData(const wxString& user, const wxString& repeater, const wxString& gateway, in_addr address) :
CUserData(const wxString& user, const wxString& repeater, const wxString& gateway, in_addr address, unsigned int g2Port) :
m_user(user),
m_repeater(repeater),
m_gateway(gateway),
m_address(address)
m_address(address),
m_g2Port(g2Port)
{
}
@ -61,11 +62,17 @@ public:
return m_address;
}
unsigned int getG2Port() const
{
return m_g2Port;
}
private:
wxString m_user;
wxString m_repeater;
wxString m_gateway;
in_addr m_address;
unsigned int m_g2Port;
};
class CRepeaterData {

2
Common/GatewayCache.h
View file

@ -69,7 +69,7 @@ public:
return m_protocol;
}
unsigned int g2Port() const
unsigned int getG2Port() const
{
return m_g2Port;
}

2
Common/RepeaterHandler.cpp
View file

@ -2025,7 +2025,7 @@ void CRepeaterHandler::g2CommandHandler(const wxString& callsign, const wxString
m_g2Address = data->getAddress();
m_g2Repeater = data->getRepeater();
m_g2Gateway = data->getGateway();
header.setDestination(m_g2Address, G2_DV_PORT);
header.setDestination(m_g2Address, data->getG2Port());
header.setRepeaters(m_g2Gateway, m_g2Repeater);
m_g2Handler->writeHeader(header);