1 files changed, 5 insertions, 5 deletions
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index b63ca67..41b90c4 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -1,52 +1,52 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Slimber/Server.h"
 
 #include <string>
 #include <boost/bind.hpp>
 #include <iostream>
 
 #include "Swiften/Base/String.h"
 #include "Swiften/LinkLocal/LinkLocalConnector.h"
 #include "Swiften/Network/Connection.h"
 #include "Swiften/Session/SessionTracer.h"
-#include "Swiften/Elements/Element.h"
+#include "Swiften/Elements/ToplevelElement.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Network/BoostConnection.h"
 #include "Swiften/Network/BoostConnectionServer.h"
 #include "Swiften/Session/SessionTracer.h"
 #include "Swiften/Elements/IQ.h"
 #include "Swiften/Elements/VCard.h"
 #include "Limber/Server/UserRegistry.h"
 #include "Swiften/Session/Session.h"
 #include <Swiften/Base/foreach.h>
 #include <string>
 #include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
 #include <Swiften/LinkLocal/OutgoingLinkLocalSession.h>
 #include <Swiften/LinkLocal/IncomingLinkLocalSession.h>
 #include <Swiften/LinkLocal/LinkLocalServiceBrowser.h>
 #include <Swiften/Network/ConnectionServer.h>
 #include "Slimber/VCardCollection.h"
 #include "Slimber/LinkLocalPresenceManager.h"
 #include "Limber/Server/ServerFromClientSession.h"
 
 namespace Swift {
 
 Server::Server(
 		int clientConnectionPort, 
 		int linkLocalConnectionPort, 
 		LinkLocalServiceBrowser* linkLocalServiceBrowser,
 		VCardCollection* vCardCollection,
 		EventLoop* eventLoop) :
 			linkLocalServiceRegistered(false), 
 			rosterRequested(false), 
 			clientConnectionPort(clientConnectionPort), 
 			linkLocalConnectionPort(linkLocalConnectionPort),
 			linkLocalServiceBrowser(linkLocalServiceBrowser),
 			vCardCollection(vCardCollection),
 			eventLoop(eventLoop),
@@ -150,71 +150,71 @@ void Server::handleNewClientConnection(boost::shared_ptr<Connection> connection)
 					&payloadParserFactories, &payloadSerializers, &xmlParserFactory, &userRegistry));
 	serverFromClientSession->setAllowSASLEXTERNAL();
 	serverFromClientSession->onSessionStarted.connect(
 			boost::bind(&Server::handleSessionStarted, this));
 	serverFromClientSession->onElementReceived.connect(
 			boost::bind(&Server::handleElementReceived, this, _1, 
 				serverFromClientSession));
 	serverFromClientSession->onSessionFinished.connect(
 			boost::bind(&Server::handleSessionFinished, this, 
 			serverFromClientSession));
 	//tracers.push_back(boost::shared_ptr<SessionTracer>(
 	//		new SessionTracer(serverFromClientSession)));
 	serverFromClientSession->startSession();
 }
 
 void Server::handleSessionStarted() {
 	onSelfConnected(true);
 }
 
 void Server::handleSessionFinished(boost::shared_ptr<ServerFromClientSession>) {
 	serverFromClientSession.reset();
 	unregisterService();
 	selfJID = JID();
 	rosterRequested = false;
 	onSelfConnected(false);
 	lastPresence.reset();
 }
 
 void Server::unregisterService() {
 	if (linkLocalServiceRegistered) {
 		linkLocalServiceRegistered = false;
 		linkLocalServiceBrowser->unregisterService();
 	}
 }
 
