g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-02-20 06:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux cleanups.

Browse source
This commit is contained in:
Jonathan Naylor 2018-06-27 07:39:51 +01:00
parent d604ca22b0
commit 62fb498d6e
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
APRSTransmit/APRSTransmitAppD.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2014 by Jonathan Naylor G4KLX
* Copyright (C) 2014,2018 by Jonathan Naylor G4KLX
* APRSTransmit Copyright (C) 2015 Geoffrey Merck F4FXL / KC3FRA
*
* This program is free software; you can redistribute it and/or modify
@ -148,7 +148,7 @@ int main(int argc, char** argv)
::fclose(fp);
}
m_aprsTransmit = new CAPRSTransmitAppD(repeater, aprsHost, aprsPort, aprsFilter, daemon);
m_aprsTransmit = new CAPRSTransmitAppD(repeater, aprsPassword, aprsHost, aprsPort, aprsFilter, daemon);
if (!m_aprsTransmit->init()) {
::wxUninitialize();
return 1;

2
Common/IRCDDBGatewayConfig.cpp
View file

@ -1357,7 +1357,7 @@ m_y(DEFAULT_WINDOW_Y)
m_ircddbUsername1 = val;
} else if (key.IsSameAs(KEY_IRCDDB_PASSWORD1)) {
m_ircddbPassword1 = val;
} else if (key.IsSameAs(KEY_IRCDDB_ENABLED21)) {
} else if (key.IsSameAs(KEY_IRCDDB_ENABLED2)) {
val.ToLong(&temp1);
m_ircddbEnabled2 = temp1 == 1L;
} else if (key.IsSameAs(KEY_IRCDDB_HOSTNAME2)) {

8
ircDDBGateway/IRCDDBGatewayAppD.cpp
View file

@ -242,15 +242,15 @@ bool CIRCDDBGatewayAppD::createThread()
m_thread->setGateway(gatewayType, gatewayCallsign, gatewayAddress);
wxString aprsHostname;
wxString aprsHostname, aprsPassword;
unsigned int aprsPort;
bool aprsEnabled;
config.getDPRS(aprsEnabled, aprsHostname, aprsPort);
config.getDPRS(aprsEnabled, aprsPassword, aprsHostname, aprsPort);
wxLogInfo(wxT("APRS enabled: %d, host: %s:%u"), int(aprsEnabled), aprsHostname.c_str(), aprsPort);
CAPRSWriter* aprs = NULL;
if (aprsEnabled && !gatewayCallsign.IsEmpty() && !aprsHostname.IsEmpty() && aprsPort != 0U) {
aprs = new CAPRSWriter(aprsHostname, aprsPort, gatewayCallsign, gatewayAddress);
aprs = new CAPRSWriter(aprsHostname, aprsPort, gatewayCallsign, aprsPassword, gatewayAddress);
bool res = aprs->open();
if (!res)
@ -638,7 +638,7 @@ bool CIRCDDBGatewayAppD::createThread()
wxString ircDDBHostname3, ircDDBUsername3, ircDDBPassword3;
wxString ircDDBHostname4, ircDDBUsername4, ircDDBPassword4;
config.getIrcDDB(ircDDBEnabled1, ircDDBHostname1, ircDDBUsername1, ircDDBPassword1);
config.getIrcDDB1(ircDDBEnabled1, ircDDBHostname1, ircDDBUsername1, ircDDBPassword1);
wxLogInfo(wxT("ircDDB 1 enabled: %d, host: %s, username: %s"), int(ircDDBEnabled1), ircDDBHostname1.c_str(), ircDDBUsername1.c_str());
config.getIrcDDB2(ircDDBEnabled2, ircDDBHostname2, ircDDBUsername2, ircDDBPassword2);