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

Complete loading of config and starting of thread

Browse Source
master
Geoffrey Merck 4 years ago
parent b41051164a
commit eca0f43671
3 changed files with 96 additions and 61 deletions
Show Stats Download Patch File Download Diff File

117
DStarGatewayApp.cpp
Unescape View File

@ -93,7 +93,7 @@ bool CDStarGatewayApp::createThread()
CDStarGatewayConfig config(m_configFile); CDStarGatewayConfig config(m_configFile);
if(!config.load()) { if(!config.load()) {
CLog::logError("FATAL: Invalid configuration"); CLog::logFatal("Invalid configuration, aborting");
return false; return false;
} }
@ -107,6 +107,7 @@ bool CDStarGatewayApp::createThread()
config.getGateway(gatewayConfig); config.getGateway(gatewayConfig);
m_thread->setGateway(gatewayConfig.type, gatewayConfig.callsign, gatewayConfig.address); m_thread->setGateway(gatewayConfig.type, gatewayConfig.callsign, gatewayConfig.address);
m_thread->setLanguage(gatewayConfig.language); m_thread->setLanguage(gatewayConfig.language);
m_thread->setLocation(gatewayConfig.latitude, gatewayConfig.longitude);
// Setup APRS // Setup APRS
TAPRS aprsConfig; TAPRS aprsConfig;
@ -123,35 +124,16 @@ bool CDStarGatewayApp::createThread()
} }
} }
// Setup ircddb
std::vector<CIRCDDB *> clients;
for(unsigned int i=0; i < config.getIrcDDBCount(); i++) {
TircDDB ircDDBConfig;
config.getIrcDDB(i, ircDDBConfig);
CLog::logInfo("ircDDB Network %d set to %s user: %s, Quadnet %d", i + 1,ircDDBConfig.hostname.c_str(), ircDDBConfig.username.c_str(), ircDDBConfig.isQuadNet);
CIRCDDB * ircDDB = new CIRCDDBClient(ircDDBConfig.hostname, 9007U, ircDDBConfig.username, ircDDBConfig.password, std::string("DStarGateway") + std::string("-") + VERSION, gatewayConfig.address, ircDDBConfig.isQuadNet);
clients.push_back(ircDDB);
}
CIRCDDBMultiClient* multiClient = new CIRCDDBMultiClient(clients);
bool res = multiClient->open();
if (!res) {
CLog::logInfo("Cannot initialise the ircDDB protocol handler\n");
return false;
}
m_thread->setIRC(multiClient);
// Setup the repeaters // Setup the repeaters
if(config.getRepeaterCount() == 0U) { if(config.getRepeaterCount() == 0U) {
CLog::logInfo("No repeater configured\n"); CLog::logInfo("No repeater configured\n");
return false; return false;
} }
CRepeaterHandlerFactory repeaterProtocolFactory; bool ddEnabled = false;
CRepeaterProtocolHandlerFactory repeaterProtocolFactory;
for(unsigned int i = 0U; i < config.getRepeaterCount(); i++) { for(unsigned int i = 0U; i < config.getRepeaterCount(); i++) {
TRepeater rptrConfig; TRepeater rptrConfig;
config.getRepeater(i, rptrConfig); config.getRepeater(i, rptrConfig);
m_thread->addRepeater(rptrConfig.callsign, m_thread->addRepeater(rptrConfig.callsign,
rptrConfig.band, rptrConfig.band,
rptrConfig.address, rptrConfig.address,
@ -173,39 +155,68 @@ bool CDStarGatewayApp::createThread()
rptrConfig.band1, rptrConfig.band1,
rptrConfig.band2, rptrConfig.band2,
rptrConfig.band3); rptrConfig.band3);
}
if(!ddEnabled) ddEnabled = rptrConfig.band.length() > 1U;
}
m_thread->setDDModeEnabled(ddEnabled);
CLog::logInfo("DD Mode enabled: %d", int(ddEnabled));
// for (unsigned int i=0; i<config.getModCount(); i++) { // Setup ircddb
// std::string band, callsign, logoff, info, permanent, reflector; std::vector<CIRCDDB *> clients;
// unsigned int usertimeout; for(unsigned int i=0; i < config.getIrcDDBCount(); i++) {
// CALLSIGN_SWITCH callsignswitch; TircDDB ircDDBConfig;
// bool txmsgswitch; config.getIrcDDB(i, ircDDBConfig);
CLog::logInfo("ircDDB Network %d set to %s user: %s, Quadnet %d", i + 1,ircDDBConfig.hostname.c_str(), ircDDBConfig.username.c_str(), ircDDBConfig.isQuadNet);
// config.getGroup(i, band, callsign, logoff, info, permanent, usertimeout, callsignswitch, txmsgswitch, reflector); CIRCDDB * ircDDB = new CIRCDDBClient(ircDDBConfig.hostname, 9007U, ircDDBConfig.username, ircDDBConfig.password, std::string("DStarGateway") + std::string("-") + VERSION, gatewayConfig.address, ircDDBConfig.isQuadNet);
clients.push_back(ircDDB);
// if (callsign.size() && isalnum(callsign[0])) { }
// std::string repeater(CallSign); CIRCDDBMultiClient* multiClient = new CIRCDDBMultiClient(clients);
// repeater.resize(7, ' '); bool res = multiClient->open();
// repeater.push_back(band[0]); if (!res) {
// m_thread->addGroup(callsign, logoff, repeater, info, permanent, usertimeout, callsignswitch, txmsgswitch, reflector); CLog::logInfo("Cannot initialise the ircDDB protocol handler\n");
// CLog::logInfo("Group %d: %s/%s using %s, \"%s\", perm: %s, timeout: %u mins, c/s switch: %s, msg switch: %s, Linked: %s\n", return false;
// i, callsign.c_str(), logoff.c_str(), repeater.c_str(), info.c_str(), permanent.c_str(), usertimeout, }
// SCS_GROUP_CALLSIGN==callsignswitch ? "Group" : "User", txmsgswitch ? "true" : "false", reflector.c_str()); m_thread->setIRC(multiClient);
// }
// }
// bool remoteEnabled;
// std::string remotePassword;
// unsigned int remotePort;
// config.getRemote(remoteEnabled, remotePassword, remotePort);
// CLog::logInfo("Remote enabled set to %d, port set to %u\n", int(remoteEnabled), remotePort);
// m_thread->setRemote(remoteEnabled, remotePassword, remotePort);
// m_thread->setAddress(address);
// m_thread->setCallsign(CallSign);
// return true; // Setup Dextra
TDextra dextraConfig;
config.getDExtra(dextraConfig);
CLog::logInfo("DExtra enabled: %d, max. dongles: %u", int(dextraConfig.enabled), dextraConfig.maxDongles);
m_thread->setDExtra(dextraConfig.enabled, dextraConfig.maxDongles);
// Setup DCS
TDCS dcsConfig;
config.getDCS(dcsConfig);
CLog::logInfo("DCS enabled: %d", int(dcsConfig.enabled));
m_thread->setDCS(dcsConfig.enabled);
// Setup DPlus
TDplus dplusConfig;
config.getDPlus(dplusConfig);
CLog::logInfo("D-Plus enabled: %d, max. dongles; %u, login: %s", int(dplusConfig.enabled), dplusConfig.maxDongles, dplusConfig.login.c_str());
m_thread->setDPlus(dplusConfig.enabled, dplusConfig.maxDongles, dplusConfig.login);
// Setup XLX
TXLX xlxConfig;
config.getXLX(xlxConfig);
CLog::logInfo("XLX enabled: %d, Hosts file url: %s", int(xlxConfig.enabled), xlxConfig.url.c_str());
m_thread->setXLX(xlxConfig.enabled, xlxConfig.url);
// Setup Remote
TRemote remoteConfig;
config.getRemote(remoteConfig);
CLog::logInfo("Remote enabled: %d, port %u", int(remoteConfig.enabled), remoteConfig.port);
m_thread->setRemote(remoteConfig.enabled, remoteConfig.password, remoteConfig.port);
// Get final things ready
m_thread->setIcomRepeaterHandler(repeaterProtocolFactory.getIcomProtocolHandler());
m_thread->setHBRepeaterHandler(repeaterProtocolFactory.getHBProtocolHandler());
m_thread->setDummyRepeaterHandler(repeaterProtocolFactory.getDummyProtocolHandler());
m_thread->setInfoEnabled(true);
m_thread->setEchoEnabled(true);
m_thread->setDTMFEnabled(true);
m_thread->setLog(true);
return true;
} }

