Melhorando processo de conexão ao host

perry.werneck@gmail.com
1 parent 99cfad7d
Showing 10 changed files with 90 additions and 59 deletions Show diff stats
src/include/lib3270.h
src/lib3270/connect.c
src/lib3270/globals.h
src/lib3270/iocalls.c
src/lib3270/kybd.c
src/lib3270/lib3270.cbp
src/lib3270/session.c
src/lib3270/ssl.c
src/lib3270/telnet.c
src/lib3270/testprogram.c
@@ -204,6 +204,17 @@
 	/**
+	 * Connect options.
+	 *
+	 */
+	typedef enum _LIB3270_CONNECT_OPTION
+	{
+		LIB3270_CONNECT_OPTION_DEFAULTS	= 0x0000,	/**< Default connection options */
+		LIB3270_CONNECT_OPTION_SSL		= 0x0001,	/**< Secure connection */
+
+	} LIB3270_CONNECT_OPTION;
+
+	/**
 	 * Cursor modes.
 	 *
 	 * Cursor modes set by library; an application can us it
@@ -422,6 +433,20 @@
 	LIB3270_EXPORT int lib3270_connect(H3270 *h,const char *n, int wait);
 	/**
+	 * Connect to defined host, keep main loop running.
+	 *
+	 * @param hSession	Session handle.
+	 * @param hostname	Host name.
+	 * @param srvc		Service name (telnet if NULL).
+	 * @param opt		Connect options.
+	 *
+	 * @return 0 for success, EAGAIN if auto-reconnect is in progress, EBUSY if connected, ENOTCONN if connection has failed, -1 on unexpected failure.
+	 *
+	 */
+	LIB3270_EXPORT int lib3270_connect_host(H3270 *hSession, const char *hostname, const char *srvc, LIB3270_CONNECT_OPTION opt);
+
+
+	/**
 	 * Disconnect from host.
 	 *
 	 * @param h		Session handle.
@@ -60,6 +60,7 @@
 #include "trace_dsc.h"
 #include "utilc.h"
 #include "telnetc.h"
+#include "screen.h"
 #include <lib3270/internals.h>
 /*---[ Implement ]-------------------------------------------------------------------------------*/
@@ -116,7 +117,6 @@ static void net_connected(H3270 *hSession)
 	hSession->excepting	= 1;
 	hSession->reading 	= 1;
-/*
 #if defined(HAVE_LIBSSL)
 	if(hSession->ssl_con && hSession->secure == LIB3270_SSL_UNDEFINED)
 	{
@@ -124,10 +124,12 @@ static void net_connected(H3270 *hSession)
 			return;
 	}
 #endif
-*/
 	lib3270_setup_session(hSession);
+
+	lib3270_set_connected(hSession);
+
 }
 #if defined(_WIN32) /*[*/
@@ -167,7 +169,7 @@ static void net_connected(H3270 *hSession)
  }
 #endif /*]*/
- LIB3270_EXPORT int lib3270_connect_host(H3270 *hSession, const char *hostname, const char *srvc)
+ LIB3270_EXPORT int lib3270_connect_host(H3270 *hSession, const char *hostname, const char *srvc, LIB3270_CONNECT_OPTION opt)
  {
  	int					  s;
 	struct addrinfo		  hints;
@@ -219,7 +221,7 @@ static void net_connected(H3270 *hSession)
 									_( "Can't determine value for environment variable \"%s\" " ),
 									hostname);
 			lib3270_set_disconnected(hSession);
-			return -1;
+			return ENOENT;
 		}
 		hostname = name;
 	}
@@ -230,18 +232,39 @@ static void net_connected(H3270 *hSession)
 	if(s != 0)
 	{
+		char buffer[4096];
+
+		snprintf(buffer,4095,_( "Can't connect to %s:%s"), hostname, srvc);
+
 		lib3270_popup_dialog(	hSession,
 								LIB3270_NOTIFY_ERROR,
 								_( "Connection error" ),
-								_( "Can't resolve hostname." ),
+								buffer,
 								"%s",
 								gai_strerror(s));
 		lib3270_set_disconnected(hSession);
-		return -1;
+		return ENOENT;
 	}
-	status_changed(hSession,LIB3270_STATUS_CONNECTING);
+
+#if !defined(_WIN32)
+	/* don't share the socket with our children */
+	(void) fcntl(hSession->sock, F_SETFD, 1);
+#endif
+
+	hSession->ssl_host = 0;
+
+#if defined(HAVE_LIBSSL)
+	if(opt&LIB3270_CONNECT_OPTION_SSL)
+	{
+		hSession->ssl_host = 1;
+		ssl_init(hSession);
+	}
+#endif
+
+	/* connect */
+	status_connecting(hSession,1);
 	for(rp = result; hSession->sock < 0 && rp != NULL; rp = rp->ai_next)
 	{
@@ -265,7 +288,7 @@ static void net_connected(H3270 *hSession)
 				lib3270_popup_dialog(	hSession,
 										LIB3270_NOTIFY_CRITICAL,
 										N_( "Network startup error" ),
-										N_( "Cannot create socket handle" ),
+										N_( "Cannot create socket event" ),
 										"%s", lib3270_win32_strerror(GetLastError()) );
 				_exit(1);
 			}
