Merge branch 'develop' of https://github.com/PerryWerneck/libipc3270 into develop

Perry Werneck
2 parents 59680e11 b6bfda0d
Showing 22 changed files with 126 additions and 80 deletions Show diff stats
client/src/core/windows/request.cc
client/src/host/pop.cc
client/src/host/stream.cc
client/src/host/string.cc
client/src/include/lib3270/ipc.h
client/src/session/local/private.h
client/src/session/local/wait.cc
client/src/session/remote/actions.cc
client/src/session/remote/private.h
client/src/session/remote/wait.cc
client/src/testprogram/testprogram.cc
server/src/core/linux/gobject.c
server/src/core/methods/methods.c
server/src/core/methods/private.h
server/src/core/methods/wait.c
server/src/core/tools.c
server/src/core/windows/gobject.c
server/src/core/windows/inout.c
server/src/core/windows/pipesource.c
server/src/core/windows/response.c
@@ -147,7 +147,16 @@
 		uint16_t rc = *((uint16_t *) (in.block + in.current));
 		in.current += sizeof(uint16_t);
  
-		// Extract argc
+		if(rc) {
+
+			// It´s an error, extract message
+			in.block[in.used] = 0;
+			debug("Error was ",rc," (\"",(const char *) (in.block + in.current),"\")");
+			throw std::system_error(std::error_code(rc,std::system_category()),(const char *) (in.block + in.current));
+
+		}
+
+		// It´s not an error, extract argument count
 		uint16_t argc = *((uint16_t *) (in.block + in.current));
 		in.current += sizeof(uint16_t);
  
@@ -41,41 +41,17 @@
 /*---[ Implement ]----------------------------------------------------------------------------------*/
  
 TN3270::Host & TN3270::Host::pop(int baddr, std::string &text) {
-
-	this->session->waitForReady(this->timeout);
-
-	if(this->session->getConnectionState() == TN3270::DISCONNECTED) {
-		chkResponse(ENOTCONN);
-	}
-
 	session->pop(baddr, text);
-
 	return *this;
 }
  
 TN3270::Host & TN3270::Host::pop(unsigned short row, unsigned short col, std::string &text) {
-
-	this->session->waitForReady(this->timeout);
-
-	if(this->session->getConnectionState() == TN3270::DISCONNECTED) {
-		chkResponse(ENOTCONN);
-	}
-
 	session->pop(row,col,text);
-
 	return *this;
 }
  
 TN3270::Host & TN3270::Host::pop(std::string &text) {
-
-	this->session->waitForReady(this->timeout);
-
-	if(this->session->getConnectionState() == TN3270::DISCONNECTED) {
-		chkResponse(ENOTCONN);
-	}
-
 	session->pop(text);
-
 	return *this;
 }
  
@@ -42,7 +42,6 @@
  
 /// @brief Writes characters to the associated file from the put area
 int TN3270::Host::sync() {
-	this->session->waitForReady(this->timeout);
 	return 0;
 }
  
@@ -41,52 +41,32 @@
 /*---[ Implement ]----------------------------------------------------------------------------------*/
  
 std::string TN3270::Host::toString() const {
-
-	this->session->waitForReady(this->timeout);
 	return this->session->toString();
 }
  
 std::string TN3270::Host::toString(int baddr, int len, char lf) const {
-
-	this->session->waitForReady(this->timeout);
 	return this->session->toString(baddr,len,lf);
-
 }
  
 std::string TN3270::Host::toString(unsigned short row, unsigned short col, int len, char lf) const {
-
-	this->session->waitForReady(this->timeout);
 	return this->session->toString(row,col,len,lf);
-
 }
  
 /// @brief Checks if the terminal contains the string.
 size_t TN3270::Host::find(const char * str, size_t pos) const {
-
-	this->session->waitForReady(this->timeout);
 	return this->session->find(str,pos);
-
 }
  
 /// @brief Get the number of occurrences of a string in the terminal.
 size_t TN3270::Host::count(const char * str, size_t pos) const {
-
-	this->session->waitForReady(this->timeout);
 	return this->session->count(str,pos);
-
 }
  
 /// @brief Compare contents.
 int TN3270::Host::compare(int baddr, const char* s, int len) const {
-
-	this->session->waitForReady(this->timeout);
 	return this->session->compare(baddr, s, len);
-
 }
  
 int TN3270::Host::compare(unsigned short row, unsigned short col, const char* s, int len) const {
-
-	this->session->waitForReady(this->timeout);
 	return this->session->compare(row,col,s,len);
-
 }