26
RepeaterProtocolHandlerFactory.cpp
Unescape View File

@ -19,15 +19,16 @@
#include "RepeaterProtocolHandlerFactory.h" #include "RepeaterProtocolHandlerFactory.h"
#include "Log.h" #include "Log.h"
CRepeaterHandlerFactory::CRepeaterHandlerFactory() : CRepeaterProtocolHandlerFactory::CRepeaterProtocolHandlerFactory() :
m_icomRepeaterHandler(NULL), m_icomRepeaterHandler(NULL),
m_hbRepeaterHandler(NULL), m_hbRepeaterHandler(NULL),
m_dummyRepeaterHandler(NULL) m_dummyRepeaterHandler(NULL),
m_icomCount(0U)
{ {
} }
IRepeaterProtocolHandler * CRepeaterHandlerFactory::getRepeaterProtocolHandler(HW_TYPE hwType, const TGateway & gatewayConfig, const std::string & repeaterAddress, unsigned int repeaterPort) IRepeaterProtocolHandler * CRepeaterProtocolHandlerFactory::getRepeaterProtocolHandler(HW_TYPE hwType, const TGateway & gatewayConfig, const std::string & repeaterAddress, unsigned int repeaterPort)
{ {
IRepeaterProtocolHandler * handler = NULL; IRepeaterProtocolHandler * handler = NULL;
switch (hwType) switch (hwType)
@ -44,6 +45,10 @@ IRepeaterProtocolHandler * CRepeaterHandlerFactory::getRepeaterProtocolHandler(H
m_icomRepeaterHandler = icomRepeaterHandler; m_icomRepeaterHandler = icomRepeaterHandler;
} }
handler = m_icomRepeaterHandler; handler = m_icomRepeaterHandler;
if(m_icomRepeaterHandler != NULL)
m_icomRepeaterHandler->setCount(++m_icomCount);
break; break;
case HW_HOMEBREW: case HW_HOMEBREW:
if(m_hbRepeaterHandler == NULL) { if(m_hbRepeaterHandler == NULL) {
@ -77,3 +82,18 @@ IRepeaterProtocolHandler * CRepeaterHandlerFactory::getRepeaterProtocolHandler(H
return handler; return handler;
} }
CIcomRepeaterProtocolHandler * CRepeaterProtocolHandlerFactory::getIcomProtocolHandler()
{
return m_icomRepeaterHandler;
}
CHBRepeaterProtocolHandler * CRepeaterProtocolHandlerFactory::getHBProtocolHandler()
{
return m_hbRepeaterHandler;
}
CDummyRepeaterProtocolHandler * CRepeaterProtocolHandlerFactory::getDummyProtocolHandler()
{
return m_dummyRepeaterHandler;
}

14
RepeaterProtocolHandlerFactory.h
Unescape View File

@ -26,15 +26,19 @@
#include "RepeaterProtocolHandler.h" #include "RepeaterProtocolHandler.h"
#include "DStarGatewayConfig.h" #include "DStarGatewayConfig.h"
class CRepeaterHandlerFactory class CRepeaterProtocolHandlerFactory
{ {
public: public:
CRepeaterHandlerFactory(); CRepeaterProtocolHandlerFactory();
IRepeaterProtocolHandler * getRepeaterProtocolHandler(HW_TYPE hwType, const TGateway & gatewyaConfig, const std::string & repeaterAddress, unsigned int repeaterPort); IRepeaterProtocolHandler * getRepeaterProtocolHandler(HW_TYPE hwType, const TGateway & gatewyaConfig, const std::string & repeaterAddress, unsigned int repeaterPort);
CIcomRepeaterProtocolHandler * getIcomProtocolHandler();
CHBRepeaterProtocolHandler * getHBProtocolHandler();
CDummyRepeaterProtocolHandler * getDummyProtocolHandler();
private: private:
CIcomRepeaterProtocolHandler* m_icomRepeaterHandler; CIcomRepeaterProtocolHandler * m_icomRepeaterHandler;
CHBRepeaterProtocolHandler* m_hbRepeaterHandler; CHBRepeaterProtocolHandler * m_hbRepeaterHandler;
CDummyRepeaterProtocolHandler* m_dummyRepeaterHandler; CDummyRepeaterProtocolHandler * m_dummyRepeaterHandler;
unsigned int m_icomCount;
}; };
Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.