diff --git a/client/src/core/host.cc b/client/src/core/host.cc index 10182ad..dadbf67 100644 --- a/client/src/core/host.cc +++ b/client/src/core/host.cc @@ -65,11 +65,9 @@ this->session = nullptr; } - Host & Host::connect(const char *url, bool sync) { - this->session->connect(url); - if(sync) { - this->sync(); - } + Host & Host::connect(const char *url) { + this->session->connect(url,timeout); + this->sync(); return *this; } diff --git a/client/src/session/local/actions.cc b/client/src/session/local/actions.cc index 1238425..22e2409 100644 --- a/client/src/session/local/actions.cc +++ b/client/src/session/local/actions.cc @@ -48,10 +48,10 @@ chkResponse(lib3270_action(hSession,action_name)); } - void Local::Session::connect(const char *url, bool wait) { + void Local::Session::connect(const char *url, int seconds) { std::lock_guard lock(sync); - chkResponse(lib3270_connect_url(hSession,url,(wait ? 1 : 0))); + chkResponse(lib3270_connect_url(hSession,url,seconds)); } void Local::Session::disconnect() { diff --git a/client/src/session/local/private.h b/client/src/session/local/private.h index 3e4fad4..801b786 100644 --- a/client/src/session/local/private.h +++ b/client/src/session/local/private.h @@ -93,7 +93,7 @@ // Actions void action(const char *action_name) override; - void connect(const char *url, bool wait) override; + void connect(const char *url, int seconds) override; void disconnect() override; void pfkey(unsigned short value) override; void pakey(unsigned short value) override; diff --git a/client/src/testprogram/testprogram.cc b/client/src/testprogram/testprogram.cc index 0eab536..2c3925b 100644 --- a/client/src/testprogram/testprogram.cc +++ b/client/src/testprogram/testprogram.cc @@ -87,7 +87,7 @@ // test host object static void testHost(const char *session) { - TN3270::Host host{session}; + TN3270::Host host{session,nullptr,10}; try { @@ -96,7 +96,7 @@ << "\tRevision: " << host.getRevision() << std::endl; - host.connect(); + host.connect(nullptr); cout << "Connection state is " << toCharString(host.getConnectionState()) << std::endl diff --git a/common/src/include/lib3270/ipc.h b/common/src/include/lib3270/ipc.h index f6df660..a21b67b 100644 --- a/common/src/include/lib3270/ipc.h +++ b/common/src/include/lib3270/ipc.h @@ -322,7 +322,7 @@ virtual void action(const char *action_name) = 0; // Connect/disconnect - virtual void connect(const char *url = nullptr, bool wait = true) = 0; + virtual void connect(const char *url = nullptr, int seconds = DEFAULT_TIMEOUT) = 0; virtual void disconnect() = 0; /// @brief Wait. @@ -416,7 +416,7 @@ } // Actions - Host & connect(const char *url = nullptr, bool sync = true); + Host & connect(const char *url = nullptr); Host & disconnect(); Host & waitForReady(time_t timeout = DEFAULT_TIMEOUT); -- libgit2 0.21.2