Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-06-23 15:52:23 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-07-11 17:33:42 (GMT) |
| commit | d949d1638c0778a6262c3afa13b55059a85b0499 (patch) | |
| tree | ca869e0f3be60772112a8459cda7b5e6bf0f4a87 | |
| parent | f2bcc401477dcb5ca52b5d9d5e85f4bf7bae9285 (diff) | |
| download | swift-contrib-d949d1638c0778a6262c3afa13b55059a85b0499.zip swift-contrib-d949d1638c0778a6262c3afa13b55059a85b0499.tar.bz2 | |
Apply a Connector timeout even if not using SRV lookups.
Test-Information:
Unit tests only
Change-Id: I7bc7d48a041f33b1a8527b5be4a476c12f796b34
| -rw-r--r-- | Swiften/Network/Connector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp index a58efbc..da2490f 100644 --- a/Swiften/Network/Connector.cpp +++ b/Swiften/Network/Connector.cpp @@ -32,11 +32,11 @@ void Connector::start() { assert(!timer); queriedAllServices = false; - if (serviceLookupPrefix) { - serviceQuery = resolver->createServiceQuery((*serviceLookupPrefix) + hostname); - serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, shared_from_this(), _1)); if (timeoutMilliseconds > 0) { timer = timerFactory->createTimer(timeoutMilliseconds); timer->onTick.connect(boost::bind(&Connector::handleTimeout, shared_from_this())); } + if (serviceLookupPrefix) { + serviceQuery = resolver->createServiceQuery((*serviceLookupPrefix) + hostname); + serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, shared_from_this(), _1)); serviceQuery->run(); } |