/*
- * Copyright 2001-2006 Internet2
- *
+ * Copyright 2001-2010 Internet2
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
/**
* ListenerService.cpp
- *
+ *
* Interprocess remoting engine.
*/
#include "internal.h"
#include "exceptions.h"
+#include "ServiceProvider.h"
#include "remoting/ListenerService.h"
-#include <log4cpp/Category.hh>
#include <xercesc/dom/DOM.hpp>
using namespace shibsp;
using namespace xmltooling;
-using namespace log4cpp;
using namespace xercesc;
using namespace std;
namespace shibsp {
- //SHIBSP_DLLLOCAL PluginManager<ListenerService,const DOMElement*>::Factory MemoryListenerServiceFactory;
- SHIBSP_DLLLOCAL PluginManager<ListenerService,const DOMElement*>::Factory TCPListenerServiceFactory;
+ SHIBSP_DLLLOCAL PluginManager<ListenerService,string,const DOMElement*>::Factory TCPListenerServiceFactory;
#ifndef WIN32
- SHIBSP_DLLLOCAL PluginManager<ListenerService,const DOMElement*>::Factory UnixListenerServiceFactory;
+ SHIBSP_DLLLOCAL PluginManager<ListenerService,string,const DOMElement*>::Factory UnixListenerServiceFactory;
#endif
};
void SHIBSP_API shibsp::registerListenerServices()
{
SPConfig& conf=SPConfig::getConfig();
- //conf.ListenerServiceManager.registerFactory(MEMORY_LISTENER_SERVICE, MemoryListenerServiceFactory);
conf.ListenerServiceManager.registerFactory(TCP_LISTENER_SERVICE, TCPListenerServiceFactory);
#ifndef WIN32
conf.ListenerServiceManager.registerFactory(UNIX_LISTENER_SERVICE, UnixListenerServiceFactory);
#endif
}
+Remoted::Remoted()
+{
+}
+
+Remoted::~Remoted()
+{
+}
+
+ListenerService::ListenerService()
+{
+}
+
+ListenerService::~ListenerService()
+{
+}
+
Remoted* ListenerService::regListener(const char* address, Remoted* listener)
{
- Remoted* ret=NULL;
+ Remoted* ret=nullptr;
map<string,Remoted*>::const_iterator i=m_listenerMap.find(address);
if (i!=m_listenerMap.end())
ret=i->second;
Remoted* ListenerService::lookup(const char *address) const
{
map<string,Remoted*>::const_iterator i=m_listenerMap.find(address);
- return (i==m_listenerMap.end()) ? NULL : i->second;
+ return (i==m_listenerMap.end()) ? nullptr : i->second;
}
-void ListenerService::receive(const DDF &in, ostream& out)
+void ListenerService::receive(DDF &in, ostream& out)
{
if (!in.name())
throw ListenerException("Incoming message with no destination address rejected.");
else if (!strcmp("ping",in.name())) {
- DDF outmsg=DDF(NULL).integer(in.integer() + 1);
+ DDF outmsg=DDF(nullptr).integer(in.integer() + 1);
DDFJanitor jan(outmsg);
out << outmsg;
}
- Remoted* dest=lookup(in.name());
- if (!dest)
- throw ListenerException("No destination registered for incoming message addressed to ($1).",params(1,in.name()));
-
+ // Two stage lookup, on the listener itself, and the SP interface.
+ ServiceProvider* sp = SPConfig::getConfig().getServiceProvider();
+ Locker locker(sp);
+ Remoted* dest = lookup(in.name());
+ if (!dest) {
+ dest = sp->lookupListener(in.name());
+ if (!dest)
+ throw ListenerException("No destination registered for incoming message addressed to ($1).", params(1,in.name()));
+ }
+
dest->receive(in, out);
}
+
+bool ListenerService::init(bool force)
+{
+ return true;
+}
+
+void ListenerService::term()
+{
+}