stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed compilation issue with latest swiften

Browse source
This commit is contained in:
HanzZ 2011-10-10 21:09:47 +02:00
parent 0509696bfd
commit f81a8aa784
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/Swiften/Server/Server.cpp
View file

@ -49,12 +49,14 @@ Server::Server(
stanzaChannel_ = new ServerStanzaChannel();
iqRouter_ = new IQRouter(stanzaChannel_);
tlsFactory = NULL;
parserFactory_ = new PlatformXMLParserFactory();
}
Server::~Server() {
stop();
delete iqRouter_;
delete stanzaChannel_;
delete parserFactory_;
}
void Server::start() {
@ -101,7 +103,7 @@ 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(

2
include/Swiften/Server/Server.h
View file

@ -22,6 +22,7 @@
#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;
@ -84,5 +85,6 @@ namespace Swift {
IQRouter *iqRouter_;
TLSServerContextFactory *tlsFactory;
PKCS12Certificate cert;
PlatformXMLParserFactory *parserFactory_;
};
}

5
include/Swiften/Server/ServerFromClientSession.cpp
View file

@ -33,8 +33,9 @@ ServerFromClientSession::ServerFromClientSession(
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),

3
include/Swiften/Server/ServerFromClientSession.h
View file

@ -38,7 +38,8 @@ namespace Swift {
boost::shared_ptr<Connection> connection,
PayloadParserFactoryCollection* payloadParserFactories,
PayloadSerializerCollection* payloadSerializers,
UserRegistry* userRegistry);
UserRegistry* userRegistry,
XMLParserFactory* factory);
~ServerFromClientSession();
boost::signal<void ()> onSessionStarted;