Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-12-02 20:42:30 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-12-03 08:09:01 (GMT) |
| commit | 5608da36a3a319070494d5a70ff984e7c172186e (patch) | |
| tree | 2c44df5a9f0ea0ab180763222e54aece5dc65c93 /Swiften/Network/Connector.cpp | |
| parent | 6e50bd41dc3f11815a40dfef500dc0d61ea5d737 (diff) | |
| download | swift-contrib-5608da36a3a319070494d5a70ff984e7c172186e.zip swift-contrib-5608da36a3a319070494d5a70ff984e7c172186e.tar.bz2 | |
DNS querying is now asynchronous.
This means we can now move them to a separate thread.
Diffstat (limited to 'Swiften/Network/Connector.cpp')
| -rw-r--r-- | Swiften/Network/Connector.cpp | 73 |
1 files changed, 58 insertions, 15 deletions
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp index 5b4fe22..c9087d7 100644 --- a/Swiften/Network/Connector.cpp +++ b/Swiften/Network/Connector.cpp @@ -1,43 +1,86 @@ #include "Swiften/Network/Connector.h" #include <boost/bind.hpp> +#include <iostream> #include "Swiften/Network/ConnectionFactory.h" #include "Swiften/Network/DomainNameResolver.h" -#include "Swiften/Network/DomainNameResolveException.h" +#include "Swiften/Network/DomainNameAddressQuery.h" namespace Swift { -Connector::Connector(const String& hostname, DomainNameResolver* resolver, ConnectionFactory* connectionFactory) : hostname(hostname), resolver(resolver), connectionFactory(connectionFactory) { +Connector::Connector(const String& hostname, DomainNameResolver* resolver, ConnectionFactory* connectionFactory) : hostname(hostname), resolver(resolver), connectionFactory(connectionFactory), queriedAllHosts(true) { } void Connector::start() { assert(!currentConnection); - try { - std::vector<HostAddressPort> resolveResult = resolver->resolve(hostname.getUTF8String()); - resolvedHosts = std::deque<HostAddressPort>(resolveResult.begin(), resolveResult.end()); - tryNextHostname(); - } - catch (const DomainNameResolveException&) { + assert(!serviceQuery); + queriedAllHosts = false; + serviceQuery = resolver->createServiceQuery("_xmpp-client._tcp." + hostname); + serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, this, _1)); + serviceQuery->run(); +} + +void Connector::queryAddress(const String& hostname) { + assert(!addressQuery); + addressQuery = resolver->createAddressQuery(hostname); + addressQuery->onResult.connect(boost::bind(&Connector::handleAddressQueryResult, this, _1, _2)); + addressQuery->run(); +} + +void Connector::handleServiceQueryResult(const std::vector<DomainNameServiceQuery::Result>& result) { + serviceQueryResults = std::deque<DomainNameServiceQuery::Result>(result.begin(), result.end()); + serviceQuery.reset(); + tryNextHostname(); +} + +void Connector::tryNextHostname() { + if (queriedAllHosts) { onConnectFinished(boost::shared_ptr<Connection>()); } + else if (serviceQueryResults.empty()) { + // Fall back on simple address resolving + queriedAllHosts = true; + queryAddress(hostname); + } + else { + queryAddress(serviceQueryResults.front().hostname); + } } -void Connector::tryNextHostname() { - if (resolvedHosts.empty()) { +void Connector::handleAddressQueryResult(const HostAddress& address, boost::optional<DomainNameResolveError> error) { + addressQuery.reset(); + if (!serviceQueryResults.empty()) { + DomainNameServiceQuery::Result serviceQueryResult = serviceQueryResults.front(); + serviceQueryResults.pop_front(); + if (error) { + tryNextHostname(); + } + else { + tryConnect(HostAddressPort(address, serviceQueryResult.port)); + } + } + else if (error) { + // The fallback address query failed + assert(queriedAllHosts); onConnectFinished(boost::shared_ptr<Connection>()); } else { - HostAddressPort remote = resolvedHosts.front(); - resolvedHosts.pop_front(); - currentConnection = connectionFactory->createConnection(); - currentConnection->onConnectFinished.connect(boost::bind(&Connector::handleConnectionConnectFinished, this, _1)); - currentConnection->connect(remote); + // The fallback query succeeded + tryConnect(HostAddressPort(address, 5222)); } } +void Connector::tryConnect(const HostAddressPort& target) { + assert(!currentConnection); + currentConnection = connectionFactory->createConnection(); + currentConnection->onConnectFinished.connect(boost::bind(&Connector::handleConnectionConnectFinished, this, _1)); + currentConnection->connect(target); +} + void Connector::handleConnectionConnectFinished(bool error) { if (error) { + currentConnection.reset(); tryNextHostname(); } else { |