@@ -600,6 +600,9 @@
 			/// @brief Wait until session state changes to "ready".
 			virtual void waitForReady(time_t timeout = DEFAULT_TIMEOUT) const = 0;
  
+			/// @brief Wait for connection state.
+			virtual void waitForConnectionState(ConnectionState state, time_t timeout = DEFAULT_TIMEOUT) const = 0;
+
 			/// @brief Wait for screen changes.
 			virtual void waitForChange(time_t seconds = DEFAULT_TIMEOUT) const = 0;
  
@@ -663,17 +666,6 @@
 			/// @brief Writes characters to the associated output sequence from the put area.
 			int overflow(int c) override;
  
-			/*
-			/// @brief Write information to log file.
-			void info(const char *fmt, ...) const;
-
-			/// @brief Write warning to log file.
-			void warning(const char *fmt, ...) const;
-
-			/// @brief Write error to log file.
-			void error(const char *fmt, ...) const;
-			*/
-
 		public:
 			Host(const char *id, const char *charset = nullptr);
  
@@ -733,6 +725,15 @@
 				return this->session->waitForKeyboardUnlock(timeout);
 			}
  
+			/// @brief Wait for connection state.
+			inline void waitForConnectionState(ConnectionState state, time_t timeout = DEFAULT_TIMEOUT) {
+				return this->session->waitForConnectionState(state,timeout);
+			}
+
+			inline void wait(ConnectionState state, time_t timeout = DEFAULT_TIMEOUT) {
+				return this->session->waitForConnectionState(state,timeout);
+			}
+
 			/// @brief Execute action by name.
 			inline Host & action(const char *action_name) {
 				session->action(action_name);
@@ -122,6 +122,7 @@
  
 				void wait(time_t seconds) const override;
 				void waitForReady(time_t timeout) const override;
+				void waitForConnectionState(ConnectionState state, time_t timeout) const override;
 				void waitForChange(time_t timeout) const override;
  
 				LIB3270_KEYBOARD_LOCK_STATE waitForKeyboardUnlock(time_t seconds) const override;
@@ -56,6 +56,12 @@
 		chkResponse(lib3270_wait_for_ready(this->hSession, timeout));
 	}
  
+	void Local::Session::waitForConnectionState(ConnectionState state, time_t timeout) const {
+
+		std::lock_guard<std::mutex> lock(const_cast<Local::Session *>(this)->sync);
+		chkResponse(lib3270_wait_for_cstate(this->hSession, (LIB3270_CSTATE) state, timeout));
+	}
+
 	LIB3270_KEYBOARD_LOCK_STATE Local::Session::waitForKeyboardUnlock(time_t timeout) const {
  
 		std::lock_guard<std::mutex> lock(const_cast<Local::Session *>(this)->sync);
@@ -102,7 +102,7 @@
 			.call();
  
 		if(seconds)
-			this->waitForReady(seconds);
+			this->waitForConnectionState(CONNECTED_TN3270E,seconds);
  
 	}
  
@@ -121,6 +121,7 @@
  
 				void wait(time_t seconds) const override;
 				void waitForReady(time_t timeout) const override;
+				void waitForConnectionState(ConnectionState state, time_t timeout) const override;
 				void waitForChange(time_t timeout) const override;
  
 				LIB3270_KEYBOARD_LOCK_STATE waitForKeyboardUnlock(time_t seconds) const override;
@@ -113,6 +113,30 @@
  
 	}
  
