diff options
author | Remko Tronçon <git@el-tramo.be> | 2009-07-14 17:27:32 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2009-07-14 17:27:32 (GMT) |
commit | ee3a46975986865fe5064f9d87a27277fc6c235a (patch) | |
tree | 51bae2ed1669ca881f761ca7547fbaf22432ae12 /Swiften/Server/ServerFromClientSession.cpp | |
parent | c34f50d3371f47c88d2ee927a5d59af8e135304c (diff) | |
download | swift-contrib-ee3a46975986865fe5064f9d87a27277fc6c235a.zip swift-contrib-ee3a46975986865fe5064f9d87a27277fc6c235a.tar.bz2 |
Consolidating IncomingConnection & Connection.
BoostConnections no longer have their own thread, but are managed from
a central Boost IO thread instead.
Diffstat (limited to 'Swiften/Server/ServerFromClientSession.cpp')
-rw-r--r-- | Swiften/Server/ServerFromClientSession.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Server/ServerFromClientSession.cpp b/Swiften/Server/ServerFromClientSession.cpp index e6ba28a..612e667 100644 --- a/Swiften/Server/ServerFromClientSession.cpp +++ b/Swiften/Server/ServerFromClientSession.cpp @@ -3,9 +3,9 @@ #include <boost/bind.hpp> #include "Swiften/Server/UserRegistry.h" -#include "Swiften/Network/IncomingConnection.h" +#include "Swiften/Network/Connection.h" #include "Swiften/StreamStack/StreamStack.h" -#include "Swiften/StreamStack/IncomingConnectionLayer.h" +#include "Swiften/StreamStack/ConnectionLayer.h" #include "Swiften/StreamStack/XMPPLayer.h" #include "Swiften/Elements/StreamFeatures.h" #include "Swiften/Elements/ResourceBind.h" @@ -20,7 +20,7 @@ namespace Swift { ServerFromClientSession::ServerFromClientSession( const String& id, - boost::shared_ptr<IncomingConnection> connection, + boost::shared_ptr<Connection> connection, PayloadParserFactoryCollection* payloadParserFactories, PayloadSerializerCollection* payloadSerializers, UserRegistry* userRegistry) : @@ -42,7 +42,7 @@ ServerFromClientSession::ServerFromClientSession( boost::bind(boost::ref(onDataRead), _1)); xmppLayer_->onWriteData.connect( boost::bind(boost::ref(onDataWritten), _1)); - connectionLayer_ = new IncomingConnectionLayer(connection_.get()); + connectionLayer_ = new ConnectionLayer(connection_.get()); streamStack_ = new StreamStack(xmppLayer_, connectionLayer_); } |