summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/LinkLocal/LinkLocalConnector.cpp')
-rw-r--r--Swiften/LinkLocal/LinkLocalConnector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/LinkLocal/LinkLocalConnector.cpp b/Swiften/LinkLocal/LinkLocalConnector.cpp
index af96e65..6471ca7 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.cpp
+++ b/Swiften/LinkLocal/LinkLocalConnector.cpp
@@ -1,37 +1,37 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#include <Swiften/LinkLocal/LinkLocalConnector.h>
#include <boost/bind.hpp>
#include <Swiften/Network/Connection.h>
#include <Swiften/Network/ConnectionFactory.h>
#include <Swiften/Network/HostAddress.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/LinkLocal/DNSSD/DNSSDQuerier.h>
#include <Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h>
namespace Swift {
LinkLocalConnector::LinkLocalConnector(
const LinkLocalService& service,
boost::shared_ptr<DNSSDQuerier> querier,
boost::shared_ptr<Connection> connection) :
service(service),
querier(querier),
connection(connection) {
}
LinkLocalConnector::~LinkLocalConnector() {
assert(!resolveQuery);
}
void LinkLocalConnector::connect() {
resolveQuery = querier->createResolveHostnameQuery(
service.getHostname(),
service.getID().getNetworkInterfaceID());
resolveQueryHostNameResolvedConnection = resolveQuery->onHostnameResolved.connect(boost::bind(
@@ -39,41 +39,41 @@ void LinkLocalConnector::connect() {
boost::dynamic_pointer_cast<LinkLocalConnector>(shared_from_this()),
_1));
resolveQuery->run();
}
void LinkLocalConnector::cancel() {
if (resolveQuery) {
resolveQuery->finish();
resolveQueryHostNameResolvedConnection.disconnect();
resolveQuery.reset();
}
connectionConnectFinishedConnection.disconnect();
connection->disconnect();
}
void LinkLocalConnector::handleHostnameResolved(const boost::optional<HostAddress>& address) {
resolveQuery->finish();
resolveQueryHostNameResolvedConnection.disconnect();
resolveQuery.reset();
if (address) {
connectionConnectFinishedConnection = connection->onConnectFinished.connect(
boost::bind(&LinkLocalConnector::handleConnected, shared_from_this(), _1));
connection->connect(HostAddressPort(*address, service.getPort()));
}
else {
onConnectFinished(true);
}
}
void LinkLocalConnector::handleConnected(bool error) {
onConnectFinished(error);
assert(connectionConnectFinishedConnection.connected());
connectionConnectFinishedConnection.disconnect();
}
-void LinkLocalConnector::queueElement(boost::shared_ptr<Element> element) {
+void LinkLocalConnector::queueElement(boost::shared_ptr<ToplevelElement> element) {
queuedElements.push_back(element);
}
}