Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Swiften/Network/Connector.cpp12
-rw-r--r--Swiften/Network/PlatformDomainNameResolver.cpp6
-rw-r--r--Swiften/Network/PlatformDomainNameServiceQuery.cpp3
-rw-r--r--Swiften/Network/PlatformDomainNameServiceQuery.h2
4 files changed, 22 insertions, 1 deletions
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp
index c9087d7..6e454ad 100644
--- a/Swiften/Network/Connector.cpp
+++ b/Swiften/Network/Connector.cpp
@@ -10,12 +10,13 @@
namespace Swift {
Connector::Connector(const String& hostname, DomainNameResolver* resolver, ConnectionFactory* connectionFactory) : hostname(hostname), resolver(resolver), connectionFactory(connectionFactory), queriedAllHosts(true) {
}
void Connector::start() {
+ std::cout << "Connector::start()" << std::endl;
assert(!currentConnection);
assert(!serviceQuery);
queriedAllHosts = false;
serviceQuery = resolver->createServiceQuery("_xmpp-client._tcp." + hostname);
serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, this, _1));
serviceQuery->run();
@@ -26,62 +27,73 @@ void Connector::queryAddress(const String& hostname) {
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) {
+ std::cout << "Received SRV results" << std::endl;
serviceQueryResults = std::deque<DomainNameServiceQuery::Result>(result.begin(), result.end());
serviceQuery.reset();
tryNextHostname();
}
void Connector::tryNextHostname() {
if (queriedAllHosts) {
+ std::cout << "Connector::tryNextHostName(): Queried all hosts. Error." << std::endl;
onConnectFinished(boost::shared_ptr<Connection>());
}
else if (serviceQueryResults.empty()) {
+ std::cout << "Connector::tryNextHostName(): Falling back on A resolution" << std::endl;
// Fall back on simple address resolving
queriedAllHosts = true;
queryAddress(hostname);
}
else {
+ std::cout << "Connector::tryNextHostName(): Querying next address" << std::endl;
queryAddress(serviceQueryResults.front().hostname);
}
}
void Connector::handleAddressQueryResult(const HostAddress& address, boost::optional<DomainNameResolveError> error) {
+ std::cout << "Connector::handleAddressQueryResult(): Start" << std::endl;
addressQuery.reset();
if (!serviceQueryResults.empty()) {
DomainNameServiceQuery::Result serviceQueryResult = serviceQueryResults.front();
serviceQueryResults.pop_front();
if (error) {
+ std::cout << "Connector::handleAddressQueryResult(): A lookup for SRV host " << serviceQueryResult.hostname << " failed." << std::endl;
tryNextHostname();
}
else {
+ std::cout << "Connector::handleAddressQueryResult(): A lookup for SRV host " << serviceQueryResult.hostname << " succeeded: " << address.toString() << std::endl;
tryConnect(HostAddressPort(address, serviceQueryResult.port));
}
}
else if (error) {
+ std::cout << "Connector::handleAddressQueryResult(): Fallback address query failed. Giving up" << std::endl;
// The fallback address query failed
assert(queriedAllHosts);
onConnectFinished(boost::shared_ptr<Connection>());
}
else {
+ std::cout << "Connector::handleAddressQueryResult(): Fallback address query succeeded: " << address.toString() << std::endl;
// The fallback query succeeded
tryConnect(HostAddressPort(address, 5222));
}
}
void Connector::tryConnect(const HostAddressPort& target) {
assert(!currentConnection);
+ std::cout << "Connector::tryConnect() " << target.getAddress().toString() << " " << target.getPort() << std::endl;
currentConnection = connectionFactory->createConnection();
currentConnection->onConnectFinished.connect(boost::bind(&Connector::handleConnectionConnectFinished, this, _1));
currentConnection->connect(target);
}
void Connector::handleConnectionConnectFinished(bool error) {
+ std::cout << "Connector::handleConnectionConnectFinished() " << error << std::endl;
if (error) {
currentConnection.reset();
tryNextHostname();
}
else {
onConnectFinished(currentConnection);
diff --git a/Swiften/Network/PlatformDomainNameResolver.cpp b/Swiften/Network/PlatformDomainNameResolver.cpp
index 3636cd6..755b177 100644
--- a/Swiften/Network/PlatformDomainNameResolver.cpp
+++ b/Swiften/Network/PlatformDomainNameResolver.cpp
@@ -37,28 +37,34 @@ namespace {
void run() {
safeToJoin = false;
thread = new boost::thread(boost::bind(&AddressQuery::doRun, shared_from_this()));
}
void doRun() {
+ std::cout << "PlatformDomainNameResolver::doRun()" << std::endl;
boost::asio::ip::tcp::resolver resolver(ioService);
boost::asio::ip::tcp::resolver::query query(hostname.getUTF8String(), "5222");
try {
+ std::cout << "PlatformDomainNameResolver::doRun(): Resolving" << std::endl;
boost::asio::ip::tcp::resolver::iterator endpointIterator = resolver.resolve(query);
+ std::cout << "PlatformDomainNameResolver::doRun(): Resolved" << std::endl;
if (endpointIterator == boost::asio::ip::tcp::resolver::iterator()) {
+ std::cout << "PlatformDomainNameResolver::doRun(): Error 1" << std::endl;
emitError();
}
else {
boost::asio::ip::address address = (*endpointIterator).endpoint().address();
HostAddress result = (address.is_v4() ? HostAddress(&address.to_v4().to_bytes()[0], 4) : HostAddress(&address.to_v6().to_bytes()[0], 16));
+ std::cout << "PlatformDomainNameResolver::doRun(): Success" << std::endl;
MainEventLoop::postEvent(
boost::bind(boost::ref(onResult), result, boost::optional<DomainNameResolveError>()),
shared_from_this());
}
}
catch (...) {
+ std::cout << "PlatformDomainNameResolver::doRun(): Error 2" << std::endl;
emitError();
}
safeToJoin = true;
}
void emitError() {
diff --git a/Swiften/Network/PlatformDomainNameServiceQuery.cpp b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
index 12afbb7..bc2138d 100644
--- a/Swiften/Network/PlatformDomainNameServiceQuery.cpp
+++ b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
@@ -79,15 +79,17 @@ void PlatformDomainNameServiceQuery::doRun() {
currentEntry = currentEntry->pNext;
}
DnsRecordListFree(responses, DnsFreeRecordList);
#else
+ std::cout << "SRV: Querying " << service << std::endl;
ByteArray response;
response.resize(NS_PACKETSZ);
int responseLength = res_query(const_cast<char*>(service.getUTF8Data()), ns_c_in, ns_t_srv, reinterpret_cast<u_char*>(response.getData()), response.getSize());
+ std::cout << "res_query done " << (responseLength != -1) << std::endl;
if (responseLength == -1) {
emitError();
return;
}
// Parse header
@@ -159,12 +161,13 @@ void PlatformDomainNameServiceQuery::doRun() {
answersCount--;
}
#endif
safeToJoin = true;
std::sort(records.begin(), records.end(), SRVRecordPriorityComparator());
+ std::cout << "Sending out " << records.size() << " SRV results " << std::endl;
MainEventLoop::postEvent(boost::bind(boost::ref(onResult), records));
}
void PlatformDomainNameServiceQuery::emitError() {
safeToJoin = true;
MainEventLoop::postEvent(boost::bind(boost::ref(onResult), std::vector<DomainNameServiceQuery::Result>()), shared_from_this());
diff --git a/Swiften/Network/PlatformDomainNameServiceQuery.h b/Swiften/Network/PlatformDomainNameServiceQuery.h
index 1b1c1b5..753e2c6 100644
--- a/Swiften/Network/PlatformDomainNameServiceQuery.h
+++ b/Swiften/Network/PlatformDomainNameServiceQuery.h
@@ -18,10 +18,10 @@ namespace Swift {
private:
void doRun();
void emitError();
private:
boost::thread* thread;
- bool safeToJoin;
String service;
+ bool safeToJoin;
};
}