1 files changed, 16 insertions, 7 deletions
diff --git a/Swiften/Jingle/JingleSessionManager.cpp b/Swiften/Jingle/JingleSessionManager.cpp
index e60449b..2e15fcd 100644
--- a/Swiften/Jingle/JingleSessionManager.cpp
+++ b/Swiften/Jingle/JingleSessionManager.cpp
@@ -7,20 +7,24 @@
 #include <Swiften/Jingle/JingleSessionManager.h>
 #include <Swiften/Jingle/JingleResponder.h>
 #include <Swiften/Jingle/IncomingJingleSessionHandler.h>
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Base/Algorithm.h>
 
 namespace Swift {
 
 JingleSessionManager::JingleSessionManager(IQRouter* router) : router(router) {
 	responder = new JingleResponder(this, router);
+	responder->start();
 }
 
 JingleSessionManager::~JingleSessionManager() {
+	responder->stop();
 	delete responder;
 }
 
-JingleSession::ref JingleSessionManager::getSession(const JID& jid, const std::string& id) const {
-	SessionMap::const_iterator i = incomingSessions.find(JIDSession(jid, id));
-	return i != incomingSessions.end() ? i->second : JingleSession::ref();
+JingleSessionImpl::ref JingleSessionManager::getSession(const JID& jid, const std::string& id) const {
+	SessionMap::const_iterator i = sessions.find(JIDSession(jid, id));
+	return i != sessions.end() ? i->second : JingleSessionImpl::ref();
 }
 
 void JingleSessionManager::addIncomingSessionHandler(IncomingJingleSessionHandler* handler) {
@@ -28,13 +32,18 @@ void JingleSessionManager::addIncomingSessionHandler(IncomingJingleSessionHandle
 }
 
 void JingleSessionManager::removeIncomingSessionHandler(IncomingJingleSessionHandler* handler) {
-	incomingSessionHandlers.erase(std::remove(incomingSessionHandlers.begin(), incomingSessionHandlers.end(), handler), incomingSessionHandlers.end());
+	erase(incomingSessionHandlers, handler);
 }
 
-void JingleSessionManager::handleIncomingSession(const JID& from, IncomingJingleSession::ref session) {
-	incomingSessions.insert(std::make_pair(JIDSession(from, session->getID()), session));
+void JingleSessionManager::registerOutgoingSession(const JID& initiator, JingleSessionImpl::ref session) {
+	sessions.insert(std::make_pair(JIDSession(initiator, session->getID()), session));
+	SWIFT_LOG(debug) << "Added session " << session->getID() << " for initiator " << initiator.toString() << std::endl;
+}
+
+void JingleSessionManager::handleIncomingSession(const JID& initiator, const JID& recipient, JingleSessionImpl::ref session, const std::vector<JingleContentPayload::ref>& contents) {
+	sessions.insert(std::make_pair(JIDSession(initiator, session->getID()), session));
 	foreach (IncomingJingleSessionHandler* handler, incomingSessionHandlers) {
-		if (handler->handleIncomingJingleSession(session)) {
+		if (handler->handleIncomingJingleSession(session, contents, recipient)) {
 			return;
 		}
 	}