KB8PMY
/
F4KXL_DStarGateway
mirror of https://github.com/F4FXL/DStarGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#16 variable renaming

Browse Source
pull/32/head
Geoffrey Merck 5 years ago
parent 4d4f9f3a52
commit 5713e166cd
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

32
DStarGatewayThread.cpp
Unescape View File

@ -75,7 +75,7 @@ m_dummyRepeaterHandler(NULL),
m_dextraPool(NULL), m_dextraPool(NULL),
m_dplusPool(NULL), m_dplusPool(NULL),
m_dcsPool(NULL), m_dcsPool(NULL),
m_g2Handler(NULL), m_g2HandlerPool(NULL),
m_aprsWriter(NULL), m_aprsWriter(NULL),
m_irc(NULL), m_irc(NULL),
m_cache(), m_cache(),
@ -198,16 +198,16 @@ void* CDStarGatewayThread::Entry()
CLog::logError("Failed to allocate incoming DCS handler\n"); CLog::logError("Failed to allocate incoming DCS handler\n");
} }
m_g2Handler = new CG2ProtocolHandlerPool(G2_DV_PORT, m_gatewayAddress); m_g2HandlerPool = new CG2ProtocolHandlerPool(G2_DV_PORT, m_gatewayAddress);
bool ret = m_g2Handler->open(); bool ret = m_g2HandlerPool->open();
if (!ret) { if (!ret) {
CLog::logError("Could not open the G2 protocol handler"); CLog::logError("Could not open the G2 protocol handler");
delete m_g2Handler; delete m_g2HandlerPool;
m_g2Handler = NULL; m_g2HandlerPool = NULL;
} }
// Wait here until we have the essentials to run // Wait here until we have the essentials to run
while (!m_killed && (m_dextraPool == NULL || m_dplusPool == NULL || m_dcsPool == NULL || m_g2Handler == NULL || (m_icomRepeaterHandler == NULL && m_hbRepeaterHandler == NULL && m_dummyRepeaterHandler == NULL) || m_gatewayCallsign.empty())) while (!m_killed && (m_dextraPool == NULL || m_dplusPool == NULL || m_dcsPool == NULL || m_g2HandlerPool == NULL || (m_icomRepeaterHandler == NULL && m_hbRepeaterHandler == NULL && m_dummyRepeaterHandler == NULL) || m_gatewayCallsign.empty()))
::std::this_thread::sleep_for(std::chrono::milliseconds(500UL)); // 1/2 sec ::std::this_thread::sleep_for(std::chrono::milliseconds(500UL)); // 1/2 sec
if (m_killed) if (m_killed)
@ -232,7 +232,7 @@ void* CDStarGatewayThread::Entry()
loadGateways(); loadGateways();
loadAllReflectors(); loadAllReflectors();
CG2Handler::setG2ProtocolHandlerPool(m_g2Handler); CG2Handler::setG2ProtocolHandlerPool(m_g2HandlerPool);
CG2Handler::setHeaderLogger(headerLogger); CG2Handler::setHeaderLogger(headerLogger);
CDExtraHandler::setCallsign(m_gatewayCallsign); CDExtraHandler::setCallsign(m_gatewayCallsign);
@ -250,7 +250,7 @@ void* CDStarGatewayThread::Entry()
CDCSHandler::setHeaderLogger(headerLogger); CDCSHandler::setHeaderLogger(headerLogger);
CRepeaterHandler::setLocalAddress(m_gatewayAddress); CRepeaterHandler::setLocalAddress(m_gatewayAddress);
CRepeaterHandler::setG2HandlerPool(m_g2Handler); CRepeaterHandler::setG2HandlerPool(m_g2HandlerPool);
if (m_irc != NULL) if (m_irc != NULL)
CRepeaterHandler::setIRC(m_irc); CRepeaterHandler::setIRC(m_irc);
@ -284,7 +284,7 @@ void* CDStarGatewayThread::Entry()
#ifdef USE_STARNET #ifdef USE_STARNET
CStarNetHandler::setCache(&m_cache); CStarNetHandler::setCache(&m_cache);
CStarNetHandler::setGateway(m_gatewayCallsign); CStarNetHandler::setGateway(m_gatewayCallsign);
CStarNetHandler::setG2HandlerPool(m_g2Handler); CStarNetHandler::setG2HandlerPool(m_g2HandlerPool);
if (m_irc != NULL) if (m_irc != NULL)
CStarNetHandler::setIRC(m_irc); CStarNetHandler::setIRC(m_irc);
@ -453,8 +453,8 @@ void* CDStarGatewayThread::Entry()
m_dcsPool->close(); m_dcsPool->close();
delete m_dcsPool; delete m_dcsPool;
m_g2Handler->close(); m_g2HandlerPool->close();
delete m_g2Handler; delete m_g2HandlerPool;
if (m_irc != NULL) { if (m_irc != NULL) {
m_irc->close(); m_irc->close();
@ -788,9 +788,9 @@ void CDStarGatewayThread::processIrcDDB()
if(!res) if(!res)
return; return;
if(m_g2Handler != nullptr) { if(m_g2HandlerPool != nullptr) {
CLog::logInfo("%s wants to G2 route to us, punching UDP Holes through NAT", address.c_str()); CLog::logInfo("%s wants to G2 route to us, punching UDP Holes through NAT", address.c_str());
m_g2Handler->traverseNat(address); m_g2HandlerPool->traverseNat(address);
} }
else { else {
CLog::logInfo("%s wants to G2 route to us, but G2 is disabled", address.c_str()); CLog::logInfo("%s wants to G2 route to us, but G2 is disabled", address.c_str());
@ -1096,11 +1096,11 @@ void CDStarGatewayThread::processDCS()
void CDStarGatewayThread::processG2() void CDStarGatewayThread::processG2()
{ {
for (;;) { for (;;) {
G2_TYPE type = m_g2Handler->read(); G2_TYPE type = m_g2HandlerPool->read();
switch (type) { switch (type) {
case GT_HEADER: { case GT_HEADER: {
CHeaderData* header = m_g2Handler->readHeader(); CHeaderData* header = m_g2HandlerPool->readHeader();
if (header != NULL) { if (header != NULL) {
// CLog::logInfo("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()); // CLog::logInfo("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); CG2Handler::process(*header);
@ -1110,7 +1110,7 @@ void CDStarGatewayThread::processG2()
break; break;
case GT_AMBE: { case GT_AMBE: {
CAMBEData* data = m_g2Handler->readAMBE(); CAMBEData* data = m_g2HandlerPool->readAMBE();
if (data != NULL) { if (data != NULL) {
CG2Handler::process(*data); CG2Handler::process(*data);
delete data; delete data;

2
DStarGatewayThread.h
Unescape View File

@ -102,7 +102,7 @@ private:
CDExtraProtocolHandlerPool* m_dextraPool; CDExtraProtocolHandlerPool* m_dextraPool;
CDPlusProtocolHandlerPool* m_dplusPool; CDPlusProtocolHandlerPool* m_dplusPool;
CDCSProtocolHandlerPool* m_dcsPool; CDCSProtocolHandlerPool* m_dcsPool;
CG2ProtocolHandlerPool* m_g2Handler; CG2ProtocolHandlerPool* m_g2HandlerPool;
CAPRSHandler* m_aprsWriter; CAPRSHandler* m_aprsWriter;
CIRCDDB* m_irc; CIRCDDB* m_irc;
CCacheManager m_cache; CCacheManager m_cache;

14
RepeaterHandler.cpp
Unescape View File

@ -45,7 +45,7 @@ unsigned int CRepeaterHandler::m_maxRepeaters = 0U;
CRepeaterHandler** CRepeaterHandler::m_repeaters = NULL; CRepeaterHandler** CRepeaterHandler::m_repeaters = NULL;
std::string CRepeaterHandler::m_localAddress; std::string CRepeaterHandler::m_localAddress;
CG2ProtocolHandlerPool* CRepeaterHandler::m_g2Handler = NULL; CG2ProtocolHandlerPool* CRepeaterHandler::m_g2HandlerPool = NULL;
CIRCDDB* CRepeaterHandler::m_irc = NULL; CIRCDDB* CRepeaterHandler::m_irc = NULL;
CCacheManager* CRepeaterHandler::m_cache = NULL; CCacheManager* CRepeaterHandler::m_cache = NULL;
std::string CRepeaterHandler::m_gateway; std::string CRepeaterHandler::m_gateway;
@ -305,7 +305,7 @@ void CRepeaterHandler::setG2HandlerPool(CG2ProtocolHandlerPool* handler)
{ {
assert(handler != NULL); assert(handler != NULL);
m_g2Handler = handler; m_g2HandlerPool = handler;
} }
void CRepeaterHandler::setCache(CCacheManager* cache) void CRepeaterHandler::setCache(CCacheManager* cache)
@ -883,7 +883,7 @@ void CRepeaterHandler::processRepeater(CAMBEData& data)
case G2_OK: case G2_OK:
data.setDestination(m_g2Address, G2_DV_PORT); data.setDestination(m_g2Address, G2_DV_PORT);
m_g2Handler->writeAMBE(data); m_g2HandlerPool->writeAMBE(data);
if (data.isEnd()) { if (data.isEnd()) {
m_repeaterId = 0x00U; m_repeaterId = 0x00U;
@ -1283,7 +1283,7 @@ void CRepeaterHandler::resolveUserInt(const std::string& user, const std::string
m_g2Header->setDestination(m_g2Address, G2_DV_PORT); m_g2Header->setDestination(m_g2Address, G2_DV_PORT);
m_g2Header->setRepeaters(m_g2Gateway, m_g2Repeater); m_g2Header->setRepeaters(m_g2Gateway, m_g2Repeater);
m_g2Handler->writeHeader(*m_g2Header); m_g2HandlerPool->writeHeader(*m_g2Header);
delete m_g2Header; delete m_g2Header;
m_g2Status = G2_OK; m_g2Status = G2_OK;
@ -1315,7 +1315,7 @@ void CRepeaterHandler::resolveRepeaterInt(const std::string& repeater, const std
m_g2Header->setDestination(m_g2Address, G2_DV_PORT); m_g2Header->setDestination(m_g2Address, G2_DV_PORT);
m_g2Header->setRepeaters(m_g2Gateway, m_g2Repeater); m_g2Header->setRepeaters(m_g2Gateway, m_g2Repeater);
m_g2Handler->writeHeader(*m_g2Header); m_g2HandlerPool->writeHeader(*m_g2Header);
delete m_g2Header; delete m_g2Header;
m_g2Status = G2_OK; m_g2Status = G2_OK;
@ -2072,7 +2072,7 @@ void CRepeaterHandler::g2CommandHandler(const std::string& callsign, const std::
m_g2Gateway = data->getGateway(); m_g2Gateway = data->getGateway();
header.setDestination(m_g2Address, G2_DV_PORT); header.setDestination(m_g2Address, G2_DV_PORT);
header.setRepeaters(m_g2Gateway, m_g2Repeater); header.setRepeaters(m_g2Gateway, m_g2Repeater);
m_g2Handler->writeHeader(header); m_g2HandlerPool->writeHeader(header);
delete data; delete data;
} }
} else if (string_right(callsign, 1) != "L" && string_right(callsign, 1) != "U") { } else if (string_right(callsign, 1) != "L" && string_right(callsign, 1) != "U") {
@ -2115,7 +2115,7 @@ void CRepeaterHandler::g2CommandHandler(const std::string& callsign, const std::
m_g2Gateway = data->getGateway(); m_g2Gateway = data->getGateway();
header.setDestination(m_g2Address, G2_DV_PORT); header.setDestination(m_g2Address, G2_DV_PORT);
header.setRepeaters(m_g2Gateway, m_g2Repeater); header.setRepeaters(m_g2Gateway, m_g2Repeater);
m_g2Handler->writeHeader(header); m_g2HandlerPool->writeHeader(header);
delete data; delete data;
} }

2
RepeaterHandler.h
Unescape View File

@ -168,7 +168,7 @@ private:
static CRepeaterHandler** m_repeaters; static CRepeaterHandler** m_repeaters;
static std::string m_localAddress; static std::string m_localAddress;
static CG2ProtocolHandlerPool* m_g2Handler; static CG2ProtocolHandlerPool* m_g2HandlerPool;
static CCacheManager* m_cache; static CCacheManager* m_cache;
static std::string m_gateway; static std::string m_gateway;
static CIRCDDB* m_irc; static CIRCDDB* m_irc;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.