Merge branch 'ipv6' into SimpleDMR

This commit is contained in:
Jonathan Naylor
2020-09-03 11:43:42 +01:00
24 changed files with 299 additions and 266 deletions

2
Conf.h
View File

@@ -301,6 +301,7 @@ public:
// The Remote Control section
bool getRemoteControlEnabled() const;
std::string getRemoteControlAddress() const;
unsigned int getRemoteControlPort() const;
private:
@@ -547,6 +548,7 @@ private:
std::string m_lockFileName;
bool m_remoteControlEnabled;
std::string m_remoteControlAddress;
unsigned int m_remoteControlPort;
};