Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-07 19:26:45 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-07 19:26:45 (GMT) |
| commit | 7ad73a099f4e3e55cbafd004df3eb8d4007efb20 (patch) | |
| tree | bc9b6317cdd53e209223b2b28d5286165d474d97 /Swiften/Network/Connector.h | |
| parent | 39e4547f396b6a21ec4ceb2f28c003c4011229a7 (diff) | |
| parent | 2086abd85c97ee4e03f6d7b266076c6607012243 (diff) | |
| download | swift-7ad73a099f4e3e55cbafd004df3eb8d4007efb20.zip swift-7ad73a099f4e3e55cbafd004df3eb8d4007efb20.tar.bz2 | |
Merge branch 'case-305'
Diffstat (limited to 'Swiften/Network/Connector.h')
| -rw-r--r-- | Swiften/Network/Connector.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h index 32dd9ab..59fe708 100644 --- a/Swiften/Network/Connector.h +++ b/Swiften/Network/Connector.h @@ -31,7 +31,8 @@ namespace Swift { void handleAddressQueryResult(const std::vector<HostAddress>& address, boost::optional<DomainNameResolveError> error); void queryAddress(const String& hostname); - void tryNextHostname(); + void tryNextServiceOrFallback(); + void tryNextAddress(); void tryConnect(const HostAddressPort& target); void handleConnectionConnectFinished(bool error); @@ -48,7 +49,8 @@ namespace Swift { boost::shared_ptr<DomainNameServiceQuery> serviceQuery; std::deque<DomainNameServiceQuery::Result> serviceQueryResults; boost::shared_ptr<DomainNameAddressQuery> addressQuery; - bool queriedAllHosts; + std::deque<HostAddress> addressQueryResults; + bool queriedAllServices; boost::shared_ptr<Connection> currentConnection; }; }; |