tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement support for ApiListener::bind_host 

fixes #6998
This commit is contained in:
Gunnar Beutner 2014-08-25 08:27:19 +02:00
parent 32c20132d0
commit 2c7f440a73
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/remote/apilistener.cpp
View File

@ -102,8 +102,8 @@ void ApiListener::Start(void)
}
/* create the primary JSON-RPC listener */
if (!AddListener(GetBindPort())) {
Log(LogCritical, "ApiListener", "Cannot add listener for port '" + Convert::ToString(GetBindPort()) + "'.");
if (!AddListener(GetBindHost(), GetBindPort())) {
Log(LogCritical, "ApiListener", "Cannot add listener on host '" + GetBindHost() + "' for port '" + GetBindPort() + "'.");
Application::Exit(EXIT_FAILURE);
}
@ -160,9 +160,10 @@ bool ApiListener::IsMaster(void) const
/**
* Creates a new JSON-RPC listener on the specified port.
*
* @param node The host the listener should be bound to.
* @param service The port to listen on.
*/
bool ApiListener::AddListener(const String& service)
bool ApiListener::AddListener(const String& node, const String& service)
{
ObjectLock olock(this);
@ -180,9 +181,9 @@ bool ApiListener::AddListener(const String& service)
TcpSocket::Ptr server = make_shared<TcpSocket>();
try {
server->Bind(service, AF_UNSPEC);
} catch(std::exception&) {
Log(LogCritical, "ApiListener", "Cannot bind tcp socket on '" + service + "'.");
server->Bind(node, service, AF_UNSPEC);
} catch (const std::exception&) {
Log(LogCritical, "ApiListener", "Cannot bind TCP socket for host '" + node + "' on port '" + service + "'.");
return false;
}

2
lib/remote/apilistener.hpp
View File

@ -79,7 +79,7 @@ private:
void ApiTimerHandler(void);
bool AddListener(const String& service);
bool AddListener(const String& node, const String& service);
void AddConnection(const Endpoint::Ptr& endpoint);
void NewClientHandler(const Socket::Ptr& client, ConnectionRole role);