+	void IPC::Session::waitForConnectionState(ConnectionState state, time_t timeout) const {
+
+		debug(__FUNCTION__,"(",timeout,")");
+
+		wait(timeout, [this,state]() {
+
+			int rc;
+
+			debug("Running waitForConnectionState request...");
+
+			Request(*this,"waitForConnectionState")
+				.push((uint32_t) state)
+				.push((uint32_t) 1)
+				.call()
+				.pop(rc);
+
+			debug("Wait for connection state returned ",rc);
+
+			return rc;
+
+		});
+
+	}
+
 	LIB3270_KEYBOARD_LOCK_STATE IPC::Session::waitForKeyboardUnlock(time_t timeout) const {
  
 		int rc;
@@ -170,15 +170,13 @@
  
 		TN3270::Host host{session};
  
-		host.connect();
+		// host.connect();
  
-		cout << "------------------------------" << endl;
-		auto start = time(nullptr);
-		host.waitForReady(5);
-		cout << "Time: " << (time(nullptr) - start) << std::endl;
-		cout << "------------------------------" << endl;
+		cout << endl << "------------------------" << endl;
+		host.toString(14,1,75,0);
+		cout << endl << "------------------------" << endl;
  
-		host.disconnect();
+		// host.disconnect();
  
 		/*
 		cout
@@ -265,8 +263,8 @@
  
 	cout 	<< "Session: " << session << endl;
  
-	// testHost(session);
-	testPerformance(session);
+	testHost(session);
+	// testPerformance(session);
  
  
 	//testAttributes(session);
@@ -171,6 +171,11 @@ void ipc3270_add_terminal_introspection(GString *introspection) {
 		"		<arg type='u' name='seconds' direction='in' />" \
 		"		<arg type='i' name='result' direction='out' />" \
 		"	</method>" \
+		"	<method name= 'waitForConnectionState'>" \
+		"		<arg type='u' name='cstate' direction='in' />" \
+		"		<arg type='u' name='seconds' direction='in' />" \
+		"		<arg type='i' name='result' direction='out' />" \
+		"	</method>" \
 		"	<method name= 'waitForKeyboardUnlock'>" \
 		"		<arg type='u' name='seconds' direction='in' />" \
 		"		<arg type='i' name='result' direction='out' />" \
@@ -297,11 +302,6 @@ H3270 * ipc3270_get_session(GObject *object) {
 	return IPC3270(object)->hSession;
 }
  
-void ipc3270_set_error(GObject *object, int errcode, GError **error) {
-	if(error && !*error)
-		g_set_error(error,IPC3270(object)->error_domain,errcode,"%s",strerror(errcode));
-}
-
 GQuark ipc3270_get_error_domain(GObject *object) {
 	return IPC3270(object)->error_domain;
 }
@@ -48,6 +48,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req
  
 		{ "wait",						ipc3270_method_wait							},
 		{ "waitforready",				ipc3270_method_wait_for_ready				},
+		{ "waitForConnectionState",		ipc3270_method_wait_for_cstate				},
 		{ "waitforupdate",				ipc3270_method_wait_for_update				},
 		{ "waitforkeyboardunlock",		ipc3270_method_wait_for_keyboard_unlock		},
  
@@ -79,7 +80,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req
 	size_t	  ix;
 	H3270	* hSession = ipc3270_get_session(object);
  
-	debug("%s(%s,request=%p,response=%p)",__FUNCTION__,method_name,request,response);
+	debug("%s(%s,request=%p,response=%p,error=%p)",__FUNCTION__,method_name,request,response,*error);
  
 	lib3270_write_event_trace(hSession,"Method %s called on session %c\n",method_name,lib3270_get_session_id(hSession));
  
@@ -87,12 +88,21 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req
  
 		if(!g_ascii_strcasecmp(methods[ix].name,method_name)) {
  
+#ifdef _DEBUG_
+			g_message("Calling %s",methods[ix].name);
+#endif // _DEBUG_
+
 			int rc = methods[ix].call(object,request,response,error);
  
-			debug("rc=%d",rc);
+			debug("rc=%d error=%p",rc,*error);
  
 			if(rc)
+			{
+				debug("%s exits with rc=%d (%s)",methods[ix].name,rc,ipc3270_get_error_message(rc));
+				g_message("%s exits with rc=%d (%s)",methods[ix].name,rc,ipc3270_get_error_message(rc));
 				ipc3270_set_error(object,rc,error);
+				debug("Error Message was set to %s",(*error)->message);
+			}
  
 			return 0;
 		}
@@ -52,6 +52,7 @@
  
 	G_GNUC_INTERNAL int ipc3270_method_wait(GObject *session, GVariant *request, GObject *response, GError **error);
 	G_GNUC_INTERNAL int ipc3270_method_wait_for_ready(GObject *session, GVariant *request, GObject *response, GError **error);
+	G_GNUC_INTERNAL int ipc3270_method_wait_for_cstate(GObject *session, GVariant *request, GObject *response, GError **error);
 	G_GNUC_INTERNAL int ipc3270_method_wait_for_update(GObject *session, GVariant *request, GObject *response, GError **error);
 	G_GNUC_INTERNAL int ipc3270_method_wait_for_keyboard_unlock(GObject *session, GVariant *request, GObject *response, GError **error);
  
@@ -116,6 +116,15 @@ int ipc3270_method_wait_for_ready(GObject *session, GVariant *request, GObject *
 	return 0;
 }
  
+int ipc3270_method_wait_for_cstate(GObject *session, GVariant *request, GObject *response, GError G_GNUC_UNUSED(**error)) {
+	guint seconds = 1;
+	guint cstate = 0;
+	g_variant_get(request, "(uu)", &cstate, &seconds);
+	debug("cstate=%u seconds=%u",cstate,seconds);
+	ipc3270_response_append_int32(response,lib3270_wait_for_cstate(ipc3270_get_session(session),(LIB3270_CSTATE) cstate, seconds));
+	return 0;
+}
+
 int ipc3270_method_wait_for_update(GObject *session, GVariant *request, GObject *response, GError G_GNUC_UNUSED(**error)) {
 	guint seconds = 1;
 	g_variant_get(request, "(u)", &seconds);
@@ -43,3 +43,30 @@
  
  #endif // ! GLIB(2,44,0)
  
+ const char * ipc3270_get_error_message(int errcode) {
+
+	static const struct Messages {
+		int errcode;
+		const char *msg;
+	} messages[] = {
+		{ ENOTCONN, "Not connected to host" }
+	};
+
+	size_t ix;
+
+	for(ix = 0; ix < G_N_ELEMENTS(messages); ix++) {
+		if(messages[ix].errcode == errcode) {
+			return messages[ix].msg;
+		}
+	}
+
+	return strerror(errcode);
+}
+
+void ipc3270_set_error(GObject *object, int errcode, GError **error) {
+	if(error && !*error) {
+		g_set_error(error,ipc3270_get_error_domain(object),errcode,"%s",ipc3270_get_error_message(errcode));
+	}
+}
+
+
@@ -112,10 +112,6 @@ H3270 * ipc3270_get_session(GObject *object) {
 	return IPC3270(object)->hSession;
 }
  
-void ipc3270_set_error(GObject *object, int errcode, GError **error) {
-	g_set_error(error,IPC3270(object)->error_domain,errcode,"%s",strerror(errcode));
-}
-
 GQuark ipc3270_get_error_domain(GObject *object) {
 	return IPC3270(object)->error_domain;
 }
@@ -46,7 +46,7 @@ unsigned char * ipc3270_pack_error(const GError *error, size_t * szPacket) {
  
 	static const char * error_response = "error";
  
-	debug("%s(%d,%s)",__FUNCTION__,(int) error_response,error->message);
+	debug("%s(%d,%s)",__FUNCTION__,(int) error->code, (const char *) error->message);
  
 	*szPacket = strlen(error_response) + 1 + (sizeof(guint16) * 2) + strlen(error->message);
  
@@ -110,6 +110,8 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) {
 	g_autoptr (GVariant) response = NULL;
 	g_autoptr (GVariant) parameters = ipc3270_unpack(source->buffer, &request_type);
  
+	debug("************ error=%p",error);
+
 	if(parameters) {
  
 		// Process query
@@ -129,9 +131,12 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) {
  
 				debug("Parameters: %p", parameters);
 				debug("rsp: %p", rsp);
+				debug("Error=%p",error);
  
 				ipc3270_method_call(source->object, request_name, parameters, rsp, &error);
  
+				debug("Error=%p",error);
+
 				if(ipc3270_response_has_values(rsp))
 					response = ipc3270_response_steal_value(rsp);
  
@@ -93,6 +93,8 @@ GObject * ipc3270_response_new() {
  
 void ipc3270_response_append_int32(GObject *object, gint32 value) {
  
+	debug("%s(%d)",__FUNCTION__,value);
+
 	ipc3270Response * response = IPC3270_RESPONSE(object);
  
 	if(response->value)
@@ -139,6 +139,7 @@
 	GQuark				  ipc3270_get_error_domain(GObject *object);
  
 	void				  ipc3270_set_error(GObject *object, int errcode, GError **error);
+	const char			* ipc3270_get_error_message(int errcode);
  
 	int					  ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *request, GObject *response, GError **error);
 	gboolean			  ipc3270_set_property(GObject *object, const gchar *property_name, GVariant *value, GError **error);
@@ -213,7 +213,7 @@
 	if(url) {
  
 		v3270_set_url(terminal,url);
-		v3270_reconnect(terminal);
+		//v3270_reconnect(terminal);
  
 		gchar * title = g_strdup_printf("%s - %s", v3270_get_session_name(terminal), url);
 		gtk_window_set_title(GTK_WINDOW(window), title);
...	...	@@ -147,7 +147,16 @@
147	147	uint16_t rc = ((uint16_t ) (in.block + in.current));
148	148	in.current += sizeof(uint16_t);
149	149
150		- // Extract argc
	150	+ if(rc) {
	151	+
	152	+ // It´s an error, extract message
	153	+ in.block[in.used] = 0;
	154	+ debug("Error was ",rc," (\"",(const char *) (in.block + in.current),"\")");
	155	+ throw std::system_error(std::error_code(rc,std::system_category()),(const char *) (in.block + in.current));
	156	+
	157	+ }
	158	+
	159	+ // It´s not an error, extract argument count
151	160	uint16_t argc = ((uint16_t ) (in.block + in.current));
152	161	in.current += sizeof(uint16_t);
153	162
...	...
...	...	@@ -41,41 +41,17 @@
41	41	/---[ Implement ]----------------------------------------------------------------------------------/
42	42
43	43	TN3270::Host & TN3270::Host::pop(int baddr, std::string &text) {
44		-
45		- this->session->waitForReady(this->timeout);
46		-
47		- if(this->session->getConnectionState() == TN3270::DISCONNECTED) {
48		- chkResponse(ENOTCONN);
49		- }
50		-
51	44	session->pop(baddr, text);
52		-
53	45	return *this;
54	46	}
55	47
56	48	TN3270::Host & TN3270::Host::pop(unsigned short row, unsigned short col, std::string &text) {
57		-
58		- this->session->waitForReady(this->timeout);
59		-
60		- if(this->session->getConnectionState() == TN3270::DISCONNECTED) {
61		- chkResponse(ENOTCONN);
62		- }
63		-
64	49	session->pop(row,col,text);
65		-
66	50	return *this;
67	51	}
68	52
69	53	TN3270::Host & TN3270::Host::pop(std::string &text) {
70		-
71		- this->session->waitForReady(this->timeout);
72		-
73		- if(this->session->getConnectionState() == TN3270::DISCONNECTED) {
74		- chkResponse(ENOTCONN);
75		- }
76		-
77	54	session->pop(text);
78		-
79	55	return *this;
80	56	}
81	57
...	...
...	...	@@ -42,7 +42,6 @@
42	42
43	43	/// @brief Writes characters to the associated file from the put area
44	44	int TN3270::Host::sync() {
45		- this->session->waitForReady(this->timeout);
46	45	return 0;
47	46	}
48	47
...	...
...	...	@@ -41,52 +41,32 @@
41	41	/---[ Implement ]----------------------------------------------------------------------------------/
42	42
43	43	std::string TN3270::Host::toString() const {
44		-
45		- this->session->waitForReady(this->timeout);
46	44	return this->session->toString();
47	45	}
48	46
49	47	std::string TN3270::Host::toString(int baddr, int len, char lf) const {
50		-
51		- this->session->waitForReady(this->timeout);
52	48	return this->session->toString(baddr,len,lf);
53		-
54	49	}
55	50
56	51	std::string TN3270::Host::toString(unsigned short row, unsigned short col, int len, char lf) const {
57		-
58		- this->session->waitForReady(this->timeout);
59	52	return this->session->toString(row,col,len,lf);
60		-
61	53	}
62	54
63	55	/// @brief Checks if the terminal contains the string.
64	56	size_t TN3270::Host::find(const char * str, size_t pos) const {
65		-
66		- this->session->waitForReady(this->timeout);
67	57	return this->session->find(str,pos);
68		-
69	58	}
70	59
71	60	/// @brief Get the number of occurrences of a string in the terminal.
72	61	size_t TN3270::Host::count(const char * str, size_t pos) const {
73		-
74		- this->session->waitForReady(this->timeout);
75	62	return this->session->count(str,pos);
76		-
77	63	}
78	64
79	65	/// @brief Compare contents.
80	66	int TN3270::Host::compare(int baddr, const char* s, int len) const {
81		-
82		- this->session->waitForReady(this->timeout);
83	67	return this->session->compare(baddr, s, len);
84		-
85	68	}
86	69
87	70	int TN3270::Host::compare(unsigned short row, unsigned short col, const char* s, int len) const {
88		-
89		- this->session->waitForReady(this->timeout);
90	71	return this->session->compare(row,col,s,len);
91		-
92	72	}
...	...
...	...	@@ -600,6 +600,9 @@
600	600	/// @brief Wait until session state changes to "ready".
601	601	virtual void waitForReady(time_t timeout = DEFAULT_TIMEOUT) const = 0;
602	602
	603	+ /// @brief Wait for connection state.
	604	+ virtual void waitForConnectionState(ConnectionState state, time_t timeout = DEFAULT_TIMEOUT) const = 0;
	605	+
603	606	/// @brief Wait for screen changes.
604	607	virtual void waitForChange(time_t seconds = DEFAULT_TIMEOUT) const = 0;
605	608
...	...	@@ -663,17 +666,6 @@
663	666	/// @brief Writes characters to the associated output sequence from the put area.
664	667	int overflow(int c) override;
665	668
666		- /*
667		- /// @brief Write information to log file.
668		- void info(const char *fmt, ...) const;
669		-
670		- /// @brief Write warning to log file.
671		- void warning(const char *fmt, ...) const;
672		-
673		- /// @brief Write error to log file.
674		- void error(const char *fmt, ...) const;
675		- */
676		-
677	669	public:
678	670	Host(const char id, const char charset = nullptr);
679	671
...	...	@@ -733,6 +725,15 @@
733	725	return this->session->waitForKeyboardUnlock(timeout);
734	726	}
735	727
	728	+ /// @brief Wait for connection state.
	729	+ inline void waitForConnectionState(ConnectionState state, time_t timeout = DEFAULT_TIMEOUT) {
	730	+ return this->session->waitForConnectionState(state,timeout);
	731	+ }
	732	+
	733	+ inline void wait(ConnectionState state, time_t timeout = DEFAULT_TIMEOUT) {
	734	+ return this->session->waitForConnectionState(state,timeout);
	735	+ }
	736	+
