ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2025-07-30 19:52:25 -04:00
Code Issues Projects Releases Wiki Activity

Remove the use of the second hosts file.

Browse Source
This commit is contained in:
Jonathan Naylor 2018-04-09 18:41:22 +01:00
parent 8561776904
commit 73b0c508d9
6 changed files with 14 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NXDNGateway/Conf.cpp
View File

@ -51,8 +51,7 @@ m_voiceDirectory(),
m_logFilePath(), m_logFilePath(),
m_logFileRoot(), m_logFileRoot(),
m_networkPort(0U), m_networkPort(0U),
m_networkHosts1(), m_networkHosts(),
m_networkHosts2(),
m_networkReloadTime(0U), m_networkReloadTime(0U),
m_networkParrotAddress("127.0.0.1"), m_networkParrotAddress("127.0.0.1"),
m_networkParrotPort(0U), m_networkParrotPort(0U),
@ -141,10 +140,8 @@ bool CConf::read()
} else if (section == SECTION_NETWORK) { } else if (section == SECTION_NETWORK) {
if (::strcmp(key, "Port") == 0) if (::strcmp(key, "Port") == 0)
m_networkPort = (unsigned int)::atoi(value); m_networkPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "HostsFile1") == 0) else if (::strcmp(key, "HostsFile") == 0)
m_networkHosts1 = value; m_networkHosts = value;
else if (::strcmp(key, "HostsFile2") == 0)
m_networkHosts2 = value;
else if (::strcmp(key, "ReloadTime") == 0) else if (::strcmp(key, "ReloadTime") == 0)
m_networkReloadTime = (unsigned int)::atoi(value); m_networkReloadTime = (unsigned int)::atoi(value);
else if (::strcmp(key, "ParrotAddress") == 0) else if (::strcmp(key, "ParrotAddress") == 0)
@ -239,14 +236,9 @@ unsigned int CConf::getNetworkPort() const
return m_networkPort; return m_networkPort;
} }
std::string CConf::getNetworkHosts1() const std::string CConf::getNetworkHosts() const
{ {
return m_networkHosts1; return m_networkHosts;
}
std::string CConf::getNetworkHosts2() const
{
return m_networkHosts2;
} }
unsigned int CConf::getNetworkReloadTime() const unsigned int CConf::getNetworkReloadTime() const

6
NXDNGateway/Conf.h
View File

@ -53,8 +53,7 @@ public:
// The Network section // The Network section
unsigned int getNetworkPort() const; unsigned int getNetworkPort() const;
std::string getNetworkHosts1() const; std::string getNetworkHosts() const;
std::string getNetworkHosts2() const;
unsigned int getNetworkReloadTime() const; unsigned int getNetworkReloadTime() const;
std::string getNetworkParrotAddress() const; std::string getNetworkParrotAddress() const;
unsigned int getNetworkParrotPort() const; unsigned int getNetworkParrotPort() const;
@ -84,8 +83,7 @@ private:
std::string m_logFileRoot; std::string m_logFileRoot;
unsigned int m_networkPort; unsigned int m_networkPort;
std::string m_networkHosts1; std::string m_networkHosts;
std::string m_networkHosts2;
unsigned int m_networkReloadTime; unsigned int m_networkReloadTime;
std::string m_networkParrotAddress; std::string m_networkParrotAddress;
unsigned int m_networkParrotPort; unsigned int m_networkParrotPort;

2
NXDNGateway/NXDNGateway.cpp
View File

@ -181,7 +181,7 @@ void CNXDNGateway::run()
return; return;
} }
CReflectors reflectors(m_conf.getNetworkHosts1(), m_conf.getNetworkHosts2(), m_conf.getNetworkReloadTime()); CReflectors reflectors(m_conf.getNetworkHosts(), m_conf.getNetworkReloadTime());
if (m_conf.getNetworkParrotPort() > 0U) if (m_conf.getNetworkParrotPort() > 0U)
reflectors.setParrot(m_conf.getNetworkParrotAddress(), m_conf.getNetworkParrotPort()); reflectors.setParrot(m_conf.getNetworkParrotAddress(), m_conf.getNetworkParrotPort());
if (m_conf.getNetworkNXDN2DMRPort() > 0U) if (m_conf.getNetworkNXDN2DMRPort() > 0U)