-void Server::handleElementReceived(boost::shared_ptr<Element> element, boost::shared_ptr<ServerFromClientSession> session) {
+void Server::handleElementReceived(boost::shared_ptr<ToplevelElement> element, boost::shared_ptr<ServerFromClientSession> session) {
 	boost::shared_ptr<Stanza> stanza = boost::dynamic_pointer_cast<Stanza>(element);
 	if (!stanza) {
 		return;
 	}
 
 	stanza->setFrom(session->getRemoteJID());
 	if (!stanza->getTo().isValid()) {
 		stanza->setTo(session->getLocalJID());
 	}
 
 	if (boost::shared_ptr<Presence> presence = boost::dynamic_pointer_cast<Presence>(stanza)) {
 		if (presence->getType() == Presence::Available) {
 			if (!linkLocalServiceRegistered) {
 				linkLocalServiceRegistered = true;
 				linkLocalServiceBrowser->registerService(
 						session->getRemoteJID().toBare().toString(), 
 						linkLocalConnectionPort, getLinkLocalServiceInfo(presence));
 			}
 			else {
 				linkLocalServiceBrowser->updateService(
 						getLinkLocalServiceInfo(presence));
 			}
 			lastPresence = presence;
 		}
 		else {
 			unregisterService();
 		}
 	}
 	else if (!stanza->getTo().isValid() || stanza->getTo() == session->getLocalJID() || stanza->getTo() == session->getRemoteJID().toBare()) {
 		if (boost::shared_ptr<IQ> iq = boost::dynamic_pointer_cast<IQ>(stanza)) {
 			if (iq->getPayload<RosterPayload>()) {
 				if (iq->getType() == IQ::Get) {
 					session->sendElement(IQ::createResult(iq->getFrom(), iq->getID(), presenceManager->getRoster()));
 					rosterRequested = true;
 					foreach(const boost::shared_ptr<Presence> presence, presenceManager->getAllPresence()) {
@@ -260,92 +260,92 @@ void Server::handleElementReceived(boost::shared_ptr<Element> element, boost::sh
 							new LinkLocalConnector(
 								*service,
 								linkLocalServiceBrowser->getQuerier(),
 								BoostConnection::create(boostIOServiceThread.getIOService(), eventLoop)));
 					connector->onConnectFinished.connect(
 							boost::bind(&Server::handleConnectFinished, this, connector, _1));
 					connectors.push_back(connector);
 					connector->connect();
 				}
 				connector->queueElement(element);
 			}
 			else {
 				session->sendElement(IQ::createError(
 						stanza->getFrom(), stanza->getID(), 
 						ErrorPayload::RecipientUnavailable, ErrorPayload::Wait));
 			}
 		}
 	}
 }
 
 void Server::handleNewLinkLocalConnection(boost::shared_ptr<Connection> connection) {
 	boost::shared_ptr<IncomingLinkLocalSession> session(
 			new IncomingLinkLocalSession(
 				selfJID, connection, 
 				&payloadParserFactories, &payloadSerializers, &xmlParserFactory));
 	registerLinkLocalSession(session);
 }
 
 void Server::handleLinkLocalSessionFinished(boost::shared_ptr<Session> session) {
 	//std::cout << "Link local session from " << session->getRemoteJID() << " ended" << std::endl;
 	linkLocalSessions.erase(
 			std::remove(linkLocalSessions.begin(), linkLocalSessions.end(), session), 
 			linkLocalSessions.end());
 }
 
-void Server::handleLinkLocalElementReceived(boost::shared_ptr<Element> element, boost::shared_ptr<Session> session) {
+void Server::handleLinkLocalElementReceived(boost::shared_ptr<ToplevelElement> element, boost::shared_ptr<Session> session) {
 	if (boost::shared_ptr<Stanza> stanza = boost::dynamic_pointer_cast<Stanza>(element)) {
 		JID fromJID = session->getRemoteJID();
 		if (!presenceManager->getServiceForJID(fromJID.toBare())) {
 			return; // TODO: Send error back
 		}
 		stanza->setFrom(fromJID);
 		serverFromClientSession->sendElement(stanza);
 	}
 }
 
 void Server::handleConnectFinished(boost::shared_ptr<LinkLocalConnector> connector, bool error) {
 	if (error) {
 		std::cerr << "Error connecting" << std::endl;
 		// TODO: Send back queued stanzas
 	}
 	else {
 		boost::shared_ptr<OutgoingLinkLocalSession> outgoingSession(
 				new OutgoingLinkLocalSession(
 					selfJID, connector->getService().getJID(), connector->getConnection(),
 					&payloadParserFactories, &payloadSerializers, &xmlParserFactory));
-		foreach(const boost::shared_ptr<Element> element, connector->getQueuedElements()) {
+		foreach(const boost::shared_ptr<ToplevelElement> element, connector->getQueuedElements()) {
 			outgoingSession->queueElement(element);
 		}
 		registerLinkLocalSession(outgoingSession);
 	}
 	connectors.erase(std::remove(connectors.begin(), connectors.end(), connector), connectors.end());
 }
 
 void Server::registerLinkLocalSession(boost::shared_ptr<Session> session) {
 	session->onSessionFinished.connect(
 			boost::bind(&Server::handleLinkLocalSessionFinished, this, session));
 	session->onElementReceived.connect(
 			boost::bind(&Server::handleLinkLocalElementReceived, this, _1, session));
 	linkLocalSessions.push_back(session);
 	//tracers.push_back(boost::make_shared<SessionTracer>(session));
 	session->startSession();
 }
 
 boost::shared_ptr<Session> Server::getLinkLocalSessionForJID(const JID& jid) {
 	foreach(const boost::shared_ptr<Session> session, linkLocalSessions) {
 		if (session->getRemoteJID() == jid) {
 			return session;
 		}
 	}
 	return boost::shared_ptr<Session>();
 }
 
 boost::shared_ptr<LinkLocalConnector> Server::getLinkLocalConnectorForJID(const JID& jid) {
 	foreach(const boost::shared_ptr<LinkLocalConnector> connector, connectors) {
 		if (connector->getService().getJID() == jid) {
 			return connector;
 		}
 	}
 	return boost::shared_ptr<LinkLocalConnector>();
 }