736	737	/// @brief Execute action by name.
737	738	inline Host & action(const char *action_name) {
738	739	session->action(action_name);
...	...
...	...	@@ -122,6 +122,7 @@
122	122
123	123	void wait(time_t seconds) const override;
124	124	void waitForReady(time_t timeout) const override;
	125	+ void waitForConnectionState(ConnectionState state, time_t timeout) const override;
125	126	void waitForChange(time_t timeout) const override;
126	127
127	128	LIB3270_KEYBOARD_LOCK_STATE waitForKeyboardUnlock(time_t seconds) const override;
...	...
...	...	@@ -56,6 +56,12 @@
56	56	chkResponse(lib3270_wait_for_ready(this->hSession, timeout));
57	57	}
58	58
	59	+ void Local::Session::waitForConnectionState(ConnectionState state, time_t timeout) const {
	60	+
	61	+ std::lock_guard<std::mutex> lock(const_cast<Local::Session *>(this)->sync);
	62	+ chkResponse(lib3270_wait_for_cstate(this->hSession, (LIB3270_CSTATE) state, timeout));
	63	+ }
	64	+
59	65	LIB3270_KEYBOARD_LOCK_STATE Local::Session::waitForKeyboardUnlock(time_t timeout) const {
60	66
61	67	std::lock_guard<std::mutex> lock(const_cast<Local::Session *>(this)->sync);
...	...
...	...	@@ -102,7 +102,7 @@
102	102	.call();
103	103
104	104	if(seconds)
105		- this->waitForReady(seconds);
	105	+ this->waitForConnectionState(CONNECTED_TN3270E,seconds);
106	106
107	107	}
108	108
...	...
...	...	@@ -121,6 +121,7 @@
121	121
122	122	void wait(time_t seconds) const override;
123	123	void waitForReady(time_t timeout) const override;
	124	+ void waitForConnectionState(ConnectionState state, time_t timeout) const override;
124	125	void waitForChange(time_t timeout) const override;
125	126
126	127	LIB3270_KEYBOARD_LOCK_STATE waitForKeyboardUnlock(time_t seconds) const override;
...	...
...	...	@@ -113,6 +113,30 @@
113	113
114	114	}
115	115
	116	+ void IPC::Session::waitForConnectionState(ConnectionState state, time_t timeout) const {
	117	+
	118	+ debug(__FUNCTION__,"(",timeout,")");
	119	+
	120	+ wait(timeout, [this,state]() {
	121	+
	122	+ int rc;
	123	+
	124	+ debug("Running waitForConnectionState request...");
	125	+
	126	+ Request(*this,"waitForConnectionState")
	127	+ .push((uint32_t) state)
	128	+ .push((uint32_t) 1)
	129	+ .call()
	130	+ .pop(rc);
	131	+
	132	+ debug("Wait for connection state returned ",rc);
	133	+
	134	+ return rc;
	135	+
	136	+ });
	137	+
	138	+ }
	139	+
116	140	LIB3270_KEYBOARD_LOCK_STATE IPC::Session::waitForKeyboardUnlock(time_t timeout) const {
117	141
118	142	int rc;
...	...