3
NXDNGateway/NXDNGateway.ini
View File

@ -21,8 +21,7 @@ FileRoot=NXDNGateway
[Network] [Network]
Port=14050 Port=14050
HostsFile1=./NXDNHosts.txt HostsFile=./NXDNHosts.txt
HostsFile2=./private/NXDNHosts.txt
ReloadTime=60 ReloadTime=60
ParrotAddress=127.0.0.1 ParrotAddress=127.0.0.1
ParrotPort=42021 ParrotPort=42021

36
NXDNGateway/Reflectors.cpp
View File

@ -26,9 +26,8 @@
#include <cstring> #include <cstring>
#include <cctype> #include <cctype>
CReflectors::CReflectors(const std::string& hostsFile1, const std::string& hostsFile2, unsigned int reloadTime) : CReflectors::CReflectors(const std::string& hostsFile, unsigned int reloadTime) :
m_hostsFile1(hostsFile1), m_hostsFile(hostsFile),
m_hostsFile2(hostsFile2),
m_parrotAddress(), m_parrotAddress(),
m_parrotPort(0U), m_parrotPort(0U),
m_reflectors(), m_reflectors(),
@ -66,7 +65,7 @@ bool CReflectors::load()
m_reflectors.clear(); m_reflectors.clear();
FILE* fp = ::fopen(m_hostsFile1.c_str(), "rt"); FILE* fp = ::fopen(m_hostsFile.c_str(), "rt");
if (fp != NULL) { if (fp != NULL) {
char buffer[100U]; char buffer[100U];
while (::fgets(buffer, 100U, fp) != NULL) { while (::fgets(buffer, 100U, fp) != NULL) {
@ -95,35 +94,6 @@ bool CReflectors::load()
::fclose(fp); ::fclose(fp);
} }
fp = ::fopen(m_hostsFile2.c_str(), "rt");
if (fp != NULL) {
char buffer[100U];
while (::fgets(buffer, 100U, fp) != NULL) {
if (buffer[0U] == '#')
continue;
char* p1 = ::strtok(buffer, " \t\r\n");
char* p2 = ::strtok(NULL, " \t\r\n");
char* p3 = ::strtok(NULL, " \t\r\n");
if (p1 != NULL && p2 != NULL && p3 != NULL) {
std::string host = std::string(p2);
in_addr address = CUDPSocket::lookup(host);
if (address.s_addr != INADDR_NONE) {
CNXDNReflector* refl = new CNXDNReflector;
refl->m_id = (unsigned short)::atoi(p1);
refl->m_address = address;
refl->m_port = (unsigned int)::atoi(p3);
m_reflectors.push_back(refl);
}
}
}
::fclose(fp);
}
size_t size = m_reflectors.size(); size_t size = m_reflectors.size();
LogInfo("Loaded %u NXDN reflectors", size); LogInfo("Loaded %u NXDN reflectors", size);

5
NXDNGateway/Reflectors.h
View File

@ -41,7 +41,7 @@ public:
class CReflectors { class CReflectors {
public: public:
CReflectors(const std::string& hostsFile1, const std::string& hostsFile2, unsigned int reloadTime); CReflectors(const std::string& hostsFile, unsigned int reloadTime);
~CReflectors(); ~CReflectors();
void setParrot(const std::string& address, unsigned int port); void setParrot(const std::string& address, unsigned int port);
@ -54,8 +54,7 @@ public:
void clock(unsigned int ms); void clock(unsigned int ms);
private: private:
std::string m_hostsFile1; std::string m_hostsFile;
std::string m_hostsFile2;
std::string m_parrotAddress; std::string m_parrotAddress;
unsigned int m_parrotPort; unsigned int m_parrotPort;
std::string m_nxdn2dmrAddress; std::string m_nxdn2dmrAddress;