From db00adc9810377500e6ab27900b29496a0d05afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Wed, 25 Nov 2009 20:19:28 +0100 Subject: Enabled stream compression again. diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 22d71e5..d94cadc 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -262,8 +262,8 @@ void MainController::performLoginFromCachedCredentials() { if (!client_) { client_ = new Swift::Client(jid_, password_); presenceSender_ = new PresenceSender(client_); - //client_->onDataRead.connect(&printIncomingData); - //client_->onDataWritten.connect(&printOutgoingData); + client_->onDataRead.connect(&printIncomingData); + client_->onDataWritten.connect(&printOutgoingData); if (!certificateFile_.isEmpty()) { client_->setCertificate(certificateFile_); } @@ -284,6 +284,7 @@ void MainController::handleError(const ClientError& error) { case ClientError::ConnectionWriteError: message = "Error while sending data to the server"; break; case ClientError::XMLError: message = "Error parsing server data"; break; case ClientError::AuthenticationFailedError: message = "Login/password invalid"; break; + case ClientError::CompressionFailedError: message = "Error while compressing stream"; break; case ClientError::ServerVerificationFailedError: message = "Server verification failed"; break; case ClientError::NoSupportedAuthMechanismsError: message = "Authentication mechanisms not supported"; break; case ClientError::UnexpectedElementError: message = "Unexpected response"; break; diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 800a009..42cf07a 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -22,6 +22,8 @@ myenv = env.Clone() myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"]) myenv.MergeFlags(env["SWIFTOOLS_FLAGS"]) +if myenv["HAVE_XSS"] : + myenv.MergeFlags(env["XSS_FLAGS"]) myenv.MergeFlags(env["SWIFTEN_FLAGS"]) myenv.MergeFlags(env["CPPUNIT_FLAGS"]) myenv.MergeFlags(env["LIBIDN_FLAGS"]) diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp index 3962281..19f7ee5 100644 --- a/Swiften/Client/Client.cpp +++ b/Swiften/Client/Client.cpp @@ -145,6 +145,9 @@ void Client::handleSessionFinished(boost::shared_ptr error) { case ClientSession::Error::AuthenticationFailedError: clientError = ClientError(ClientError::AuthenticationFailedError); break; + case ClientSession::Error::CompressionFailedError: + clientError = ClientError(ClientError::CompressionFailedError); + break; case ClientSession::Error::ServerVerificationFailedError: clientError = ClientError(ClientError::ServerVerificationFailedError); break; diff --git a/Swiften/Client/ClientError.h b/Swiften/Client/ClientError.h index 55c57fc..a0557d4 100644 --- a/Swiften/Client/ClientError.h +++ b/Swiften/Client/ClientError.h @@ -11,6 +11,7 @@ namespace Swift { ConnectionWriteError, XMLError, AuthenticationFailedError, + CompressionFailedError, ServerVerificationFailedError, NoSupportedAuthMechanismsError, UnexpectedElementError, diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp index 61ce8ef..8427d27 100644 --- a/Swiften/Client/ClientSession.cpp +++ b/Swiften/Client/ClientSession.cpp @@ -12,6 +12,9 @@ #include "Swiften/Elements/AuthFailure.h" #include "Swiften/Elements/AuthChallenge.h" #include "Swiften/Elements/AuthResponse.h" +#include "Swiften/Elements/Compressed.h" +#include "Swiften/Elements/CompressFailure.h" +#include "Swiften/Elements/CompressRequest.h" #include "Swiften/Elements/StartSession.h" #include "Swiften/Elements/IQ.h" #include "Swiften/Elements/ResourceBind.h" @@ -70,6 +73,10 @@ void ClientSession::handleElement(boost::shared_ptr element) { state = WaitingForEncrypt; stream->writeElement(boost::shared_ptr(new StartTLSRequest())); } + else if (streamFeatures->hasCompressionMethod("zlib")) { + state = Compressing; + stream->writeElement(boost::shared_ptr(new CompressRequest("zlib"))); + } else if (streamFeatures->hasAuthenticationMechanisms()) { if (stream->hasTLSCertificate()) { if (streamFeatures->hasAuthenticationMechanism("EXTERNAL")) { @@ -120,6 +127,16 @@ void ClientSession::handleElement(boost::shared_ptr element) { } } } + else if (boost::dynamic_pointer_cast(element)) { + checkState(Compressing); + state = WaitingForStreamStart; + stream->addZLibCompression(); + stream->resetXMPPParser(); + sendStreamHeader(); + } + else if (boost::dynamic_pointer_cast(element)) { + finishSession(Error::CompressionFailedError); + } else if (AuthChallenge* challenge = dynamic_cast(element.get())) { checkState(Authenticating); assert(authenticator); diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h index 5e5acbc..ef4d747 100644 --- a/Swiften/Client/ClientSession.h +++ b/Swiften/Client/ClientSession.h @@ -34,6 +34,7 @@ namespace Swift { struct Error : public Swift::Error { enum Type { AuthenticationFailedError, + CompressionFailedError, ServerVerificationFailedError, NoSupportedAuthMechanismsError, UnexpectedElementError, diff --git a/Swiften/Client/UnitTest/ClientSessionTest.cpp b/Swiften/Client/UnitTest/ClientSessionTest.cpp index 9fe2a3d..e035ba3 100644 --- a/Swiften/Client/UnitTest/ClientSessionTest.cpp +++ b/Swiften/Client/UnitTest/ClientSessionTest.cpp @@ -173,7 +173,7 @@ class ClientSessionTest : public CppUnit::TestFixture { bool footer; }; - MockSessionStream() : available(true), canTLSEncrypt(true), tlsEncrypted(false), whitespacePingEnabled(false), resetCount(0) { + MockSessionStream() : available(true), canTLSEncrypt(true), tlsEncrypted(false), compressed(false), whitespacePingEnabled(false), resetCount(0) { } virtual bool isAvailable() { @@ -200,6 +200,10 @@ class ClientSessionTest : public CppUnit::TestFixture { tlsEncrypted = true; } + virtual void addZLibCompression() { + compressed = true; + } + virtual void setWhitespacePingEnabled(bool enabled) { whitespacePingEnabled = enabled; } @@ -286,6 +290,7 @@ class ClientSessionTest : public CppUnit::TestFixture { bool available; bool canTLSEncrypt; bool tlsEncrypted; + bool compressed; bool whitespacePingEnabled; int resetCount; std::deque receivedEvents; diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp index 0d0f49f..ed7f1eb 100644 --- a/Swiften/Session/BasicSessionStream.cpp +++ b/Swiften/Session/BasicSessionStream.cpp @@ -6,6 +6,7 @@ #include "Swiften/StreamStack/StreamStack.h" #include "Swiften/StreamStack/ConnectionLayer.h" #include "Swiften/StreamStack/WhitespacePingLayer.h" +#include "Swiften/StreamStack/CompressionLayer.h" #include "Swiften/StreamStack/TLSLayer.h" #include "Swiften/StreamStack/TLSLayerFactory.h" @@ -74,6 +75,11 @@ void BasicSessionStream::addTLSEncryption() { } } +void BasicSessionStream::addZLibCompression() { + boost::shared_ptr compressionLayer(new CompressionLayer()); + streamStack->addLayer(compressionLayer); +} + void BasicSessionStream::setWhitespacePingEnabled(bool enabled) { if (enabled) { if (!whitespacePingLayer) { diff --git a/Swiften/Session/BasicSessionStream.h b/Swiften/Session/BasicSessionStream.h index f36df83..8618458 100644 --- a/Swiften/Session/BasicSessionStream.h +++ b/Swiften/Session/BasicSessionStream.h @@ -16,6 +16,7 @@ namespace Swift { class StreamStack; class XMPPLayer; class ConnectionLayer; + class CompressionLayer; class BasicSessionStream : public SessionStream, @@ -38,6 +39,8 @@ namespace Swift { virtual void writeElement(boost::shared_ptr); virtual void writeFooter(); + virtual void addZLibCompression(); + virtual bool supportsTLSEncryption(); virtual void addTLSEncryption(); @@ -65,6 +68,7 @@ namespace Swift { boost::shared_ptr xmppLayer; boost::shared_ptr connectionLayer; StreamStack* streamStack; + boost::shared_ptr compressionLayer; boost::shared_ptr tlsLayer; boost::shared_ptr whitespacePingLayer; }; diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h index 1252c5a..8c64ccf 100644 --- a/Swiften/Session/SessionStream.h +++ b/Swiften/Session/SessionStream.h @@ -34,6 +34,8 @@ namespace Swift { virtual void writeFooter() = 0; virtual void writeElement(boost::shared_ptr) = 0; + virtual void addZLibCompression() = 0; + virtual bool supportsTLSEncryption() = 0; virtual void addTLSEncryption() = 0; virtual void setWhitespacePingEnabled(bool enabled) = 0; -- cgit v0.10.2-6-g49f6