@@ -281,8 +304,6 @@ static void net_connected(H3270 *hSession)
 			_exit(1);
 		}
-
-
 		WSASetLastError(0);
 		u_long iMode=1;
 		trace("sock=%d",hSession->sock);
@@ -301,10 +322,13 @@ static void net_connected(H3270 *hSession)
 			int err = WSAGetLastError();
 			if(err != WSAEWOULDBLOCK)
 			{
+				char buffer[4096];
+				snprintf(buffer,4095,_( "Can't connect to %s:%s"), hostname, srvc);
+
 				lib3270_popup_dialog(	hSession,
 										LIB3270_NOTIFY_ERROR,
 										_( "Connection error" ),
-										_( "Can't connect to host." ),
+										buffer,
 										"%s", lib3270_win32_strerror(err));
 				SOCK_CLOSE(hSession);
 			}
@@ -318,10 +342,13 @@ static void net_connected(H3270 *hSession)
 		{
 			if( errno != EINPROGRESS )
 			{
+				char buffer[4096];
+				snprintf(buffer,4095,_( "Can't connect to %s:%s"), hostname, srvc);
+
 				lib3270_popup_dialog(	hSession,
 										LIB3270_NOTIFY_ERROR,
 										_( "Connection error" ),
-										_( "Can't connect to host." ),
+										buffer,
 										"%s",
 										strerror(errno));
 				SOCK_CLOSE(hSession);
@@ -359,11 +386,6 @@ static void net_connected(H3270 *hSession)
 		return -1;
 	}
-#if !defined(_WIN32)
-	/* don't share the socket with our children */
-	(void) fcntl(hSession->sock, F_SETFD, 1);
-#endif
-
 	// Connecting, set callbacks, wait for connection
 	lib3270_st_changed(hSession, LIB3270_STATE_HALF_CONNECT, True);
@@ -247,8 +247,6 @@ LIB3270_INTERNAL void	lib3270_sock_disconnect(H3270 *hSession);
 	LIB3270_INTERNAL void check_session_handle(H3270 **hSession);
 #endif // DEBUG
-LIB3270_EXPORT int lib3270_connect_host(H3270 *hSession, const char *hostname, const char *srvc);
-
 LIB3270_INTERNAL int non_blocking(H3270 *session, Boolean on);
 #if defined(HAVE_LIBSSL) /*[*/
@@ -174,7 +174,7 @@ static void * internal_add_timeout(unsigned long interval_ms, H3270 *session, vo
 	timeout_t *t;
 	timeout_t *prev = TN;
-	trace("%s session=%p proc=%p",__FUNCTION__,session,proc);
+	trace("%s session=%p proc=%p interval=%ld",__FUNCTION__,session,proc,interval_ms);
 	t_new = (timeout_t *) lib3270_malloc(sizeof(timeout_t));
@@ -449,10 +449,13 @@ void kybd_connect(H3270 *session, int connected, void *dunno)
 	lib3270_kybdlock_clear(session, -1);
-	if (connected) {
+	if (connected)
+	{
 		/* Wait for any output or a WCC(restore) from the host */
 		kybdlock_set(session,KL_AWAITING_FIRST);
-	} else {
+	}
+	else
+	{
 		kybdlock_set(session,KL_NOT_CONNECTED);
 		(void) flush_ta(session);
 	}
@@ -1163,24 +1166,11 @@ void do_reset(H3270 *hSession, Boolean explicit)
 	 * If explicit (from the keyboard) and there is typeahead or
 	 * a half-composed key, simply flush it.
 	 */
-	if (explicit
-#if defined(X3270_FT) /*[*/
-	    || lib3270_get_ft_state(hSession) != LIB3270_FT_STATE_NONE
-#endif /*]*/
-	    ) {
-
-		if (flush_ta(hSession))
-			return;
-
-/*
-		Boolean half_reset = False;
+	if (explicit || lib3270_get_ft_state(hSession) != LIB3270_FT_STATE_NONE)
+	{
 		if (flush_ta(hSession))
-			half_reset = True;
-
-		if (half_reset)
 			return;
-*/
 	}
 	/* Always clear insert mode. */
@@ -1201,15 +1191,12 @@ void do_reset(H3270 *hSession, Boolean explicit)
 	 * If explicit (from the keyboard), unlock the keyboard now.
 	 * Otherwise (from the host), schedule a deferred keyboard unlock.
 	 */
-	if (explicit
-#if defined(X3270_FT) /*[*/
-	    || lib3270_get_ft_state(hSession) != LIB3270_FT_STATE_NONE
-#endif /*]*/
-	    || (!hSession->unlock_delay) // && !sms_in_macro())
-	    || (hSession->unlock_delay_time != 0 && (time(NULL) - hSession->unlock_delay_time) > 1)) {
+	if (explicit || lib3270_get_ft_state(hSession) != LIB3270_FT_STATE_NONE || (!hSession->unlock_delay) || (hSession->unlock_delay_time != 0 && (time(NULL) - hSession->unlock_delay_time) > 1))
+	{
 		lib3270_kybdlock_clear(hSession,-1);
-	} else if (hSession->kybdlock &
-  (KL_DEFERRED_UNLOCK | KL_OIA_TWAIT | KL_OIA_LOCKED | KL_AWAITING_FIRST)) {
+	}
+	else if (hSession->kybdlock & (KL_DEFERRED_UNLOCK | KL_OIA_TWAIT | KL_OIA_LOCKED | KL_AWAITING_FIRST))
+	{
 		lib3270_kybdlock_clear(hSession,~KL_DEFERRED_UNLOCK);
 		kybdlock_set(hSession,KL_DEFERRED_UNLOCK);
 		hSession->unlock_id = AddTimeOut(UNLOCK_MS, hSession, defer_unlock);
@@ -190,6 +190,9 @@
 		<Unit filename="sfc.h" />
 		<Unit filename="shlobj_missing.h" />
 		<Unit filename="sources.mak" />
+		<Unit filename="ssl.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="state.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -332,14 +332,6 @@ H3270 * lib3270_session_new(const char *model)
 	if(screen_init(hSession))
 		return NULL;
-/*
-	trace("Charset: %s",hSession->charset.host);
-	if (charset_init(hSession,hSession->charset.host) != CS_OKAY)
-	{
-		Warning(hSession, _( "Cannot find charset \"%s\", using defaults" ), hSession->charset.host);
-		(void) charset_init(hSession,CN);
-	}
-*/
 	trace("%s: Initializing KYBD",__FUNCTION__);
 	lib3270_register_schange(hSession,LIB3270_STATE_CONNECT,kybd_connect,NULL);
 	lib3270_register_schange(hSession,LIB3270_STATE_3270_MODE,kybd_in3270,NULL);
@@ -325,13 +325,14 @@ int ssl_init(H3270 *hSession)
 /* Callback for tracing protocol negotiation. */
 void ssl_info_callback(INFO_CONST SSL *s, int where, int ret)
 {
-//	H3270 *hSession = lib3270_get_default_session_handle(); // TODO: Find a better way!
 	H3270 *hSession = (H3270 *) SSL_get_ex_data(s,ssl_3270_ex_index);
 #ifdef DEBUG
-	trace("%s: hsession=%p, session=%p",__FUNCTION__,hSession,lib3270_get_default_session_handle());
 	if(hSession != lib3270_get_default_session_handle())
+	{
+		trace("%s: hsession=%p, session=%p",__FUNCTION__,hSession,lib3270_get_default_session_handle());
 		exit(-1);
+	}
 #endif // DEBUG
 	switch(where)
@@ -46,6 +46,10 @@
 #endif // !ANDROID
 #include <lib3270/config.h>
+#if defined(HAVE_LIBSSL)
+	#include <openssl/ssl.h>
+	#include <openssl/err.h>
+#endif
 #include "globals.h"
 #include <errno.h>
@@ -30,14 +30,13 @@ int main(int numpar, char *param[])
 	session = h = lib3270_session_new("");
 	printf("3270 session %p created\n]",h);
-	lib3270_set_toggle(session,LIB3270_TOGGLE_DS_TRACE,1);
+//	lib3270_set_toggle(session,LIB3270_TOGGLE_DS_TRACE,1);
 //	pthread_create(&thread, NULL, mainloop, NULL);
 //	pthread_detach(thread);
-	lib3270_connect_host(h, "$HOST3270", "8023");
-//	lib3270_connect_host(h, "fandezhi.efglobe.com", "telnet");
-//	lib3270_connect_host(h, "127.0.0.1", "9090");
+	lib3270_connect_host(h, "fandezhi.efglobe.com", "telnet", LIB3270_CONNECT_OPTION_DEFAULTS);
+//	lib3270_connect_host(h, "127.0.0.1", "9090", LIB3270_CONNECT_OPTION_DEFAULTS);
 	mainloop(0);
	@@ -204,6 +204,17 @@		@@ -204,6 +204,17 @@
204		204
205		205
206	/**	206	/**
		207	+ * Connect options.
		208	+ *
		209	+ */
		210	+ typedef enum _LIB3270_CONNECT_OPTION
		211	+ {
		212	+ LIB3270_CONNECT_OPTION_DEFAULTS = 0x0000, /*< Default connection options /
		213	+ LIB3270_CONNECT_OPTION_SSL = 0x0001, /*< Secure connection /
		214	+
		215	+ } LIB3270_CONNECT_OPTION;
		216	+
		217	+ /**
207	* Cursor modes.	218	* Cursor modes.
208	*	219	*
209	* Cursor modes set by library; an application can us it	220	* Cursor modes set by library; an application can us it
	@@ -422,6 +433,20 @@		@@ -422,6 +433,20 @@
422	LIB3270_EXPORT int lib3270_connect(H3270 h,const char n, int wait);	433	LIB3270_EXPORT int lib3270_connect(H3270 h,const char n, int wait);
423		434
424	/**	435	/**
		436	+ * Connect to defined host, keep main loop running.
		437	+ *
		438	+ * @param hSession Session handle.
		439	+ * @param hostname Host name.
		440	+ * @param srvc Service name (telnet if NULL).
		441	+ * @param opt Connect options.
		442	+ *
		443	+ * @return 0 for success, EAGAIN if auto-reconnect is in progress, EBUSY if connected, ENOTCONN if connection has failed, -1 on unexpected failure.
		444	+ *
		445	+ */
		446	+ LIB3270_EXPORT int lib3270_connect_host(H3270 hSession, const char hostname, const char *srvc, LIB3270_CONNECT_OPTION opt);
		447	+
		448	+
		449	+ /**
425	* Disconnect from host.	450	* Disconnect from host.
426	*	451	*
427	* @param h Session handle.	452	* @param h Session handle.
	@@ -247,8 +247,6 @@ LIB3270_INTERNAL void lib3270_sock_disconnect(H3270 *hSession);		@@ -247,8 +247,6 @@ LIB3270_INTERNAL void lib3270_sock_disconnect(H3270 *hSession);
247	LIB3270_INTERNAL void check_session_handle(H3270 **hSession);	247	LIB3270_INTERNAL void check_session_handle(H3270 **hSession);
248	#endif // DEBUG	248	#endif // DEBUG
249		249
250	-LIB3270_EXPORT int lib3270_connect_host(H3270 hSession, const char hostname, const char *srvc);
251	-
252	LIB3270_INTERNAL int non_blocking(H3270 *session, Boolean on);	250	LIB3270_INTERNAL int non_blocking(H3270 *session, Boolean on);
253		251
254	#if defined(HAVE_LIBSSL) /[/	252	#if defined(HAVE_LIBSSL) /[/
	@@ -174,7 +174,7 @@ static void * internal_add_timeout(unsigned long interval_ms, H3270 *session, vo		@@ -174,7 +174,7 @@ static void * internal_add_timeout(unsigned long interval_ms, H3270 *session, vo
174	timeout_t *t;	174	timeout_t *t;
175	timeout_t *prev = TN;	175	timeout_t *prev = TN;
176		176
177	- trace("%s session=%p proc=%p",__FUNCTION__,session,proc);	177	+ trace("%s session=%p proc=%p interval=%ld",__FUNCTION__,session,proc,interval_ms);
178		178
179	t_new = (timeout_t *) lib3270_malloc(sizeof(timeout_t));	179	t_new = (timeout_t *) lib3270_malloc(sizeof(timeout_t));
180		180
	@@ -332,14 +332,6 @@ H3270 * lib3270_session_new(const char *model)		@@ -332,14 +332,6 @@ H3270 * lib3270_session_new(const char *model)
332	if(screen_init(hSession))	332	if(screen_init(hSession))
333	return NULL;	333	return NULL;
334		334
335	-/*
336	- trace("Charset: %s",hSession->charset.host);
337	- if (charset_init(hSession,hSession->charset.host) != CS_OKAY)
338	- {
339	- Warning(hSession, _( "Cannot find charset \"%s\", using defaults" ), hSession->charset.host);
340	- (void) charset_init(hSession,CN);
341	- }
342	-*/
343	trace("%s: Initializing KYBD",__FUNCTION__);	335	trace("%s: Initializing KYBD",__FUNCTION__);
344	lib3270_register_schange(hSession,LIB3270_STATE_CONNECT,kybd_connect,NULL);	336	lib3270_register_schange(hSession,LIB3270_STATE_CONNECT,kybd_connect,NULL);
345	lib3270_register_schange(hSession,LIB3270_STATE_3270_MODE,kybd_in3270,NULL);	337	lib3270_register_schange(hSession,LIB3270_STATE_3270_MODE,kybd_in3270,NULL);