summaryrefslogtreecommitdiffstats
path: root/Sluift
diff options
context:
space:
mode:
authorRoger Planas <roger.planas@isode.com>2013-12-13 11:32:13 (GMT)
committerSwift Review <review@swift.im>2013-12-15 11:34:40 (GMT)
commit503a8077c8811c2e9f65a619c33690a36eb5c153 (patch)
treef931f4de989d43a393f82cdddc1461e7e5b0ab40 /Sluift
parent8cf453060fb5d7b494947cb627a4ca31ba8c937c (diff)
downloadswift-503a8077c8811c2e9f65a619c33690a36eb5c153.zip
swift-503a8077c8811c2e9f65a619c33690a36eb5c153.tar.bz2
Sluift: Fix default values for port and host for connect
Change-Id: Ia19e0a3763005df7fb7db6b57841d6559f74ef46
Diffstat (limited to 'Sluift')
-rw-r--r--Sluift/SluiftClient.cpp1
-rw-r--r--Sluift/client.cpp11
2 files changed, 4 insertions, 8 deletions
diff --git a/Sluift/SluiftClient.cpp b/Sluift/SluiftClient.cpp
index 184fbd6..257eec1 100644
--- a/Sluift/SluiftClient.cpp
+++ b/Sluift/SluiftClient.cpp
@@ -56,6 +56,7 @@ void SluiftClient::connect(const std::string& host, int port) {
rosterReceived = false;
options.manualHostname = host;
options.manualPort = port;
+ disconnectedError = boost::optional<ClientError>();
if (globals->debug) {
tracer = new ClientXMLTracer(client, options.boshURL.isEmpty()? false: true);
}
diff --git a/Sluift/client.cpp b/Sluift/client.cpp
index 2ca62d6..cd675fa 100644
--- a/Sluift/client.cpp
+++ b/Sluift/client.cpp
@@ -47,8 +47,8 @@ static inline SluiftClient* getClient(lua_State* L) {
SLUIFT_LUA_FUNCTION(Client, async_connect) {
SluiftClient* client = getClient(L);
- std::string host;
- int port = -1;
+ std::string host = client->getOptions().manualHostname;
+ int port = client->getOptions().manualPort;
if (lua_istable(L, 2)) {
if (boost::optional<std::string> hostString = Lua::getStringField(L, 2, "host")) {
host = *hostString;
@@ -57,12 +57,7 @@ SLUIFT_LUA_FUNCTION(Client, async_connect) {
port = *portInt;
}
}
- if (host.empty() && port == -1) {
- client->connect();
- }
- else {
- client->connect(host, port);
- }
+ client->connect(host, port);
return 0;
}