Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-12-07 18:23:22 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-12-07 18:23:22 (GMT) |
| commit | e32059da8bffc67806862bf78f762d67fb3e4848 (patch) | |
| tree | 529f5481dc8b832090c778874a0255cbc1c73524 /Swiften/Client/ClientSession.h | |
| parent | 2e1bed9790ce11d856006aaa8692fed225cc10d3 (diff) | |
| download | swift-e32059da8bffc67806862bf78f762d67fb3e4848.zip swift-e32059da8bffc67806862bf78f762d67fb3e4848.tar.bz2 | |
Fixed segfault on disconnect.
Diffstat (limited to 'Swiften/Client/ClientSession.h')
| -rw-r--r-- | Swiften/Client/ClientSession.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h index ef4d747..685672e 100644 --- a/Swiften/Client/ClientSession.h +++ b/Swiften/Client/ClientSession.h @@ -1,96 +1,97 @@ #pragma once #include <boost/signal.hpp> #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include "Swiften/Base/Error.h" #include "Swiften/Session/SessionStream.h" #include "Swiften/Session/BasicSessionStream.h" #include "Swiften/Base/String.h" #include "Swiften/JID/JID.h" #include "Swiften/Elements/Element.h" namespace Swift { class ClientAuthenticator; class ClientSession : public boost::enable_shared_from_this<ClientSession> { public: enum State { Initial, WaitingForStreamStart, Negotiating, Compressing, WaitingForEncrypt, Encrypting, WaitingForCredentials, Authenticating, BindingResource, StartingSession, Initialized, Finished }; struct Error : public Swift::Error { enum Type { AuthenticationFailedError, CompressionFailedError, ServerVerificationFailedError, NoSupportedAuthMechanismsError, UnexpectedElementError, ResourceBindError, SessionStartError, TLSClientCertificateError, TLSError, } type; Error(Type type) : type(type) {} }; + ~ClientSession(); static boost::shared_ptr<ClientSession> create(const JID& jid, boost::shared_ptr<SessionStream> stream) { return boost::shared_ptr<ClientSession>(new ClientSession(jid, stream)); } State getState() const { return state; } void start(); void finish(); void sendCredentials(const String& password); void sendElement(boost::shared_ptr<Element> element); public: boost::signal<void ()> onNeedCredentials; boost::signal<void ()> onInitialized; boost::signal<void (boost::shared_ptr<Swift::Error>)> onFinished; boost::signal<void (boost::shared_ptr<Element>)> onElementReceived; private: ClientSession( const JID& jid, boost::shared_ptr<SessionStream>); void finishSession(Error::Type error); void finishSession(boost::shared_ptr<Swift::Error> error); JID getRemoteJID() const { return JID("", localJID.getDomain()); } void sendStreamHeader(); void sendSessionStart(); void handleElement(boost::shared_ptr<Element>); void handleStreamStart(const ProtocolHeader&); void handleStreamError(boost::shared_ptr<Swift::Error>); void handleTLSEncrypted(); bool checkState(State); private: JID localJID; State state; boost::shared_ptr<SessionStream> stream; bool needSessionStart; |