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 anonymous multicast messages. 

Fixes #3545
This commit is contained in:
Gunnar Beutner 2013-01-22 10:14:52 +01:00
parent c2c7488089
commit c97b480b1e
5 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/demo/democomponent.cpp
View File

@ -69,7 +69,7 @@ void DemoComponent::HelloWorldRequestHandler(const Endpoint::Ptr& sender,
const RequestMessage& request)
{
Logger::Write(LogInformation, "demo", "Got 'hello world' from identity=" +
sender->GetName());
(sender ? sender->GetName() : "(anonymous)"));
}
EXPORT_COMPONENT(demo, DemoComponent);

8
components/replication/replicationcomponent.cpp
View File

@ -35,13 +35,13 @@ void ReplicationComponent::Start(void)
Endpoint::OnConnected.connect(boost::bind(&ReplicationComponent::EndpointConnectedHandler, this, _1));
m_Endpoint->RegisterTopicHandler("config::ObjectUpdate",
boost::bind(&ReplicationComponent::RemoteObjectUpdateHandler, this, _2, _3));
boost::bind(&ReplicationComponent::RemoteObjectUpdateHandler, this, _3));
m_Endpoint->RegisterTopicHandler("config::ObjectRemoved",
boost::bind(&ReplicationComponent::RemoteObjectRemovedHandler, this, _3));
/* service status */
m_Endpoint->RegisterTopicHandler("checker::ServiceStateChange",
boost::bind(&ReplicationComponent::ServiceStateChangeRequestHandler, _2, _3));
boost::bind(&ReplicationComponent::ServiceStateChangeRequestHandler, _3));
}
/**
@ -52,7 +52,7 @@ void ReplicationComponent::Stop(void)
m_Endpoint->Unregister();
}
void ReplicationComponent::ServiceStateChangeRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request)
void ReplicationComponent::ServiceStateChangeRequestHandler(const RequestMessage& request)
{
ServiceStateChangeMessage params;
if (!request.GetParams(&params))
@ -163,7 +163,7 @@ void ReplicationComponent::TransactionClosingHandler(const set<DynamicObject::Pt
}
}
void ReplicationComponent::RemoteObjectUpdateHandler(const Endpoint::Ptr& sender, const RequestMessage& request)
void ReplicationComponent::RemoteObjectUpdateHandler(const RequestMessage& request)
{
MessagePart params;
if (!request.GetParams(&params))

4
components/replication/replicationcomponent.h
View File

@ -35,7 +35,7 @@ public:
private:
Endpoint::Ptr m_Endpoint;
static void ServiceStateChangeRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
static void ServiceStateChangeRequestHandler(const RequestMessage& request);
void EndpointConnectedHandler(const Endpoint::Ptr& endpoint);
@ -43,7 +43,7 @@ private:
void LocalObjectUnregisteredHandler(const DynamicObject::Ptr& object);
void TransactionClosingHandler(const set<DynamicObject::Ptr>& modifiedObjects);
void RemoteObjectUpdateHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
void RemoteObjectUpdateHandler(const RequestMessage& request);
void RemoteObjectRemovedHandler(const RequestMessage& request);
static RequestMessage MakeObjectMessage(const DynamicObject::Ptr& object,

30
lib/remoting/endpointmanager.cpp
View File

@ -184,18 +184,31 @@ void EndpointManager::ClientClosedHandler(const Stream::Ptr& client)
m_PendingClients.erase(tlsStream);
}
/**
* Sends an anonymous unicast message to the specified recipient.
*
* @param recipient The recipient of the message.
* @param message The message.
*/
void EndpointManager::SendUnicastMessage(const Endpoint::Ptr& recipient,
const MessagePart& message)
{
SendUnicastMessage(Endpoint::Ptr(), recipient, message);
}
/**
* Sends a unicast message to the specified recipient.
*
* @param sender The sender of the message.
* @param recipient The recipient of the message.
* @param message The request.
* @param message The message.
*/
void EndpointManager::SendUnicastMessage(const Endpoint::Ptr& sender,
const Endpoint::Ptr& recipient, const MessagePart& message)
{
/* don't forward messages between non-local endpoints */
if (!sender->IsLocal() && !recipient->IsLocal())
/* don't forward messages between non-local endpoints, assume that
* anonymous senders (sender == null) are local */
if ((sender && !sender->IsLocal()) && !recipient->IsLocal())
return;
if (ResponseMessage::IsResponseMessage(message))
@ -237,6 +250,17 @@ void EndpointManager::SendAnycastMessage(const Endpoint::Ptr& sender,
SendUnicastMessage(sender, recipient, message);
}
/**
* Sends an anonymous message to all recipients who have a subscription for the
* message#s topic.
*
* @param message The message.
*/
void EndpointManager::SendMulticastMessage(const RequestMessage& message)
{
SendMulticastMessage(Endpoint::Ptr(), message);
}
/**
* Sends a message to all recipients who have a subscription for the
* message's topic.

2
lib/remoting/endpointmanager.h
View File

@ -47,8 +47,10 @@ public:
void AddListener(const String& service);
void AddConnection(const String& node, const String& service);
void SendUnicastMessage(const Endpoint::Ptr& recipient, const MessagePart& message);
void SendUnicastMessage(const Endpoint::Ptr& sender, const Endpoint::Ptr& recipient, const MessagePart& message);
void SendAnycastMessage(const Endpoint::Ptr& sender, const RequestMessage& message);
void SendMulticastMessage(const RequestMessage& message);
void SendMulticastMessage(const Endpoint::Ptr& sender, const RequestMessage& message);
typedef function<void(const EndpointManager::Ptr&, const Endpoint::Ptr, const RequestMessage&, const ResponseMessage&, bool TimedOut)> APICallback;