libtransport.git Changeset - f81a8aa784da

Changeset - f81a8aa784da

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-10-10 21:09:47
hanzz.k@gmail.com

Fixed compilation issue with latest swiften

4 files changed with 10 insertions and 4 deletions:

include/Swiften/Server/Server.cpp

include/Swiften/Server/Server.h

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerFromClientSession.h

0 comments (0 inline, 0 general)

include/Swiften/Server/Server.cpp

➞

Show inline comments

@@ @@ -46,18 +46,20 @@ Server::Server( @@
 			stopping(false),
 			selfJID(jid),
 			stanzaChannel_(){
 	stanzaChannel_ = new ServerStanzaChannel();
 	iqRouter_ = new IQRouter(stanzaChannel_);
 	tlsFactory = NULL;
 	parserFactory_ = new PlatformXMLParserFactory();
+}
 Server::~Server() {
 	stop();
 	delete iqRouter_;
 	delete stanzaChannel_;
 	delete parserFactory_;
+}
 void Server::start() {
 	if (serverFromClientConnectionServer) {
 		return;
+	}
@@ @@ -98,13 +100,13 @@ void Server::stop() { @@
+}
 void Server::handleNewClientConnection(boost::shared_ptr<Connection> connection) {
 	boost::shared_ptr<ServerFromClientSession> serverFromClientSession = boost::shared_ptr<ServerFromClientSession>(
 			new ServerFromClientSession(idGenerator.generateID(), connection,
 					getPayloadParserFactories(), getPayloadSerializers(), userRegistry_));
+					getPayloadParserFactories(), getPayloadSerializers(), userRegistry_, parserFactory_));
 	//serverFromClientSession->setAllowSASLEXTERNAL();
 	serverFromClientSession->onSessionStarted.connect(
 			boost::bind(&Server::handleSessionStarted, this, serverFromClientSession));
 	serverFromClientSession->onSessionFinished.connect(
 			boost::bind(&Server::handleSessionFinished, this,

include/Swiften/Server/Server.h

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ @@
 #include "Swiften/JID/JID.h"
 #include "Swiften/Base/ByteArray.h"
 #include "Swiften/Entity/Entity.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 namespace Swift {
 	class ConnectionServer;
 	class SessionTracer;
 	class EventLoop;
 	class NetworkFactories;
@@ @@ -81,8 +82,9 @@ namespace Swift { @@
 			std::list<boost::shared_ptr<ServerFromClientSession> > serverFromClientSessions;
 			JID selfJID;
 			StanzaChannel *stanzaChannel_;
 			IQRouter *iqRouter_;
 			TLSServerContextFactory *tlsFactory;
 			PKCS12Certificate cert;
 			PlatformXMLParserFactory *parserFactory_;
 	};
+}

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -30,14 +30,15 @@ namespace Swift { @@
 ServerFromClientSession::ServerFromClientSession(
 		const std::string& id,
 		boost::shared_ptr<Connection> connection,
 		PayloadParserFactoryCollection* payloadParserFactories,
 		PayloadSerializerCollection* payloadSerializers,
 		UserRegistry* userRegistry) :
 			Session(connection, payloadParserFactories, payloadSerializers),
 		UserRegistry* userRegistry,
 		XMLParserFactory* factory) :
 			Session(connection, payloadParserFactories, payloadSerializers, factory),
 			id_(id),
 			userRegistry_(userRegistry),
 			authenticated_(false),
 			initialized(false),
 			allowSASLEXTERNAL(false),
 			tlsLayer(0),

include/Swiften/Server/ServerFromClientSession.h

➞

Show inline comments

@@ @@ -35,13 +35,14 @@ namespace Swift { @@
 		public:
 			ServerFromClientSession(
 					const std::string& id,
 					boost::shared_ptr<Connection> connection,
 					PayloadParserFactoryCollection* payloadParserFactories,
 					PayloadSerializerCollection* payloadSerializers,
 					UserRegistry* userRegistry);
 					UserRegistry* userRegistry,
 					XMLParserFactory* factory);
 			~ServerFromClientSession();
 			boost::signal<void ()> onSessionStarted;
 			void setAllowSASLEXTERNAL();
 			const std::string &getUser() {
 				return user_;

0 comments (0 inline, 0 general)