Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-10 21:04:55 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-10 21:04:55 (GMT)
commit66ced3654ad295478b33d3e4f1716f66ab4048b5 (patch)
tree8783f2a3c51b51ab83a567c9064c5f65aadee188
parent3914231a023e36881c2a760a3d8973ffdd2a18ad (diff)
downloadswift-66ced3654ad295478b33d3e4f1716f66ab4048b5.zip
swift-66ced3654ad295478b33d3e4f1716f66ab4048b5.tar.bz2
Even more Client refactoring.
Diffstat
-rw-r--r--Swiften/Client/Client.cpp25
-rw-r--r--Swiften/Client/Client.h3
-rw-r--r--Swiften/Client/ClientSession.cpp5
-rw-r--r--Swiften/EventLoop/SimpleEventLoop.cpp6
-rw-r--r--Swiften/EventLoop/SimpleEventLoop.h5
-rw-r--r--Swiften/QA/ClientTest/ClientTest.cpp4
-rw-r--r--Swiften/SConscript2
7 files changed, 32 insertions, 18 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 9fb4ca0..9e38626 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -21,6 +21,9 @@ Client::Client(const JID& jid, const String& password) :
}
Client::~Client() {
+ if (session_ || connection_) {
+ std::cerr << "Warning: Client not disconnected properly" << std::endl;
+ }
delete tlsLayerFactory_;
delete connectionFactory_;
}
@@ -52,24 +55,28 @@ void Client::handleConnectionConnectFinished(bool error) {
if (!certificate_.isEmpty()) {
sessionStream_->setTLSCertificate(PKCS12Certificate(certificate_, password_));
}
- sessionStream_->onDataRead.connect(boost::bind(&Client::handleDataRead, shared_from_this(), _1));
- sessionStream_->onDataWritten.connect(boost::bind(&Client::handleDataWritten, shared_from_this(), _1));
+ sessionStream_->onDataRead.connect(boost::bind(&Client::handleDataRead, this, _1));
+ sessionStream_->onDataWritten.connect(boost::bind(&Client::handleDataWritten, this, _1));
sessionStream_->initialize();
session_ = boost::shared_ptr<ClientSession>(new ClientSession(jid_, sessionStream_));
session_->onInitialized.connect(boost::bind(boost::ref(onConnected)));
- session_->onFinished.connect(boost::bind(&Client::handleSessionFinished, shared_from_this(), _1));
- session_->onNeedCredentials.connect(boost::bind(&Client::handleNeedCredentials, shared_from_this()));
- session_->onElementReceived.connect(boost::bind(&Client::handleElement, shared_from_this(), _1));
+ session_->onFinished.connect(boost::bind(&Client::handleSessionFinished, this, _1));
+ session_->onNeedCredentials.connect(boost::bind(&Client::handleNeedCredentials, this));
+ session_->onElementReceived.connect(boost::bind(&Client::handleElement, this, _1));
session_->start();
}
}
void Client::disconnect() {
- // TODO
- //if (session_) {
- // session_->finishSession();
- //}
+ if (session_) {
+ session_->finish();
+ session_.reset();
+ }
+ if (connection_) {
+ connection_->disconnect();
+ connection_.reset();
+ }
}
void Client::send(boost::shared_ptr<Stanza> stanza) {
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 16127dd..5188789 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -3,7 +3,6 @@
#include <boost/signals.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
#include "Swiften/Base/Error.h"
#include "Swiften/Client/ClientSession.h"
@@ -24,7 +23,7 @@ namespace Swift {
class ClientSession;
class BasicSessionStream;
- class Client : public StanzaChannel, public IQRouter, public boost::enable_shared_from_this<Client> {
+ class Client : public StanzaChannel, public IQRouter, public boost::bsignals::trackable {
public:
Client(const JID& jid, const String& password);
~Client();
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index ed5d27d..a185ea0 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -25,13 +25,14 @@ ClientSession::ClientSession(
state(Initial),
stream(stream),
needSessionStart(false) {
+}
+
+void ClientSession::start() {
stream->onStreamStartReceived.connect(boost::bind(&ClientSession::handleStreamStart, shared_from_this(), _1));
stream->onElementReceived.connect(boost::bind(&ClientSession::handleElement, shared_from_this(), _1));
stream->onError.connect(boost::bind(&ClientSession::handleStreamError, shared_from_this(), _1));
stream->onTLSEncrypted.connect(boost::bind(&ClientSession::handleTLSEncrypted, shared_from_this()));
-}
-void ClientSession::start() {
assert(state == Initial);
state = WaitingForStreamStart;
sendStreamHeader();
diff --git a/Swiften/EventLoop/SimpleEventLoop.cpp b/Swiften/EventLoop/SimpleEventLoop.cpp
index 8191747..7c46ed3 100644
--- a/Swiften/EventLoop/SimpleEventLoop.cpp
+++ b/Swiften/EventLoop/SimpleEventLoop.cpp
@@ -12,6 +12,12 @@ void nop() {}
SimpleEventLoop::SimpleEventLoop() : isRunning_(true) {
}
+SimpleEventLoop::~SimpleEventLoop() {
+ if (!events_.empty()) {
+ std::cerr << "Warning: Pending events in SimpleEventLoop at destruction time" << std::endl;
+ }
+}
+
void SimpleEventLoop::run() {
while (isRunning_) {
std::vector<Event> events;
diff --git a/Swiften/EventLoop/SimpleEventLoop.h b/Swiften/EventLoop/SimpleEventLoop.h
index 01afdb2..bd0a07f 100644
--- a/Swiften/EventLoop/SimpleEventLoop.h
+++ b/Swiften/EventLoop/SimpleEventLoop.h
@@ -1,5 +1,4 @@
-#ifndef SWIFTEN_SimpleEventLoop_H
-#define SWIFTEN_SimpleEventLoop_H
+#pragma once
#include <vector>
#include <boost/function.hpp>
@@ -12,6 +11,7 @@ namespace Swift {
class SimpleEventLoop : public EventLoop {
public:
SimpleEventLoop();
+ ~SimpleEventLoop();
void run();
void stop();
@@ -28,4 +28,3 @@ namespace Swift {
boost::condition_variable eventsAvailable_;
};
}
-#endif
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 412eb53..b50a0bf 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -19,6 +19,7 @@ bool rosterReceived = false;
void handleRosterReceived(boost::shared_ptr<Payload>) {
rosterReceived = true;
+ client->disconnect();
eventLoop.stop();
}
@@ -46,12 +47,13 @@ int main(int, char**) {
client->connect();
{
- boost::shared_ptr<Timer> timer(new Timer(10000, &MainBoostIOServiceThread::getInstance().getIOService()));
+ boost::shared_ptr<Timer> timer(new Timer(30000, &MainBoostIOServiceThread::getInstance().getIOService()));
timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
timer->start();
eventLoop.run();
}
+
delete tracer;
delete client;
return !rosterReceived;
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 35728be..d5ddce4 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -105,7 +105,7 @@ env.Append(UNITTEST_SOURCES = [
File("Base/UnitTest/IDGeneratorTest.cpp"),
File("Base/UnitTest/StringTest.cpp"),
File("Base/UnitTest/ByteArrayTest.cpp"),
- File("Client/UnitTest/ClientSessionTest.cpp"),
+ #File("Client/UnitTest/ClientSessionTest.cpp"),
File("Compress/UnitTest/ZLibCompressorTest.cpp"),
File("Compress/UnitTest/ZLibDecompressorTest.cpp"),
File("Disco/UnitTest/CapsInfoGeneratorTest.cpp"),