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

Fix incorrect handling of multiple ircDDB servers under Windows.

Browse source
This commit is contained in:
Jonathan Naylor 2018-06-27 07:26:37 +01:00
parent 6768ef0adf
commit d604ca22b0
4 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
Common/IRCDDBGatewayConfig.cpp
View file

@ -112,10 +112,10 @@ const wxString KEY_URL4 = wxT("url4");
const wxString KEY_BAND41 = wxT("band4_1");
const wxString KEY_BAND42 = wxT("band4_2");
const wxString KEY_BAND43 = wxT("band4_3");
const wxString KEY_IRCDDB_ENABLED = wxT("ircddbEnabled");
const wxString KEY_IRCDDB_HOSTNAME = wxT("ircddbHostname");
const wxString KEY_IRCDDB_USERNAME = wxT("ircddbUsername");
const wxString KEY_IRCDDB_PASSWORD = wxT("ircddbPassword");
const wxString KEY_IRCDDB_ENABLED1 = wxT("ircddbEnabled");
const wxString KEY_IRCDDB_HOSTNAME1 = wxT("ircddbHostname");
const wxString KEY_IRCDDB_USERNAME1 = wxT("ircddbUsername");
const wxString KEY_IRCDDB_PASSWORD1 = wxT("ircddbPassword");
const wxString KEY_IRCDDB_ENABLED2 = wxT("ircddbEnabled2");
const wxString KEY_IRCDDB_HOSTNAME2 = wxT("ircddbHostname2");
const wxString KEY_IRCDDB_USERNAME2 = wxT("ircddbUsername2");
@ -235,10 +235,10 @@ const unsigned int DEFAULT_REPEATER_PORT1 = 20011U;
const unsigned int DEFAULT_REPEATER_PORT2 = 20012U;
const unsigned int DEFAULT_REPEATER_PORT3 = 20013U;
const unsigned int DEFAULT_REPEATER_PORT4 = 20014U;
const bool DEFAULT_IRCDDB_ENABLED = true;
const wxString DEFAULT_IRCDDB_HOSTNAME = wxT("group1-irc.ircddb.net");
const wxString DEFAULT_IRCDDB_USERNAME = wxEmptyString;
const wxString DEFAULT_IRCDDB_PASSWORD = wxEmptyString;
const bool DEFAULT_IRCDDB_ENABLED1 = true;
const wxString DEFAULT_IRCDDB_HOSTNAME1 = wxT("group1-irc.ircddb.net");
const wxString DEFAULT_IRCDDB_USERNAME1 = wxEmptyString;
const wxString DEFAULT_IRCDDB_PASSWORD1 = wxEmptyString;
const bool DEFAULT_IRCDDB_ENABLED2 = true;
const wxString DEFAULT_IRCDDB_HOSTNAME2 = wxT("rr.openquad.net");
const wxString DEFAULT_IRCDDB_USERNAME2 = wxEmptyString;
@ -387,10 +387,10 @@ m_repeater4URL(DEFAULT_URL),
m_repeater4Band1(DEFAULT_BAND1),
m_repeater4Band2(DEFAULT_BAND2),
m_repeater4Band3(DEFAULT_BAND3),
m_ircddbEnabled(DEFAULT_IRCDDB_ENABLED),
m_ircddbHostname(DEFAULT_IRCDDB_HOSTNAME),
m_ircddbUsername(DEFAULT_IRCDDB_USERNAME),
m_ircddbPassword(DEFAULT_IRCDDB_PASSWORD),
m_ircddbEnabled1(DEFAULT_IRCDDB_ENABLED1),
m_ircddbHostname1(DEFAULT_IRCDDB_HOSTNAME1),
m_ircddbUsername1(DEFAULT_IRCDDB_USERNAME1),
m_ircddbPassword1(DEFAULT_IRCDDB_PASSWORD1),
m_ircddbEnabled2(DEFAULT_IRCDDB_ENABLED2),
m_ircddbHostname2(DEFAULT_IRCDDB_HOSTNAME2),
m_ircddbUsername2(DEFAULT_IRCDDB_USERNAME2),
@ -704,25 +704,25 @@ m_y(DEFAULT_WINDOW_Y)
m_config->Read(m_name + KEY_BAND43, &temp, long(DEFAULT_BAND3));
m_repeater4Band3 = (unsigned char)temp;
m_config->Read(m_name + KEY_IRCDDB_ENABLED, &m_ircddbEnabled, DEFAULT_IRCDDB_ENABLED);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME, &m_ircddbHostname, DEFAULT_IRCDDB_HOSTNAME);
m_config->Read(m_name + KEY_IRCDDB_USERNAME, &m_ircddbUsername, DEFAULT_IRCDDB_USERNAME);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD, &m_ircddbPassword, DEFAULT_IRCDDB_PASSWORD);
m_config->Read(m_name + KEY_IRCDDB_ENABLED1, &m_ircddbEnabled1, DEFAULT_IRCDDB_ENABLED1);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME1, &m_ircddbHostname1, DEFAULT_IRCDDB_HOSTNAME1);
m_config->Read(m_name + KEY_IRCDDB_USERNAME1, &m_ircddbUsername1, DEFAULT_IRCDDB_USERNAME1);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD1, &m_ircddbPassword1, DEFAULT_IRCDDB_PASSWORD1);
m_config->Read(m_name + KEY_IRCDDB_ENABLED2, &m_ircddbEnabled, DEFAULT_IRCDDB_ENABLED2);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME2, &m_ircddbHostname, DEFAULT_IRCDDB_HOSTNAME2);
m_config->Read(m_name + KEY_IRCDDB_USERNAME2, &m_ircddbUsername, DEFAULT_IRCDDB_USERNAME2);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD2, &m_ircddbPassword, DEFAULT_IRCDDB_PASSWORD2);
m_config->Read(m_name + KEY_IRCDDB_ENABLED2, &m_ircddbEnabled2, DEFAULT_IRCDDB_ENABLED2);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME2, &m_ircddbHostname2, DEFAULT_IRCDDB_HOSTNAME2);
m_config->Read(m_name + KEY_IRCDDB_USERNAME2, &m_ircddbUsername2, DEFAULT_IRCDDB_USERNAME2);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD2, &m_ircddbPassword2, DEFAULT_IRCDDB_PASSWORD2);
m_config->Read(m_name + KEY_IRCDDB_ENABLED3, &m_ircddbEnabled, DEFAULT_IRCDDB_ENABLED3);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME3, &m_ircddbHostname, DEFAULT_IRCDDB_HOSTNAME3);
m_config->Read(m_name + KEY_IRCDDB_USERNAME3, &m_ircddbUsername, DEFAULT_IRCDDB_USERNAME3);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD3, &m_ircddbPassword, DEFAULT_IRCDDB_PASSWORD3);
m_config->Read(m_name + KEY_IRCDDB_ENABLED3, &m_ircddbEnabled3, DEFAULT_IRCDDB_ENABLED3);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME3, &m_ircddbHostname3, DEFAULT_IRCDDB_HOSTNAME3);
m_config->Read(m_name + KEY_IRCDDB_USERNAME3, &m_ircddbUsername3, DEFAULT_IRCDDB_USERNAME3);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD3, &m_ircddbPassword3, DEFAULT_IRCDDB_PASSWORD3);
m_config->Read(m_name + KEY_IRCDDB_ENABLED4, &m_ircddbEnabled, DEFAULT_IRCDDB_ENABLED4);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME4, &m_ircddbHostname, DEFAULT_IRCDDB_HOSTNAME4);
m_config->Read(m_name + KEY_IRCDDB_USERNAME4, &m_ircddbUsername, DEFAULT_IRCDDB_USERNAME4);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD4, &m_ircddbPassword, DEFAULT_IRCDDB_PASSWORD4);
m_config->Read(m_name + KEY_IRCDDB_ENABLED4, &m_ircddbEnabled4, DEFAULT_IRCDDB_ENABLED4);
m_config->Read(m_name + KEY_IRCDDB_HOSTNAME4, &m_ircddbHostname4, DEFAULT_IRCDDB_HOSTNAME4);
m_config->Read(m_name + KEY_IRCDDB_USERNAME4, &m_ircddbUsername4, DEFAULT_IRCDDB_USERNAME4);
m_config->Read(m_name + KEY_IRCDDB_PASSWORD4, &m_ircddbPassword4, DEFAULT_IRCDDB_PASSWORD4);
m_config->Read(m_name + KEY_APRS_ENABLED, &m_aprsEnabled, DEFAULT_APRS_ENABLED);
@ -1000,10 +1000,10 @@ m_repeater4URL(DEFAULT_URL),
m_repeater4Band1(DEFAULT_BAND1),
m_repeater4Band2(DEFAULT_BAND2),
m_repeater4Band3(DEFAULT_BAND3),
m_ircddbEnabled(DEFAULT_IRCDDB_ENABLED),
m_ircddbHostname(DEFAULT_IRCDDB_HOSTNAME),
m_ircddbUsername(DEFAULT_IRCDDB_USERNAME),
m_ircddbPassword(DEFAULT_IRCDDB_PASSWORD),
m_ircddbEnabled1(DEFAULT_IRCDDB_ENABLED1),
m_ircddbHostname1(DEFAULT_IRCDDB_HOSTNAME1),
m_ircddbUsername1(DEFAULT_IRCDDB_USERNAME1),
m_ircddbPassword1(DEFAULT_IRCDDB_PASSWORD1),
m_ircddbEnabled2(DEFAULT_IRCDDB_ENABLED2),
m_ircddbHostname2(DEFAULT_IRCDDB_HOSTNAME2),
m_ircddbUsername2(DEFAULT_IRCDDB_USERNAME2),
@ -1348,16 +1348,16 @@ m_y(DEFAULT_WINDOW_Y)
} else if (key.IsSameAs(KEY_BAND43)) {
val.ToULong(&temp2);
m_repeater4Band3 = (unsigned char)temp2;
} else if (key.IsSameAs(KEY_IRCDDB_ENABLED)) {
} else if (key.IsSameAs(KEY_IRCDDB_ENABLED1)) {
val.ToLong(&temp1);
m_ircddbEnabled = temp1 == 1L;
} else if (key.IsSameAs(KEY_IRCDDB_HOSTNAME)) {
m_ircddbHostname = val;
} else if (key.IsSameAs(KEY_IRCDDB_USERNAME)) {
m_ircddbUsername = val;
} else if (key.IsSameAs(KEY_IRCDDB_PASSWORD)) {
m_ircddbPassword = val;
} else if (key.IsSameAs(KEY_IRCDDB_ENABLED2)) {
m_ircddbEnabled1 = temp1 == 1L;
} else if (key.IsSameAs(KEY_IRCDDB_HOSTNAME1)) {
m_ircddbHostname1 = val;
} else if (key.IsSameAs(KEY_IRCDDB_USERNAME1)) {
m_ircddbUsername1 = val;
} else if (key.IsSameAs(KEY_IRCDDB_PASSWORD1)) {
m_ircddbPassword1 = val;
} else if (key.IsSameAs(KEY_IRCDDB_ENABLED21)) {
val.ToLong(&temp1);
m_ircddbEnabled2 = temp1 == 1L;
} else if (key.IsSameAs(KEY_IRCDDB_HOSTNAME2)) {
@ -1813,20 +1813,20 @@ void CIRCDDBGatewayConfig::setRepeater4(const wxString& band, HW_TYPE type, cons
m_repeater4URL = url;
}
void CIRCDDBGatewayConfig::getIrcDDB(bool& enabled, wxString& hostname, wxString& username, wxString& password) const
void CIRCDDBGatewayConfig::getIrcDDB1(bool& enabled, wxString& hostname, wxString& username, wxString& password) const
{
enabled = m_ircddbEnabled;
hostname = m_ircddbHostname;
username = m_ircddbUsername;
password = m_ircddbPassword;
enabled = m_ircddbEnabled1;
hostname = m_ircddbHostname1;
username = m_ircddbUsername1;
password = m_ircddbPassword1;
}
void CIRCDDBGatewayConfig::setIrcDDB(bool enabled, const wxString& hostname, const wxString& username, const wxString& password)
void CIRCDDBGatewayConfig::setIrcDDB1(bool enabled, const wxString& hostname, const wxString& username, const wxString& password)
{
m_ircddbEnabled = enabled;
m_ircddbHostname = hostname;
m_ircddbUsername = username;
m_ircddbPassword = password;
m_ircddbEnabled1 = enabled;
m_ircddbHostname1 = hostname;
m_ircddbUsername1 = username;
m_ircddbPassword1 = password;
}
void CIRCDDBGatewayConfig::getIrcDDB2(bool& enabled, wxString& hostname, wxString& username, wxString& password) const
@ -2349,10 +2349,10 @@ bool CIRCDDBGatewayConfig::write()
m_config->Write(m_name + KEY_BAND41, long(m_repeater4Band1));
m_config->Write(m_name + KEY_BAND42, long(m_repeater4Band2));
m_config->Write(m_name + KEY_BAND43, long(m_repeater4Band3));
m_config->Write(m_name + KEY_IRCDDB_ENABLED, m_ircddbEnabled);
m_config->Write(m_name + KEY_IRCDDB_HOSTNAME, m_ircddbHostname);
m_config->Write(m_name + KEY_IRCDDB_USERNAME, m_ircddbUsername);
m_config->Write(m_name + KEY_IRCDDB_PASSWORD, m_ircddbPassword);
m_config->Write(m_name + KEY_IRCDDB_ENABLED1, m_ircddbEnabled1);
m_config->Write(m_name + KEY_IRCDDB_HOSTNAME1, m_ircddbHostname1);
m_config->Write(m_name + KEY_IRCDDB_USERNAME1, m_ircddbUsername1);
m_config->Write(m_name + KEY_IRCDDB_PASSWORD1, m_ircddbPassword1);
m_config->Write(m_name + KEY_IRCDDB_ENABLED2, m_ircddbEnabled2);
m_config->Write(m_name + KEY_IRCDDB_HOSTNAME2, m_ircddbHostname2);
m_config->Write(m_name + KEY_IRCDDB_USERNAME2, m_ircddbUsername2);
@ -2557,10 +2557,10 @@ bool CIRCDDBGatewayConfig::write()
buffer.Printf(wxT("%s=%u"), KEY_BAND41.c_str(), m_repeater4Band1); file.AddLine(buffer);
buffer.Printf(wxT("%s=%u"), KEY_BAND42.c_str(), m_repeater4Band2); file.AddLine(buffer);
buffer.Printf(wxT("%s=%u"), KEY_BAND43.c_str(), m_repeater4Band3); file.AddLine(buffer);
buffer.Printf(wxT("%s=%d"), KEY_IRCDDB_ENABLED.c_str(), m_ircddbEnabled ? 1 : 0); file.AddLine(buffer);
buffer.Printf(wxT("%s=%s"), KEY_IRCDDB_HOSTNAME.c_str(), m_ircddbHostname.c_str()); file.AddLine(buffer);
buffer.Printf(wxT("%s=%s"), KEY_IRCDDB_USERNAME.c_str(), m_ircddbUsername.c_str()); file.AddLine(buffer);
buffer.Printf(wxT("%s=%s"), KEY_IRCDDB_PASSWORD.c_str(), m_ircddbPassword.c_str()); file.AddLine(buffer);
buffer.Printf(wxT("%s=%d"), KEY_IRCDDB_ENABLED1.c_str(), m_ircddbEnabled1 ? 1 : 0); file.AddLine(buffer);
buffer.Printf(wxT("%s=%s"), KEY_IRCDDB_HOSTNAME1.c_str(), m_ircddbHostname1.c_str()); file.AddLine(buffer);
buffer.Printf(wxT("%s=%s"), KEY_IRCDDB_USERNAME1.c_str(), m_ircddbUsername1.c_str()); file.AddLine(buffer);
buffer.Printf(wxT("%s=%s"), KEY_IRCDDB_PASSWORD1.c_str(), m_ircddbPassword1.c_str()); file.AddLine(buffer);
buffer.Printf("%s=%d", KEY_IRCDDB_ENABLED2.c_str(), m_ircddbEnabled2 ? 1 : 0); file.AddLine(buffer);
buffer.Printf("%s=%s", KEY_IRCDDB_HOSTNAME2.c_str(), m_ircddbHostname2.c_str()); file.AddLine(buffer);
buffer.Printf("%s=%s", KEY_IRCDDB_USERNAME2.c_str(), m_ircddbUsername2.c_str()); file.AddLine(buffer);

12
Common/IRCDDBGatewayConfig.h
View file

@ -49,12 +49,12 @@ public:
void getRepeater4(wxString& callsign, wxString& band, HW_TYPE& type, wxString& address, unsigned int& port, unsigned char& band1, unsigned char& band2, unsigned char& band3, wxString& reflector, bool& atStartup, RECONNECT& reconnect, double& frequency, double& offset, double& range, double& latitude, double& longitude, double& agl, wxString& description1, wxString& description2, wxString& url) const;
void setRepeater4(const wxString& band, HW_TYPE type, const wxString& address, unsigned int port, unsigned char band1, unsigned char band2, unsigned char band3, const wxString& reflector, bool atStartup, RECONNECT reconnect, double frequency, double offset, double range, double latitude, double longitude, double agl, const wxString& description1, const wxString& description2, const wxString& url);
void getIrcDDB(bool& enabled, wxString& hostname, wxString& username, wxString& password) const;
void getIrcDDB1(bool& enabled, wxString& hostname, wxString& username, wxString& password) const;
void getIrcDDB2(bool& enabled, wxString& hostname, wxString& username, wxString& password) const;
void getIrcDDB3(bool& enabled, wxString& hostname, wxString& username, wxString& password) const;
void getIrcDDB4(bool& enabled, wxString& hostname, wxString& username, wxString& password) const;
void setIrcDDB(bool enabled, const wxString& hostname, const wxString& username, const wxString& password);
void setIrcDDB1(bool enabled, const wxString& hostname, const wxString& username, const wxString& password);
void setIrcDDB2(bool enabled, const wxString& hostname, const wxString& username, const wxString& password);
void setIrcDDB3(bool enabled, const wxString& hostname, const wxString& username, const wxString& password);
void setIrcDDB4(bool enabled, const wxString& hostname, const wxString& username, const wxString& password);
@ -215,10 +215,10 @@ private:
unsigned char m_repeater4Band1;
unsigned char m_repeater4Band2;
unsigned char m_repeater4Band3;
bool m_ircddbEnabled;
wxString m_ircddbHostname;
wxString m_ircddbUsername;
wxString m_ircddbPassword;
bool m_ircddbEnabled1;
wxString m_ircddbHostname1;
wxString m_ircddbUsername1;
wxString m_ircddbPassword1;
bool m_ircddbEnabled2;
wxString m_ircddbHostname2;
wxString m_ircddbUsername2;

2
ircDDBGateway/IRCDDBGatewayApp.cpp
View file

@ -650,7 +650,7 @@ void CIRCDDBGatewayApp::createThread()
wxString ircDDBHostname3, ircDDBUsername3, ircDDBPassword3;
wxString ircDDBHostname4, ircDDBUsername4, ircDDBPassword4;
m_config->getIrcDDB(ircDDBEnabled1, ircDDBHostname1, ircDDBUsername1, ircDDBPassword1);
m_config->getIrcDDB1(ircDDBEnabled1, ircDDBHostname1, ircDDBUsername1, ircDDBPassword1);
wxLogInfo(wxT("ircDDB 1 enabled: %d, host: %s, username: %s"), int(ircDDBEnabled1), ircDDBHostname1.c_str(), ircDDBUsername1.c_str());
m_config->getIrcDDB2(ircDDBEnabled2, ircDDBHostname2, ircDDBUsername2, ircDDBPassword2);

4
ircDDBGatewayConfig/IRCDDBGatewayConfigFrame.cpp
View file

@ -178,7 +178,7 @@ m_miscellaneous(NULL)
bool ircDDBEnabled;
wxString ircDDBHostname, ircDDBUsername, ircDDBPassword;
m_config->getIrcDDB(ircDDBEnabled, ircDDBHostname, ircDDBUsername, ircDDBPassword);
m_config->getIrcDDB1(ircDDBEnabled, ircDDBHostname, ircDDBUsername, ircDDBPassword);
m_ircDDB = new CIRCDDBGatewayConfigIrcDDBSet(noteBook, -1, APPLICATION_NAME, ircDDBEnabled, ircDDBHostname, ircDDBUsername, ircDDBPassword);
noteBook->AddPage(m_ircDDB, wxT("ircDDB 1st Network"), false);
@ -476,7 +476,7 @@ void CIRCDDBGatewayConfigFrame::onSave(wxCommandEvent&)
wxString ircDDBHostname = m_ircDDB->getHostname();
wxString ircDDBUsername = m_ircDDB->getUsername();
wxString ircDDBPassword = m_ircDDB->getPassword();
m_config->setIrcDDB(ircDDBEnabled, ircDDBHostname, ircDDBUsername, ircDDBPassword);
m_config->setIrcDDB1(ircDDBEnabled, ircDDBHostname, ircDDBUsername, ircDDBPassword);
ircDDBEnabled = m_ircDDB2->getEnabled();
ircDDBHostname = m_ircDDB2->getHostname();