diff options
author | Nick Hudson <nick.hudson@isode.com> | 2014-02-07 16:33:32 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2014-03-22 22:17:19 (GMT) |
commit | 0bb2f5b6e811842c52500eef6685cc64367bd611 (patch) | |
tree | 744b5c8d2ee6e873fecb282ac9e79f65acf75b22 /Swiften/Network/ProxiedConnection.cpp | |
parent | 01a76f36fe0e2ad5ea778a3ece63f39866c50362 (diff) | |
download | swift-0bb2f5b6e811842c52500eef6685cc64367bd611.zip swift-0bb2f5b6e811842c52500eef6685cc64367bd611.tar.bz2 |
Move hardcoded XMPP SRV information from Connector into CoreClient
The Connector class had "_xmpp-client._tcp." hard-coded in it, which meant
that it was not suitable for non-XMPP clients.
This change means that the Connector can now be used by clients who
are interested in arbitrary SRV records; the CoreClient class is updated
accordingly.
Test-information:
Built and ran Swift - seems to work as expected
Ran unit-tests ("scons test=unit") - reports OK
Change-Id: I0fea9aa90f5d1d5e3a4b90f3362b663fe9d8e207
Diffstat (limited to 'Swiften/Network/ProxiedConnection.cpp')
-rw-r--r-- | Swiften/Network/ProxiedConnection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Network/ProxiedConnection.cpp b/Swiften/Network/ProxiedConnection.cpp index 8bf12d3..0061820 100644 --- a/Swiften/Network/ProxiedConnection.cpp +++ b/Swiften/Network/ProxiedConnection.cpp @@ -53,7 +53,7 @@ void ProxiedConnection::cancelConnector() { void ProxiedConnection::connect(const HostAddressPort& server) { server_ = server; - connector_ = Connector::create(proxyHost_, proxyPort_, false, resolver_, connectionFactory_, timerFactory_); + connector_ = Connector::create(proxyHost_, proxyPort_, boost::optional<std::string>(), resolver_, connectionFactory_, timerFactory_); connector_->onConnectFinished.connect(boost::bind(&ProxiedConnection::handleConnectFinished, shared_from_this(), _1)); connector_->start(); } |