Merge pull request #14 from PerryWerneck/develop

Bug fixes and updates.

Merge pull request #14 from PerryWerneck/develop
Bug fixes and updates.
Perry Werneck · GitHub
2 parents 795c8ff9 339372a7
Showing 46 changed files with 279 additions and 1036 deletions Show diff stats
lib3270.cbp
locale/pt_BR.po
src/core/actions/table.c
src/core/ansi.c
src/core/charset/utf8.c
src/core/connect.c
src/core/ctlr.c
src/core/host.c
src/core/iocalls.c
src/core/keyboard/actions.c
src/core/keyboard/kybd.c
src/core/linux/connect.c
src/core/paste.c
src/core/printer.c
src/core/properties/unsigned.c
src/core/screen.c
src/core/see.c
src/core/session.c
src/core/telnet.c
src/core/toggles/init.c
@@ -255,7 +255,6 @@
 		</Unit>
 		<Unit filename="src/include/3270ds.h" />
 		<Unit filename="src/include/X11keysym.h" />
-		<Unit filename="src/include/action_table.h" />
 		<Unit filename="src/include/ansic.h" />
 		<Unit filename="src/include/arpa_telnet.h" />
 		<Unit filename="src/include/array.h" />
@@ -271,7 +270,6 @@
 		<Unit filename="src/include/hostc.h" />
 		<Unit filename="src/include/internals.h" />
 		<Unit filename="src/include/kybdc.h" />
-		<Unit filename="src/include/lib3270++.h" />
 		<Unit filename="src/include/lib3270.h" />
 		<Unit filename="src/include/lib3270/actions.h" />
 		<Unit filename="src/include/lib3270/charset.h" />
@@ -6,7 +6,7 @@ msgstr &quot;&quot;
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-10-17 11:58-0300\n"
-"PO-Revision-Date: 2020-09-03 18:36-0300\n"
+"PO-Revision-Date: 2020-11-04 20:42-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
 "Language: pt_BR\n"
@@ -16,8 +16,7 @@ msgstr &quot;&quot;
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 #: src/core/ctlr.c:187
@@ -898,12 +897,10 @@ msgid &quot;Keyboard lock status&quot;
 msgstr "Estado de bloqueio do teclado"
 #: src/core/windows/ldap.c:193
-#, fuzzy
 msgid "LDAP Search did not produce any attributes."
 msgstr "Pesquisa LDAP não produziu nenhum atributo."
 #: src/core/windows/ldap.c:201
-#, fuzzy
 msgid "LDAPSearch did not produce any values."
 msgstr "Pesquisa LDAP não produziu nenhum valor."
@@ -48,7 +48,7 @@
  static int connect_host(H3270 *hSession)
  {
-	return lib3270_reconnect(hSession,0);
+	return hSession->cbk.reconnect(hSession,0);
  }
  static int select_up(H3270 *hSession)
@@ -59,7 +59,7 @@
 #include "screenc.h"
 #include "telnetc.h"
 #include "trace_dsc.h"
-#include "utf8c.h"
+//#include "utf8c.h"
 #if defined(X3270_DBCS) /*[*/
 #include "widec.h"
 #endif /*]*/
@@ -39,7 +39,7 @@
 // #include "api.h"
 #include "popupsc.h"
-#include "utf8c.h"
+//#include "utf8c.h"
 // char *locale_codeset = CN;
@@ -350,6 +350,7 @@ static char *utf8_tab[U_MAX][96] = {
  * character set.
  * Returns 0 if the lookup fails.
  */
+ /*
 unsigned char utf8_lookup(char GNUC_UNUSED(*mbs), enum ulfail *fail, int GNUC_UNUSED(*consumed))
 {
 	if (fail != NULL)
@@ -357,3 +358,4 @@ unsigned char utf8_lookup(char GNUC_UNUSED(*mbs), enum ulfail *fail, int GNUC_UN
 	return 0;
 }
+*/
@@ -49,36 +49,10 @@
 		lib3270_set_url(hSession,url);
 	}
-	return lib3270_reconnect(hSession, seconds);
+	return hSession->cbk.reconnect(hSession, seconds);
  }
-/*
- void connection_failed(H3270 *hSession, const char *message)
- {
-	lib3270_disconnect(hSession);
-
-	lib3270_autoptr(char) summary = lib3270_strdup_printf(
-										_( "Can't connect to %s:%s"),
-										hSession->host.current,
-										hSession->host.srvc
-									);
-
-	LIB3270_POPUP popup = {
-		.name = "CantConnect",
-//		.title = _( "Connection failed" ),
-		.type = LIB3270_NOTIFY_INFO,
-		.summary = summary,
-		.body = message,
-		.label = _("Try again")
-	};
-
-	if(hSession->cbk.popup(hSession,&popup,!hSession->auto_reconnect_inprogress) == 0)
-		lib3270_activate_auto_reconnect(hSession,1000);
-
- }
-*/
-
  int lib3270_allow_reconnect(const H3270 *hSession)
  {
 	//
@@ -103,7 +77,8 @@
 	// Do I have a defined host?
 	if(!(hSession->host.current && hSession->host.srvc && *hSession->host.current && *hSession->host.srvc))
 	{
-		errno = EINVAL;
+		debug("%s('%s')",__FUNCTION__,hSession->host.url);
+		errno = ENODATA;
 		return 0;
 	}
@@ -46,7 +46,7 @@
 #include <stdlib.h>
 #include "3270ds.h"
 #include "screen.h"
-#include "resources.h"
+//#include "resources.h"
 #include "ctlrc.h"
 #include "ftc.h"
@@ -205,7 +205,7 @@ void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr)
 //			popup_an_error(session,"Invalid %s %dx%d:\nToo big",ResOversize, ovc, ovr);
 		}
-		else if (ovc > 0 && ovc < session->max.cols)
+		else if (ovc < session->max.cols)
 		{
 			lib3270_popup_dialog(
@@ -219,7 +219,7 @@ void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr)
 //			popup_an_error(session,"Invalid %s cols (%d):\nLess than model %d cols (%d)",ResOversize, ovc, session->model_num, session->maxCOLS);
 		}
-		else if (ovr > 0 && ovr < session->max.rows)
+		else if (ovr < session->max.rows)
 		{
 			lib3270_popup_dialog(
@@ -43,7 +43,7 @@
 #include <internals.h>
 #include <stdlib.h>
-#include "resources.h"
+//#include "resources.h"
 #include "hostc.h"
 #include "statusc.h"
@@ -74,7 +74,7 @@ static int check_for_auto_reconnect(H3270 *hSession, void GNUC_UNUSED(*userdata)
 	{
 		lib3270_write_log(hSession,"3270","Starting auto-reconnect on %s",lib3270_get_url(hSession));
 		hSession->auto_reconnect_inprogress = 0; // Reset "in-progress" to allow reconnection.
-		if(lib3270_reconnect(hSession,0))
+		if(hSession->cbk.reconnect(hSession,0))
 			lib3270_write_log(hSession,"3270","Auto-reconnect fails: %s",strerror(errno));
 	}
@@ -465,9 +465,10 @@ LIB3270_EXPORT int lib3270_run_task(H3270 *hSession, int(*callback)(H3270 *h, vo
         CHECK_SESSION_HANDLE(hSession);
 		hSession->cbk.set_timer(hSession,1);
+		hSession->tasks++;
 		rc = run_task(hSession,callback,parm);
 		hSession->cbk.set_timer(hSession,0);
-
+		hSession->tasks--;
         return rc;
 }
@@ -57,7 +57,7 @@ struct ta;
 #include <fcntl.h>
 #include "3270ds.h"
-#include "resources.h"
+//#include "resources.h"
 #include "ansic.h"
 #include "ctlrc.h"
@@ -71,7 +71,7 @@ struct ta;
 #include "telnetc.h"
 #include "togglesc.h"
 #include "trace_dsc.h"
-#include "utf8c.h"
+//#include "utf8c.h"
 #include "utilc.h"
 #if defined(X3270_DBCS) /*[*/
 #include "widec.h"
@@ -58,7 +58,7 @@ struct ta;
 #include <fcntl.h>
 #include "3270ds.h"
-#include "resources.h"
+//#include "resources.h"
 #include "ansic.h"
 #include "ctlrc.h"
@@ -72,7 +72,7 @@ struct ta;
 #include "telnetc.h"
 #include "togglesc.h"
 #include "trace_dsc.h"
-#include "utf8c.h"
+//#include "utf8c.h"
 #include "utilc.h"
 #if defined(X3270_DBCS) /*[*/
 #include "widec.h"
@@ -110,11 +110,13 @@ static void	kybdlock_set(H3270 *session, unsigned int bits);
 /* Composite key mappings. */
+/*
 struct akeysym
 {
 	KeySym keysym;
 	enum keytype keytype;
 };
+*/
 #define ak_eq(k1, k2)	(((k1).keysym  == (k2).keysym) && \
 			 ((k1).keytype == (k2).keytype))
@@ -89,7 +89,7 @@
 		case 1:
 			// Got response.
-			if(pfd.revents && POLLOUT) {
+			if(pfd.revents & POLLOUT) {
 				debug("%s: Connection complete",__FUNCTION__);
 				return 0;
 			}
@@ -194,15 +194,23 @@
 	if(hSession->network.module->getsockopt(hSession, SOL_SOCKET, SO_ERROR, (char *) &err, &len) < 0)
 	{
-		int err = errno;
+		lib3270_autoptr(char) body = lib3270_strdup_printf(
+											_("The System error was '%s' (rc=%d)"),
+											strerror(errno),
+											errno
+										);
+
 		lib3270_disconnect(hSession);
-		lib3270_popup_dialog(
-			hSession,
-			LIB3270_NOTIFY_ERROR,
-			_( "Network error" ),
-			_( "Unable to get connection state." ),
-			_( "The system error was %s" ), strerror(err)
-		);
+
+		LIB3270_POPUP popup = {
+			.type = LIB3270_NOTIFY_ERROR,
+			.title = _( "Network error" ),
+			.summary = _( "Unable to get connection state." ),
+			.body = body
+		};
+
+		lib3270_popup(hSession,&popup,0);
+
 		return;
 	}
 	else if(err)
@@ -44,7 +44,7 @@
 #include <fcntl.h>
 #include "3270ds.h"
-#include "resources.h"
+//#include "resources.h"
 //#include "actionsc.h"
 #include "ansic.h"
@@ -69,7 +69,7 @@
 #include "telnetc.h"
 #include "togglesc.h"
 #include "trace_dsc.h"
-#include "utf8c.h"
+//#include "utf8c.h"
 #include "utilc.h"
 #if defined(X3270_DBCS) /*[*/
 #include "widec.h"
@@ -58,7 +58,7 @@
 #include "3270ds.h"
 #include "appres.h"
 #include "objects.h"
-#include "resources.h"
+//#include "resources.h"
 #include "charsetc.h"
 #include "ctlrc.h"
@@ -198,3 +198,8 @@ int lib3270_set_uint_property(H3270 *hSession, const char *name, unsigned int va
 }
+LIB3270_EXPORT unsigned int lib3270_get_task_count(const H3270 *h)
+{
+	return h->tasks;
+}
+
@@ -37,7 +37,7 @@
 #include <internals.h>
 #include <signal.h>
 #include "3270ds.h"
-#include "resources.h"
+//#include "resources.h"
 #include "ctlrc.h"
 #include "hostc.h"
 #include "kybdc.h"
@@ -47,9 +47,9 @@
 #include "3270ds.h"
 // #include "tablesc.h"
-#if !defined(PR3287) /*[*/
-#include "utf8c.h"
-#endif /*]*/
+//#if !defined(PR3287) /*[*/
+//#include "utf8c.h"
+//#endif /*]*/
 #include "seec.h"
 const char *
@@ -67,10 +67,25 @@ void lib3270_session_free(H3270 *h)
 	if(!h)
 		return;
-	// Terminate session
 	if(lib3270_is_connected(h))
+	{
+		// Connected, disconnect
+		lib3270_disconnect(h);
+	}
+	else if(lib3270_get_connection_state(h) == LIB3270_CONNECTING)
+	{
+		// Connecting, disconnect
+		debug("%s: Stopping while connecting",__FUNCTION__);
 		lib3270_disconnect(h);
+	}
+
+	// Do we have pending tasks?
+	if(h->tasks)
+	{
+		lib3270_write_log(h,LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),"Destroying session with %u active task(s)",h->tasks);
+	}
+
 	shutdown_toggles(h);
 	// Release network module
@@ -290,6 +305,7 @@ void lib3270_reset_callbacks(H3270 *hSession)
 	hSession->cbk.update_luname			= default_update_luname;
 	hSession->cbk.update_url			= default_update_url;
 	hSession->cbk.action				= default_action;
+	hSession->cbk.reconnect				= lib3270_reconnect;
 	lib3270_set_popup_handler(hSession, NULL);
@@ -536,15 +552,19 @@ LIB3270_EXPORT char lib3270_get_session_id(H3270 *hSession)
 struct lib3270_session_callbacks * lib3270_get_session_callbacks(H3270 *hSession, const char *revision, unsigned short sz)
 {
-	if(revision && strcasecmp(revision,"20200803") < 0)
+	#define REQUIRED_REVISION "20201117"
+
+	if(revision && strcasecmp(revision,REQUIRED_REVISION) < 0)
 	{
-		debug("%s: Revision test was %d",__FUNCTION__,strcasecmp(revision,"20200803"));
 		errno = EINVAL;
+		lib3270_write_log(hSession,PACKAGE_NAME,"Invalid revision %s when setting callback table",revision);
 		return NULL;
 	}
 	if(sz != sizeof(struct lib3270_session_callbacks))
 	{
+
+		lib3270_write_log(hSession,PACKAGE_NAME,"Invalid callback table (sz=%u expected=%u)",sz,(unsigned int) sizeof(struct lib3270_session_callbacks));
 		errno = EINVAL;
 		return NULL;
 	}
@@ -92,8 +92,8 @@
 #include "kybdc.h"
 // #include "macrosc.h"
 #include "popupsc.h"
-#include "proxyc.h"
-#include "resolverc.h"
+// #include "proxyc.h"
+//#include "resolverc.h"
 #include "statusc.h"
 // #include "tablesc.h"
 #include "telnetc.h"
@@ -100,7 +100,7 @@ static void toggle_connect(H3270 *hSession, const struct lib3270_toggle *toggle,
 {
 	if(tt != LIB3270_TOGGLE_TYPE_INITIAL && lib3270_is_disconnected(hSession) && toggle->value)
 	{
-		if(lib3270_reconnect(hSession,0))
+		if(hSession->cbk.reconnect(hSession,0))
 			lib3270_write_log(hSession,"3270","Auto-connect fails: %s",strerror(errno));
 	}
@@ -53,7 +53,7 @@
 #include <stdarg.h>
 #include <fcntl.h>
 #include "3270ds.h"
-#include "resources.h"
+//#include "resources.h"
 // #include "charsetc.h"
 #include "ctlrc.h"
@@ -1,95 +0,0 @@
-/*
- * "Software PW3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como actions.h e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
- * licinio@bb.com.br		(Licínio Luis Branco)
- * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
- *
- */
-
-	#error Deprecated
-
-	/*
-	 * Action call table.
-	 *
-	 * Usually this definitions are used to declare lib3270's action table but,
-	 * if you redefine the creation macros it can be used to build a callback
-	 * table for g_object_connect calls.
-	 *
-	 */
-
-	/* Keyboard actions */
-	DECLARE_LIB3270_KEY_ACTION( enter, "Send an \"Enter\" action." )
-
-	DECLARE_LIB3270_FKEY_ACTION( pfkey, "" )
-	DECLARE_LIB3270_FKEY_ACTION( pakey, "" )
-
-	/* Cursor movement */
-	DECLARE_LIB3270_CURSOR_ACTION( up, "Cursor up 1 position." )
-	DECLARE_LIB3270_CURSOR_ACTION( down, "Cursor down 1 position." )
-	DECLARE_LIB3270_CURSOR_ACTION( left, "Cursor left 1 position." )
-	DECLARE_LIB3270_CURSOR_ACTION( right, "Cursor right 1 position." )
-
-	DECLARE_LIB3270_ACTION( newline, "Cursor to first field on next line or any lines after that." )
-
-	/* Misc actions */
-	DECLARE_LIB3270_ACTION( kybdreset, "" )
-	DECLARE_LIB3270_ACTION( clear, "Clear AID key" )
-	DECLARE_LIB3270_ACTION( eraseinput, "" )
-
-	DECLARE_LIB3270_ACTION( select_field, "" )
-	DECLARE_LIB3270_ACTION( select_all, "" )
-	DECLARE_LIB3270_ACTION( unselect, "" )
-	DECLARE_LIB3270_ACTION( reselect, "" )
-
-	DECLARE_LIB3270_ACTION( eraseeof, "Erase End Of Field Key." )
-	DECLARE_LIB3270_ACTION( eraseeol, "Erase End Of Line Key." )
-	DECLARE_LIB3270_ACTION( erase, "" )
-	DECLARE_LIB3270_ACTION( delete, "" )
-	DECLARE_LIB3270_ACTION( dup, "DUP key" )
-	DECLARE_LIB3270_ACTION( fieldmark, "FM key" )
-
-	DECLARE_LIB3270_ACTION( backspace, "3270-style backspace." )
-
-	DECLARE_LIB3270_ACTION( previousword, "Cursor to previous word." )
-	DECLARE_LIB3270_ACTION( nextword, "Cursor to next unprotected word." )
-	DECLARE_LIB3270_ACTION( fieldend, "Move the cursor to the first blank after the last nonblank in the field." )
-
-	DECLARE_LIB3270_ACTION( firstfield, "Move to first unprotected field on screen." )
-	DECLARE_LIB3270_ACTION( nextfield, "" )
-	DECLARE_LIB3270_ACTION( previousfield, "Tab backward to previous field." )
-
-	DECLARE_LIB3270_ACTION( attn, "ATTN key, per RFC 2355.  Sends IP, regardless." )
-	DECLARE_LIB3270_ACTION( break, "" )
-	DECLARE_LIB3270_ACTION( pastenext, "" )
-
-	DECLARE_LIB3270_ACTION( deleteword, "Backspaces the cursor until it hits the front of a word (does a ^W)." )
-	DECLARE_LIB3270_ACTION( deletefield, "Delete field key (does a ^U)." )
-	DECLARE_LIB3270_ACTION( sysreq, "" )
-
-	DECLARE_LIB3270_ACTION( testpattern, "" )
-	DECLARE_LIB3270_ACTION( charsettable, "" )
-
-
@@ -35,12 +35,7 @@
  *	@brief Global declarations for host.c.
  */
-// #include "api.h"
-
-
-/**
- * @brief Signal a state change.
- */
+ /// @brief Signal a state change.
  LIB3270_INTERNAL void lib3270_st_changed(H3270 *h, LIB3270_STATE tx, int mode);
  LIB3270_INTERNAL void host_in3270(H3270 *session, LIB3270_CSTATE);
@@ -128,16 +128,6 @@ enum iaction {
 	IA_IDLE
 };
-// Version strings
-/*
-LIB3270_INTERNAL const char * build;
-LIB3270_INTERNAL const char * app_defaults_version;
-LIB3270_INTERNAL const char * sccsid;
-LIB3270_INTERNAL const char * build_rpq_timestamp;
-LIB3270_INTERNAL const char * build_rpq_version;
-LIB3270_INTERNAL const char * build_rpq_revision;
-*/
-
 #if defined(X3270_DBCS) /*[*/
 	LIB3270_INTERNAL Boolean		dbcs;
 #endif /*]*/
@@ -334,41 +324,40 @@ struct _h3270
 	// flags
 	LIB3270_HOST_TYPE		  host_type;						///< @brief Host type.
-	int					  	  selected					: 1;	///< @brief Has selected region?
-	int						  has_copy					: 1;	///< @brief Has copy?
-	int						  rectsel					: 1;	///< @brief Selected region is a rectangle ?
-	int						  vcontrol					: 1;	///< @brief Visible control ?
-	int						  modified_sel				: 1;
-	int						  mono						: 1;	///< @brief Forces monochrome display
-	int						  m3279						: 1;
-	int 					  extended					: 1;	///< @brief Extended data stream.
-	int						  typeahead					: 1;
-	int						  numeric_lock				: 1;
-	int						  oerr_lock					: 1;	///< @brief If true, operator errors will lock the keyboard.
-	int						  unlock_delay				: 1;	///< @brief If true the unlock delay feature is enabled. @see lib3270_set_unlock_delay
-	int			 			  auto_reconnect_inprogress	: 1;
+	unsigned int		  	  selected					: 1;	///< @brief Has selected region?
+	unsigned int			  has_copy					: 1;	///< @brief Has copy?
+	unsigned int			  rectsel					: 1;	///< @brief Selected region is a rectangle ?
+	unsigned int			  vcontrol					: 1;	///< @brief Visible control ?
+	unsigned int			  modified_sel				: 1;
+	unsigned int			  mono						: 1;	///< @brief Forces monochrome display
+	unsigned int			  m3279						: 1;
+	unsigned int 			  extended					: 1;	///< @brief Extended data stream.
+	unsigned int			  typeahead					: 1;
+	unsigned int			  numeric_lock				: 1;
+	unsigned int			  oerr_lock					: 1;	///< @brief If true, operator errors will lock the keyboard.
+	unsigned int			  unlock_delay				: 1;	///< @brief If true the unlock delay feature is enabled. @see lib3270_set_unlock_delay
+	unsigned int 			  auto_reconnect_inprogress	: 1;
 	unsigned int			  colors					: 5;
-	int						  apl_mode					: 1;	///< @brief If true enables APL mode.
-	int						  icrnl						: 1;
-	int						  inlcr						: 1;
-	int						  onlcr						: 1;
-	int						  bsd_tm					: 1;
-	int 					  syncing					: 1;
-	int						  reverse 					: 1;	/**< @brief reverse-input mode */
-	int						  dbcs						: 1;
-	int             		  linemode					: 1;
-	int						  trace_skipping			: 1;
-	int						  need_tls_follows			: 1;
-	int						  cut_xfer_in_progress		: 1;
-//		int						  auto_keymap				: 1;
-	int						  formatted					: 1;	/**< @brief Formatted screen flag */
-	int						  starting					: 1;	/**< @brief Is starting (no first screen)? */
+	unsigned int			  apl_mode					: 1;	///< @brief If true enables APL mode.
+	unsigned int			  icrnl						: 1;
+	unsigned int			  inlcr						: 1;
+	unsigned int			  onlcr						: 1;
+	unsigned int			  bsd_tm					: 1;
+	unsigned int			  syncing					: 1;
+	unsigned int			  reverse                   : 1;    ///< @brief reverse-input mode
+	unsigned int			  dbcs						: 1;
+	unsigned int	   		  linemode					: 1;
+	unsigned int			  trace_skipping			: 1;
+	unsigned int			  need_tls_follows			: 1;
+	unsigned int			  cut_xfer_in_progress		: 1;
+	unsigned int			  formatted					: 1;	///< @brief Formatted screen flag
+	unsigned int			  starting					: 1;	///< @brief Is starting (no first screen)?
 	struct lib3270_toggle
 	{
-		char value;																		/**< toggle value */
-		void (*upcall)(H3270 *, const struct lib3270_toggle *, LIB3270_TOGGLE_TYPE);	/**< change value */
-	}						  toggle[LIB3270_TOGGLE_COUNT];
+		char value;																		///< toggle value
+		void (*upcall)(H3270 *, const struct lib3270_toggle *, LIB3270_TOGGLE_TYPE);	///< change value
+	} toggle[LIB3270_TOGGLE_COUNT];
 	// Network & Termtype
 	char					* connected_type;
@@ -451,9 +440,9 @@ struct _h3270
 	unsigned char			  default_cs;
 	unsigned char			  default_ic;
 	char					  reply_mode;
-	int 					  trace_primed 		: 1;
-	int						  ticking			: 1;
-	int						  mticking			: 1;
+	unsigned int 			  trace_primed 		: 1;
+	unsigned int			  ticking			: 1;
+	unsigned int			  mticking			: 1;
 	int						  crm_nattr;
 	unsigned char			  crm_attr[16];
 	unsigned char 			* zero_buf;				/**< @brief Empty buffer, for area clears */
@@ -543,9 +532,9 @@ struct _h3270
 	int						  dft_buffersize;		///< @brief Buffer size (LIMIN, LIMOUT)
 	// rpq.c
-	int						  rpq_complained : 1;
+	unsigned int			  rpq_complained : 1;
 #if !defined(_WIN32)
-	int						  omit_due_space_limit : 1;
+	unsigned int			  omit_due_space_limit : 1;
 #endif
 	char					* rpq_warnbuf;
@@ -568,28 +557,28 @@ struct _h3270
 	int						  once_cset;
 	int						  saved_cursor;
-	int						  held_wrap					: 1;
+	unsigned int			  held_wrap					: 1;
-	int						  insert_mode				: 1;
-	int						  auto_newline_mode			: 1;
+	unsigned int			  insert_mode				: 1;
+	unsigned int			  auto_newline_mode			: 1;
-	int						  appl_cursor				: 1;
-	int						  saved_appl_cursor			: 1;
+	unsigned int			  appl_cursor				: 1;
+	unsigned int			  saved_appl_cursor			: 1;
-	int  					  wraparound_mode			: 1;
-	int						  saved_wraparound_mode		: 1;
+	unsigned int  			  wraparound_mode			: 1;
+	unsigned int			  saved_wraparound_mode		: 1;
-	int						  rev_wraparound_mode 		: 1;
-	int						  saved_rev_wraparound_mode	: 1;
+	unsigned int			  rev_wraparound_mode 		: 1;
+	unsigned int			  saved_rev_wraparound_mode	: 1;
-	int						  allow_wide_mode			: 1;
-	int						  saved_allow_wide_mode		: 1;
+	unsigned int			  allow_wide_mode			: 1;
+	unsigned int			  saved_allow_wide_mode		: 1;
-	int						  wide_mode 				: 1;
-	int						  saved_wide_mode			: 1;
+	unsigned int			  wide_mode 				: 1;
+	unsigned int			  saved_wide_mode			: 1;
-	int						  saved_altbuffer			: 1;
-	int						  ansi_reset				: 1;	/**< @brief Non zero if the ansi_reset() was called in this session */
+	unsigned int			  saved_altbuffer			: 1;
+	unsigned int			  ansi_reset				: 1;	/**< @brief Non zero if the ansi_reset() was called in this session */
 	int      				  ansi_ch;
 	int						  cs_to_change;
@@ -663,8 +652,8 @@ struct _h3270
 	struct
 	{
-		int								  host			: 1;		///< @brief Non zero if host requires SSL.
-		int								  download_crl	: 1;		///< @brief Non zero to download CRL.
+		unsigned int					  host			: 1;		///< @brief Non zero if host requires SSL.
+		unsigned int					  download_crl	: 1;		///< @brief Non zero to download CRL.
 		LIB3270_SSL_STATE				  state;
 		int 							  error;
 		const LIB3270_SSL_MESSAGE		* message;					///< @brief Pointer to SSL messages for current state.
@@ -685,6 +674,7 @@ struct _h3270
 	} listeners;
+	unsigned int tasks;
 };
@@ -74,7 +74,7 @@
 	#define KYBDLOCK_IS_OERR(hSession)	(hSession->kybdlock && !(hSession->kybdlock & ~KL_OERR_MASK))
 	/* other functions */
-	LIB3270_INTERNAL void add_xk(KeySym key, KeySym assoc);
+	//LIB3270_INTERNAL void add_xk(KeySym key, KeySym assoc);
 	LIB3270_INTERNAL void clear_xks(void);
 	LIB3270_INTERNAL void do_reset(H3270 *session, Boolean explicit);
@@ -1,437 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como lib3270++.h e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- */
-
-#ifndef LIB3270_HPP_INCLUDED
-
-	#define LIB3270_HPP_INCLUDED 1
-
-	#include <iostream>
-	#include <cstdarg>
-	#include <vector>
-	#include <functional>
-	#include <lib3270.h>
-
-	#if defined(_WIN32)
-
-		#define TN3270_PUBLIC	__declspec (dllexport)
-		#define TN3270_PRIVATE
-
-	#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-
-		#define TN3270_PUBLIC
-		#define TN3270_PRIVATE
-
-	#elif defined(__GNUC__)
-
-		#define TN3270_PUBLIC	__attribute__((visibility("default")))
-		#define TN3270_PRIVATE	__attribute__((visibility("hidden")))
-
-	#else
-
-		#error Unable to set visibility attribute
-
-	#endif
-
-#ifdef __cplusplus
-
-	#include <string>
-
-	namespace TN3270 {
-
-		class Host;
-		class Controller;
-
-		#define DEFAULT_TIMEOUT 5
-
-		class TN3270_PUBLIC Event {
-		public:
-			enum Type : uint8_t {
-				All,			///< @brief All events (undefined).
-				Popup,			///< @brief Popup message.
-				Trace,			///< @brief Trace message.
-				Message,		///< @brief Generic message.
-				Connection		///< @brief Connect/Disconnect event.
-			};
-
-		private:
-			Type type;
-
-		protected:
-			Event(enum Type type);
-
-		public:
-			virtual ~Event();
-
-			/// @brief Check event type
-			inline bool is(Event::Type type) const noexcept {
-				return this->type == type;
-			}
-
-			/// @brief Check event type
-			inline bool operator==(Event::Type type) const noexcept {
-				return this->type == type;
-			}
-
-			inline operator Event::Type() const noexcept {
-				return this->type;
-			}
-
-			/// @brief Get event description.
-			virtual std::string toString() const = 0;
-
-		};
-
-		enum ProgramMessage : uint8_t {
-			MESSAGE_NONE			= LIB3270_MESSAGE_NONE,				///< @brief No message
-			MESSAGE_SYSWAIT			= LIB3270_MESSAGE_SYSWAIT,			///< @brief --
-			MESSAGE_TWAIT			= LIB3270_MESSAGE_TWAIT,			///< @brief --
-			MESSAGE_CONNECTED		= LIB3270_MESSAGE_CONNECTED,		///< @brief Connected
-			MESSAGE_DISCONNECTED	= LIB3270_MESSAGE_DISCONNECTED,		///< @brief Disconnected from host
-			MESSAGE_AWAITING_FIRST	= LIB3270_MESSAGE_AWAITING_FIRST,	///< @brief --
-			MESSAGE_MINUS			= LIB3270_MESSAGE_MINUS,			///< @brief --
-			MESSAGE_PROTECTED		= LIB3270_MESSAGE_PROTECTED,		///< @brief --
-			MESSAGE_NUMERIC			= LIB3270_MESSAGE_NUMERIC,			///< @brief --
-			MESSAGE_OVERFLOW		= LIB3270_MESSAGE_OVERFLOW,			///< @brief --
-			MESSAGE_INHIBIT			= LIB3270_MESSAGE_INHIBIT,			///< @brief --
-			MESSAGE_KYBDLOCK		= LIB3270_MESSAGE_KYBDLOCK,			///< @brief Keyboard is locked
-
-			MESSAGE_X				= LIB3270_MESSAGE_X,				///< @brief --
-			MESSAGE_RESOLVING		= LIB3270_MESSAGE_RESOLVING,		///< @brief Resolving hostname (running DNS query)
-			MESSAGE_CONNECTING		= LIB3270_MESSAGE_CONNECTING		///< @brief Connecting to host
-
-		};
-
-		/// @brief connection state.
-		enum ConnectionState : uint8_t {
-			DISCONNECTED		= LIB3270_NOT_CONNECTED,				///< @brief disconnected
-			RESOLVING			= LIB3270_RESOLVING,					///< @brief resolving hostname
-			PENDING				= LIB3270_PENDING,						///< @brief connection pending
-			CONNECTED_INITIAL	= LIB3270_CONNECTED_INITIAL,			///< @brief connected, no mode yet
-			CONNECTED_ANSI		= LIB3270_CONNECTED_ANSI,				///< @brief connected in NVT ANSI mode
-			CONNECTED_3270		= LIB3270_CONNECTED_3270,				///< @brief connected in old-style 3270 mode
-			CONNECTED_INITIAL_E	= LIB3270_CONNECTED_INITIAL_E,			///< @brief connected in TN3270E mode, unnegotiated
-			CONNECTED_NVT		= LIB3270_CONNECTED_NVT,				///< @brief connected in TN3270E mode, NVT mode
-			CONNECTED_SSCP		= LIB3270_CONNECTED_SSCP,				///< @brief connected in TN3270E mode, SSCP-LU mode
-			CONNECTED_TN3270E	= LIB3270_CONNECTED_TN3270E,			///< @brief connected in TN3270E mode, 3270 mode
-		};
-
-		/// @brief PF Keys
-		enum PFKey : uint8_t {
-			PF_1,
-			PF_2,
-			PF_3,
-			PF_4,
-			PF_5,
-			PF_6,
-			PF_7,
-			PF_8,
-			PF_9,
-			PF_10,
-			PF_11,
-			PF_12
-		};
-
-		/// @brief PF Keys
-		enum PAKey : uint8_t {
-			PA_1,
-			PA_2,
-			PA_3
-		};
-
-		/// @brief Actions keys
-		enum Action : uint8_t {
-			ENTER,		///< Enter key
-			ERASE,
-			ERASE_EOF,
-			ERASE_EOL,
-			ERASE_INPUT
-		};
-
-		/// @brief TN3270 Session.
-		class TN3270_PUBLIC Session {
-		protected:
-			Session();
-
-			/// @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;
-
-			/// @brief Fire event.
-			void fire(const Event &event);
-
-		public:
-
-			/// @brief Create a tn3270 session.
-			static Session * create(const char *id = nullptr);
-
-			virtual ~Session();
-
-			// Connect/disconnect
-			virtual void connect(const char *url) = 0;
-			virtual void disconnect() = 0;
-
-			// Wait for session state.
-			virtual void waitForReady(time_t timeout = DEFAULT_TIMEOUT) = 0;
-
-			// Gets
-			virtual std::string	toString(int baddr = 0, size_t len = -1, char lf = '\n') const = 0;
-			virtual std::string	toString(int row, int col, size_t sz, char lf = '\n') const = 0;
-
-			inline operator std::string() const {
-				return toString();
-			}
-
-			// Get properties.
-			virtual void getProperty(const char *name, int &value) const = 0;
-			virtual void getProperty(const char *name, std::string &value) const = 0;
-			virtual void getProperty(const char *name, bool &value) const = 0;
-
-			virtual std::string getVersion() const = 0;
-			virtual std::string getRevision() const = 0;
-
-			virtual ProgramMessage getProgramMessage() const = 0;
-			inline operator ProgramMessage() const {
-				return getProgramMessage();
-			}
-
-			virtual ConnectionState getConnectionState() const = 0;
-			inline operator ConnectionState() const {
-				return getConnectionState();
-			}
-
-			inline bool operator==(ConnectionState state) const noexcept {
-				return this->getConnectionState() == state;
-			}
-
-			// Set contents.
-
-			/// @brief Set field at current posicion, jumps to next writable field.
-			virtual Session & push(const char *text) = 0;
-			inline Session & push(const std::string &text) {
-				return push(text.c_str());
-			}
-
-			/// @brief Set cursor address.
-			virtual TN3270::Session & setCursorPosition(unsigned short addr) = 0;
-
-			/// @brief Set cursor position.
-			virtual TN3270::Session & setCursorPosition(unsigned short row, unsigned short col) = 0;
-
-			virtual Session & push(int baddr, const std::string &text) = 0;
-			virtual Session & push(int row, int col, const std::string &text) = 0;
-			virtual Session & push(const PFKey key) = 0;
-			virtual Session & push(const PAKey key) = 0;
-			virtual Session & push(const Action action) = 0;
-
-			// Get contents.
-			virtual Session & pop(int baddr, std::string &text) = 0;
-			virtual Session & pop(int row, int col, std::string &text) = 0;
-			virtual Session & pop(std::string &text) = 0;
-
-			/// @brief Insert event listener.
-			void insert(Event::Type type, std::function <void(const Event &event)> listener);
-
-			// Misc
-
-			/// @brief Execute action by name.
-			virtual Session & action(const char *action_name) = 0;
-
-		};
-
-		/// @brief TN3270 Host
-		class TN3270_PUBLIC Host : public std::basic_streambuf<char, std::char_traits<char> > {
-		private:
-
-			/// @brief Connection with the host
-			Session *session;
-
-			/// @brief How much seconds we wait for the terminal to be ready?
-			time_t timeout;
-
-		protected:
-
-			/// @brief Writes characters to the associated file from the put area
-			int sync() override;
-
-			/// @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 = nullptr, const char *url = nullptr, time_t timeout = DEFAULT_TIMEOUT);
-			~Host();
-
-			inline bool operator==(ConnectionState state) const noexcept {
-				return session->getConnectionState() == state;
-			}
-
-			void connect(const char *url, bool sync = true);
-
-			inline ProgramMessage getProgramMessage() const {
-				return session->getProgramMessage();
-			}
-
-			inline operator bool() const {
-				return isReady();
-			}
-
-			inline operator ProgramMessage() const {
-				return getProgramMessage();
-			}
-
-			inline ConnectionState getConnectionState() const {
-				return session->getConnectionState();
-			}
-
-			bool isReady() const;
-			bool isConnected() const;
-
-			inline operator ConnectionState() const {
-				return getConnectionState();
-			}
-
-			/// @brief Set cursor address.
-			inline void setCursorPosition(unsigned short addr) {
-				session->setCursorPosition(addr);
-			}
-
-			/// @brief Set cursor position.
-			inline void setCursorPosition(unsigned short row, unsigned short col) {
-				session->setCursorPosition(row,col);
-			}
-
-			// Get properties
-
-			/// @brief Get lib3270 version.
-			inline std::string getVersion() const {
-				return session->getVersion();
-			}
-
-			/// @brief Get lib3270 revision.
-			std::string getRevision() const {
-				return session->getRevision();
-			}
-
-			// Set contents.
-
-			/// @brief Set field at current posicion, jumps to next writable field.
-			inline Host & push(const char *text) {
-				session->push(text);
-				return *this;
-			};
-
-			inline Host & push(const std::string &text) {
-				session->push(text);
-				return *this;
-
-			}
-
-			inline Host & push(int baddr, const std::string &text) {
-				session->push(baddr,text);
-				return *this;
-			}
-
-			inline Host & push(int row, int col, const std::string &text) {
-				session->push(row,col,text);
-				return *this;
-			}
-
-			inline Host & push(const PFKey key) {
-				session->push(key);
-				return *this;
-			}
-
-			inline Host & push(const PAKey key) {
-				session->push(key);
-				return *this;
-			}
-
-			Host & push(const Action action);
-
-			// Get contents.
-
-			Host & pop(int baddr, std::string &text);
-			Host & pop(int row, int col, std::string &text);
-			Host & pop(std::string &text);
-
-			std::string toString() const;
-			std::string toString(int baddr, size_t len = -1, char lf = '\n') const;
-			std::string toString(int row, int col, size_t sz, char lf = '\n') const;
-
-			// Event listeners
-			inline Host & insert(Event::Type type, std::function <void(const Event &event)> listener) noexcept {
-				session->insert(type, listener);
-				return *this;
-			}
-
-
-		};
-
-	}
-
-	TN3270_PUBLIC const char * toCharString(const TN3270::ProgramMessage programMessage) noexcept;
-	TN3270_PUBLIC const char * toCharString(const TN3270::ConnectionState connectionState) noexcept;
-
-	template <typename T>
-	inline TN3270_PUBLIC TN3270::Session & operator<<(TN3270::Session& session, const T value) {
-		return session.push(value);
-	}
-
-	template <typename T>
-	inline TN3270_PUBLIC TN3270::Session & operator>>(TN3270::Session& session, const T value) {
-		return session.pop(value);
-	}
-
-	template <typename T>
-	inline TN3270_PUBLIC TN3270::Host & operator<<(TN3270::Host& host, const T value) {
-		return host.push(value);
-	}
-
-	inline std::ostream & operator<<(std::ostream &stream, const TN3270::Host& host) {
-        stream << host.toString();
-        return stream;
-	}
-
-
-#endif
-
-#endif // LIB3270_H_INCLUDED
@@ -546,6 +546,10 @@
 	 *
 	 * @return zero if reconnect is unavailable (sets errno), non zero if available.
 	 *
+	 * @retval ENODATA	Invalid or empty hostname.
+	 * @retval EBUSY	Auto reconnect in progress.
+	 * @retval EISCONN	Session is connected.
+	 *
 	 */
 	LIB3270_EXPORT int lib3270_allow_reconnect(const H3270 *hSession);
@@ -557,6 +561,11 @@
 	 *
 	 * @return 0 for success, non zero if fails (sets errno).
 	 *
+	 * @retval ENODATA	Invalid or empty hostname.
+	 * @retval EBUSY	Auto reconnect in progress.
+	 * @retval EISCONN	Session is connected.
+	 * @retval -1		Unexpected error.
+	 *
 	 */
 	LIB3270_EXPORT int lib3270_reconnect(H3270 *hSession,int seconds);
@@ -275,6 +275,16 @@
 	 */
 	 LIB3270_EXPORT const char * lib3270_service_get_name(const H3270 *h);
+	 /**
+	  * @brief Check if there's an active task.
+	  *
+	  * @param h	Session handle.
+	  *
+	  * @return Number of background tasks.
+	  *
+	  */
+	 LIB3270_EXPORT unsigned int lib3270_get_task_count(const H3270 *h);
+
 #ifdef __cplusplus
 	}
 #endif
@@ -79,6 +79,7 @@
 		int	 (*action)(H3270 *hSession, const char *name);
+		int  (*reconnect)(H3270 *hSession,int seconds);
 	};
 	/**
@@ -33,50 +33,23 @@
 /* These first definitions were cribbed from X11 -- but no X code is used. */
 #define False 0
 #define True 1
-//typedef void *XtPointer;
-// typedef void *Widget;
-// typedef void *XEvent;
+
 #ifdef __APPLE__
     typedef unsigned char Boolean;
 #else
     typedef char Boolean;
 #endif
+
 typedef char *String;
-// typedef unsigned int Cardinal;
-typedef unsigned long KeySym;
+//typedef unsigned long KeySym;
 #define Bool int
-/*
-typedef void (*XtActionProc)(
-    Widget 		// widget,
-    XEvent*		// event,
-    String*		// params,
-    Cardinal*		// num_param
-);
-*/
-
-/*
-typedef struct _XtActionsRec{
-    String	 string;
-    XtActionProc proc;
-} XtActionsRec;
-*/
-
-#define XtNumber(n)	(sizeof(n)/sizeof((n)[0]))
-#define NoSymbol		0L
+//#define XtNumber(n)	(sizeof(n)/sizeof((n)[0]))
+//#define NoSymbol		0L
 /* These are local functions with similar semantics to X functions. */
-
-// void * Malloc(size_t);
-// void   Free(void *);
-// void * Calloc(size_t, size_t);
-// void * Realloc(void *, size_t);
-
-// #define Malloc(x) lib3270_malloc(x)
-// #define Free(x)	lib3270_free(x)
 #define Calloc(e,n)	lib3270_calloc(e,n,NULL)
 #define Realloc(x,n) lib3270_realloc(x,n)
 #define NewString(x) strdup(x)
-//extern char *NewString(const char *);
@@ -142,7 +142,7 @@
 		/// @retval 0	The session is offline.
 		int (*is_connected)(const H3270 *hSession);
-		/// @brief get socket name.
+		/// @brief Get socket name.
 		///
 		/// @return On success, zero is returned.  On error, -1 is returned, and errno is set appropriately.
 		///
@@ -150,6 +150,14 @@
 		/// @retval -1	Error (errno is set).
 		int (*getsockname)(const H3270 *hSession, struct sockaddr *addr, socklen_t *addrlen);
+		/// @brief Get name of connected peer socket.
+		///
+		/// @return On success, zero is returned.  On error, -1 is returned, and errno is set appropriately.
+		///
+		/// @retval 0	Success.
+		/// @retval -1	Error (errno is set).
+		int (*getpeername)(const H3270 *hSession, struct sockaddr *addr, socklen_t *addrlen);
+
 		/// @brief Set socket options.
 		int (*setsockopt)(H3270 *hSession, int level, int optname, const void *optval, size_t optlen);
@@ -1,22 +0,0 @@
-/*
- * Copyright 2007 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, wc3270, s3270 and tcl3270 are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * file LICENSE for more details.
- */
-
-/*
- *	proxyc.h
- *		Declarations for proxy.c.
- */
-
-LIB3270_INTERNAL int	 	  proxy_setup(H3270 *session, char **phost, char **pport);
-LIB3270_INTERNAL int		  proxy_negotiate(H3270 *session, int type, int fd, char *host, unsigned short port);
-LIB3270_INTERNAL const char	* proxy_type_name(int type);
@@ -1,22 +0,0 @@
-/*
- * Copyright 2007 by Paul Mattes.
- *  Permission to use, copy, modify, and distribute this software and its
- *  documentation for any purpose and without fee is hereby granted,
- *  provided that the above copyright notice appear in all copies and that
- *  both that copyright notice and this permission notice appear in
- *  supporting documentation.
- *
- * x3270, c3270, wc3270, s3270, tcl3270, pr3287 and wpr3287 are distributed in
- * the hope that they will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the file LICENSE for more details.
- */
-
-/*
- *	resolverc.h
- *		Hostname resolution.
- */
-
-// LIB3270_INTERNAL int resolve_host_and_port(H3270 *session, const char *host, char *portname, unsigned short *pport,struct sockaddr *sa, socklen_t *sa_len, char *errmsg, int em_size);
-
-
@@ -18,6 +18,8 @@
  *		x3270/c3270/s3270/tcl3270 resource and option names.
  */
+#error Deprecated
+
 /* Resources. */
 #define ResActiveIcon		"activeIcon"
 #define ResAdVersion		"adVersion"
 /* IShellLinkDataList, missing from mingw's <shlobj.h>. */
+#error Deprecated
+
 LIB3270_INTERNAL const GUID IID_IShellLinkDataList;
 #define INTERFACE IShellLinkDataList
@@ -30,9 +30,6 @@
 LIB3270_INTERNAL void 		status_compose(int on, unsigned char c, enum keytype keytype);
 LIB3270_INTERNAL void 		status_ctlr_done(H3270 *session);
-// LIB3270_INTERNAL void 		status_timing(H3270 *session, struct timeval *t0, struct timeval *t1);
-// LIB3270_INTERNAL void 		status_untiming(H3270 *session);
-
 LIB3270_INTERNAL void 		status_lu(H3270 *session, const char *);
 LIB3270_INTERNAL void 		status_oerr(H3270 *session, int error_type);
 LIB3270_INTERNAL void 		status_reset(H3270 *session);
@@ -62,4 +62,3 @@ LIB3270_INTERNAL void space3270out(H3270 *hSession, int n);
 	#define trace_netdata(direction, buf, len) /* */
 #endif // X3270_TRACE
-// LIB3270_INTERNAL int net_getsockname(const H3270 *h3270, void *buf, int *len);
@@ -18,15 +18,17 @@
  *		UTF-8 conversions
  */
+ /*
 enum ulfail {
-    	ULFAIL_NOUTF8,		/* not using UTF-8 */
-	ULFAIL_INCOMPLETE,	/* incomplete sequence */
-	ULFAIL_INVALID		/* invalid sequence */
+    	ULFAIL_NOUTF8,		// not using UTF-8
+	ULFAIL_INCOMPLETE,	// incomplete sequence
+	ULFAIL_INVALID		// invalid sequence
 };
+*/
 // LIB3270_INTERNAL char *locale_codeset;
 // LIB3270_INTERNAL void set_codeset(char *codeset_name);
 // LIB3270_INTERNAL Boolean utf8_set_display_charsets(char *cslist, char *csname);
- LIB3270_INTERNAL char *utf8_expand(unsigned char c);
- LIB3270_INTERNAL unsigned char utf8_lookup(char *mbs, enum ulfail *fail, int *consumed);
+// LIB3270_INTERNAL char *utf8_expand(unsigned char c);
+// LIB3270_INTERNAL unsigned char utf8_lookup(char *mbs, enum ulfail *fail, int *consumed);
@@ -17,9 +17,11 @@
  *		DBCS translation table structure.
  */
+ /*
 typedef struct {
 	unsigned n;
 	unsigned short *data;
 } xl_t;
 #define XL_SIZE(e)	((sizeof(e)/sizeof(e[0]))/3)
+*/
@@ -1,215 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como mkfb.c e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- */
-
-/**
- * @brief Utility to create the actions definition files.
- *
- */
-
-#include <getopt.h>
-#include <stdio.h>
-
-#define DECLARE_LIB3270_ACTION( name, description ) \
-		{ \
-			description, \
-			NULL, \
-			"LIB3270_EXPORT int lib3270_" # name "(H3270 *hSession);" \
-		},
-
-#define DECLARE_LIB3270_CLEAR_SELECTION_ACTION( name, description ) \
-		{ \
-			description, \
-			NULL, \
-			"LIB3270_EXPORT int lib3270_" # name "(H3270 *hSession);" \
-		},
-
-#define DECLARE_LIB3270_KEY_ACTION( name, description ) \
-		{ \
-			description, \
-			NULL, \
-			"LIB3270_EXPORT int lib3270_" # name "(H3270 *hSession);" \
-		},
-
-#define DECLARE_LIB3270_CURSOR_ACTION( name, description ) \
-		{ \
-			description, \
-			NULL, \
-			"LIB3270_EXPORT int lib3270_cursor_" # name "(H3270 *hSession);" \
-		},
-
-#define DECLARE_LIB3270_FKEY_ACTION( name, description ) \
-		{ \
-			description, \
-			"keycode\tNumber of the " #name " to activate.", \
-			"LIB3270_EXPORT int lib3270_" # name "(H3270 *hSession, int keycode);" \
-		},
-
-
-static struct {
-	const char *description;
-	const char *args;
-	const char *prototype;
-} actions[] = {
-	#include <lib3270/action_table.h>
-};
-
-
-int main(int argc, char *argv[]) {
-
-	enum _format {
-		FORMAT_HEADER
-	} format = FORMAT_HEADER;
-
-	size_t ix;
-
-	char * outfile = "actions.h";
-
-	//#pragma GCC diagnostic push
-	//#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-	static struct option options[] = {
-		{ "outfile",	required_argument,	0,	'o' },
-		{ 0, 0, 0, 0}
-
-	};
-	//#pragma GCC diagnostic pop
-
-	int long_index =0;
-	int opt;
-	while((opt = getopt_long(argc, argv, "o:", options, &long_index )) != -1) {
-
-		switch(opt) {
-		case 'o':	// Pidfile
-			outfile = optarg;
-			break;
-		}
-
-	}
-
-	FILE *out = fopen(outfile,"w");
-
-	fprintf(out,"%s\n",
-		"/*\n"
-		" * Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270\n"
-		" * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a\n"
-		" * aplicativos mainframe. Registro no INPI sob o nome G3270. Registro no INPI sob o nome G3270.\n"
-		" *\n"
-		" * Copyright (C) <2008> <Banco do Brasil S.A.>\n"
-		" *\n"
-		" * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob\n"
-		" * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela\n"
-		" * Free Software Foundation.\n"
-		" *\n"
-		" * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER\n"
-		" * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO\n"
-		" * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para\n"
-		" * obter mais detalhes.\n"
-		" *\n"
-		" * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este\n"
-		" * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin\n"
-		" * St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-		" *\n"
-		" * Contatos:\n"
-		" *\n"
-		" * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)\n"
-		" * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)\n"
-		" *\n"
-		" */\n\n"
-		"#ifndef LIB3270_ACTIONS_H_INCLUDED\n"
-		"\n"
-		"\n	#define LIB3270_ACTIONS_H_INCLUDED 1\n\n"
-		"#ifdef __cplusplus\n"
-		"	extern \"C\" {\n"
-		"#endif\n\n"
-	);
-
-	if(format == FORMAT_HEADER)
-	{
-
-		for(ix = 0; ix < (sizeof(actions)/sizeof(actions[0])); ix++)
-		{
-			fprintf(out,
-				"/**\n"
-				" *\n"
-				" * @brief %s\n"
-				" *\n"
-				" * @param hSession\tTN3270 Session handle.\n",
-				actions[ix].description
-			);
-
-			if(actions[ix].args) {
-				fprintf(out," * @param %s\n", actions[ix].args);
-			}
-
-			fprintf(out,
-				" *\n"
-				" * @return 0 if Ok, non zero if not (sets errno)\n"
-			);
-
-            fprintf(out," *\n */\n %s\n\n",actions[ix].prototype);
-		}
-
-		fprintf(out,
-			"\n"
-			"\n typedef struct _lib3270_action_entry"
-			"\n {"
-			"\n     const char *name;"
-			"\n     const char *description;"
-			"\n     int (*call)(H3270 *hSession);"
-			"\n } LIB3270_ACTION_ENTRY;"
-			"\n\n"
-			"/**\n"
-			" *\n"
-			" * @brief Get lib3270 action table.\n"
-			" *\n"
-			" * @return Array with all the supported actions.\n"
-			" */\n"
-			" LIB3270_EXPORT const LIB3270_ACTION_ENTRY * lib3270_get_actions();\n"
-			"\n"
-			"/**\n"
-			" *\n"
-			" * @brief Call lib3270 action by name.\n"
-			" *\n"
-			" * @param hSession\tTN3270 Session handle.\n"
-			" * @param name\tName of the action to call.\n"
-			" *\n"
-			" */\n"
-			" LIB3270_EXPORT int lib3270_action(H3270 *hSession, const char *name);\n\n"
-			"#ifdef __cplusplus\n"
-			"	}\n"
-			"#endif\n"
-			"\n#endif // LIB3270_ACTIONS_H_INCLUDED"
-		);
-	}
-
-	fclose(out);
-
-	return 0;
-}
-
-
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="LIB3270 Action Table Generator" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output=".bin/Debug/mkactions" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output=".bin/Release/mkactions" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Release/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add directory="../../include" />
-		</Compiler>
-		<Unit filename="mkactions.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
@@ -92,6 +92,10 @@ static int unsecure_network_getsockname(const H3270 *hSession, struct sockaddr *
 	return getsockname(hSession->network.context->sock, addr, addrlen);
 }
+static int unsecure_network_getpeername(const H3270 *hSession, struct sockaddr *addr, socklen_t *addrlen) {
+	return getpeername(hSession->network.context->sock, addr, addrlen);
+}
+
 static void * unsecure_network_add_poll(H3270 *hSession, LIB3270_IO_FLAG flag, void(*call)(H3270 *, int, LIB3270_IO_FLAG, void *), void *userdata) {
 	return lib3270_add_poll_fd(hSession,hSession->network.context->sock,flag,call,userdata);
 }
@@ -166,6 +170,7 @@ void lib3270_set_default_network_module(H3270 *hSession) {
 		.non_blocking = unsecure_network_non_blocking,
 		.is_connected = unsecure_network_is_connected,
 		.getsockname = unsecure_network_getsockname,
+		.getpeername = unsecure_network_getpeername,
 		.setsockopt = unsecure_network_setsockopt,
 		.getsockopt = unsecure_network_getsockopt,
 		.reset = unsecure_network_reset
@@ -27,7 +27,7 @@
  *
  */
-/// @brief Get CRL infro from X509 cert.
+/// @brief Get CRL info from X509 cert.
 ///
 /// References:
 ///
@@ -35,6 +35,7 @@
 #include "private.h"
+#include <utilc.h>
 /*--[ Implement ]------------------------------------------------------------------------------------*/
@@ -79,7 +80,13 @@ LIB3270_STRING_ARRAY * lib3270_openssl_get_crls_from_peer(H3270 *hSession, X509 
 #endif // OpenSSL 1.1.0+
 				if(data && length > 0)
-					lib3270_string_array_append_with_length(uris,(char *) data, (size_t) length);
+				{
+					lib3270_autoptr(char) uri = lib3270_malloc( ((size_t) length) + 1);
+					strncpy(uri,(char *) data, (size_t) length);
+
+					lib3270_autoptr(char) unescaped = lib3270_unescape(uri);
+					lib3270_string_array_append(uris,unescaped);
+				}
 			}
@@ -186,6 +186,10 @@ static int openssl_network_getsockname(const H3270 *hSession, struct sockaddr *a
 	return getsockname(hSession->network.context->sock, addr, addrlen);
 }
+static int openssl_network_getpeername(const H3270 *hSession, struct sockaddr *addr, socklen_t *addrlen) {
+	return getpeername(hSession->network.context->sock, addr, addrlen);
+}
+
 static void * openssl_network_add_poll(H3270 *hSession, LIB3270_IO_FLAG flag, void(*call)(H3270 *, int, LIB3270_IO_FLAG, void *), void *userdata) {
 	return lib3270_add_poll_fd(hSession,hSession->network.context->sock,flag,call,userdata);
 }
@@ -346,6 +350,7 @@ void lib3270_set_libssl_network_module(H3270 *hSession) {
 		.non_blocking = openssl_network_non_blocking,
 		.is_connected = openssl_network_is_connected,
 		.getsockname = openssl_network_getsockname,
+		.getpeername = openssl_network_getpeername,
 		.setsockopt = openssl_network_setsockopt,
 		.getsockopt = openssl_network_getsockopt,
 		.getcert = openssl_network_getcert,
@@ -34,6 +34,7 @@
  #include "private.h"
  #include <lib3270/properties.h>
+ #include <utilc.h>
  static int import_crl(H3270 *hSession, SSL_CTX * ssl_ctx, LIB3270_NET_CONTEXT * context, const char *url) {
@@ -103,25 +104,26 @@
 	if(X509_STORE_add_crl(store, x509_crl)) {
 		trace_ssl(hSession,"CRL was added to context cert store\n");
-	} else {
-		trace_ssl(hSession,"CRL was not added to context cert store\n");
+		return 0;
 	}
-	return 0;
+	trace_ssl(hSession,"CRL was not added to context cert store\n");
+
+	return -1;
  }
- static void download_crl_from_peer(H3270 *hSession, SSL_CTX * ctx_context, LIB3270_NET_CONTEXT * context, X509 *peer) {
+ static int download_crl_from_peer(H3270 *hSession, SSL_CTX * ctx_context, LIB3270_NET_CONTEXT * context, X509 *peer) {
 	debug("%s peer=%p",__FUNCTION__,(void *) peer);
 	if(!peer)
-		return;
+		return -1;
 	lib3270_autoptr(LIB3270_STRING_ARRAY) uris = lib3270_openssl_get_crls_from_peer(hSession, peer);
 	if(!uris) {
 		trace_ssl(hSession,"Can't get distpoints from peer certificate\n");
-		return;
+		return -1;
 	}
 	size_t ix;
@@ -134,11 +136,11 @@
 			if(!import_crl(hSession,ctx_context,context,uris->str[ix])) {
 				trace_ssl(hSession,"Got CRL from %s\n",uris->str[ix]);
-				return;
+				return 0;
 			}
 		}
-		return;
+		return -1;
 	}
@@ -152,10 +154,9 @@
 		if(strncasecmp(prefer,uris->str[ix],length))
 			continue;
-		debug("Trying %s",uris->str[ix]);
 		if(!import_crl(hSession,ctx_context,context,uris->str[ix])) {
 			trace_ssl(hSession,"Got CRL from %s\n",uris->str[ix]);
-			return;
+			return 0;
 		}
 	}
@@ -168,13 +169,34 @@
 		if(!import_crl(hSession,ctx_context,context,uris->str[ix])) {
 			trace_ssl(hSession,"Got CRL from %s\n",uris->str[ix]);
-			return;
+			return 0;
 		}
 	}
+	return -1;
+
  }
+int x509_store_ctx_error_callback(int ok, X509_STORE_CTX GNUC_UNUSED(*ctx))
+{
+	debug("%s(%d)",__FUNCTION__,ok);
+
+/*
+  55     {
+  56         if (!ok) {
+  57             Category::getInstance("OpenSSL").error(
+  58                 "path validation failure at depth(%d): %s",
+  59                 X509_STORE_CTX_get_error_depth(ctx),
+  60                 X509_verify_cert_error_string(X509_STORE_CTX_get_error(ctx))
+  61                 );
+  62         }
+  63         return ok;
+  64     }
+*/
+	return ok;
+}
+
  int openssl_network_start_tls(H3270 *hSession) {
 	SSL_CTX * ctx_context = (SSL_CTX *) lib3270_openssl_get_context(hSession);
@@ -199,7 +221,8 @@
 	SSL_set_ex_data(context->con,lib3270_openssl_get_ex_index(hSession),(char *) hSession);
 //	SSL_set_verify(context->con, SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
-	SSL_set_verify(context->con, 0, NULL);
+//	SSL_set_verify(context->con, SSL_VERIFY_PEER, NULL);
+	SSL_set_verify(context->con, SSL_VERIFY_NONE, NULL);
 	if(SSL_set_fd(context->con, context->sock) != 1)
 	{
@@ -295,13 +318,40 @@
 		// CRL download is enabled and verification has failed; look for CRL file.
+
 		trace_ssl(hSession,"CRL Validation has failed, requesting CRL download\n");
 		set_ssl_state(hSession,LIB3270_SSL_VERIFYING);
+		int rc_download = -1;
+
 		if(context->crl.url) {
-			import_crl(hSession, ctx_context,context,context->crl.url);
+			rc_download = import_crl(hSession, ctx_context,context,context->crl.url);
 		} else {
-			download_crl_from_peer(hSession, ctx_context, context, peer);
+			rc_download = download_crl_from_peer(hSession, ctx_context, context, peer);
+		}
+
+		debug("Download rc=%d",rc_download);
+
+		if(!rc_download)
+		{
+			// Got CRL, verify it!
+			// Reference: https://stackoverflow.com/questions/10510850/how-to-verify-the-certificate-for-the-ongoing-ssl-session
+
+			X509_STORE_CTX *csc = X509_STORE_CTX_new();
+			X509_STORE_CTX_set_verify_cb(csc, x509_store_ctx_error_callback);
+			X509_STORE_CTX_init(csc, SSL_CTX_get_cert_store(ctx_context), peer, NULL);
+
+			if(X509_verify_cert(csc) != 1)
+				rv = X509_STORE_CTX_get_error(csc);
+			else
+				rv = X509_V_OK;
+
+			trace_ssl(hSession, "X509_verify_cert error code was %d\n", rv);
+
+			SSL_set_verify_result(context->con, rv);
+
+			X509_STORE_CTX_free(csc);
+
 		}
 	}
@@ -313,6 +363,7 @@
 	// Get validation message.
 	hSession->ssl.message = lib3270_openssl_message_from_id(verify_result);
+	debug("Verify message: %s",hSession->ssl.message->summary);
 	// Trace cypher
 	if(lib3270_get_toggle(hSession,LIB3270_TOGGLE_SSL_TRACE))
@@ -331,7 +382,7 @@
 	// Check results.
 	if(hSession->ssl.message)
-		trace_ssl(hSession,"%s",hSession->ssl.message->summary);
+		trace_ssl(hSession,"%s\n",hSession->ssl.message->summary);
 	else
 		trace_ssl(hSession,"TLS/SSL verify result was %ld\n", verify_result);
@@ -263,3 +263,16 @@ int lib3270_socket_set_non_blocking(H3270 *hSession, int sock, const unsigned ch
     return EINVAL;
  }
+
+ LIB3270_EXPORT int lib3270_getpeername(H3270 *hSession, struct sockaddr *addr, socklen_t *addrlen)
+ {
+   FAIL_IF_NOT_ONLINE(hSession);
+	return hSession->network.module->getpeername(hSession, addr, addrlen);
+ }
+
+ LIB3270_EXPORT int lib3270_getsockname(H3270 *hSession, struct sockaddr *addr, socklen_t *addrlen)
+ {
+    FAIL_IF_NOT_ONLINE(hSession);
+	return hSession->network.module->getsockname(hSession, addr, addrlen);
+ }
+
	@@ -48,7 +48,7 @@		@@ -48,7 +48,7 @@
48		48
49	static int connect_host(H3270 *hSession)	49	static int connect_host(H3270 *hSession)
50	{	50	{
51	- return lib3270_reconnect(hSession,0);	51	+ return hSession->cbk.reconnect(hSession,0);
52	}	52	}
53		53
54	static int select_up(H3270 *hSession)	54	static int select_up(H3270 *hSession)
	@@ -59,7 +59,7 @@		@@ -59,7 +59,7 @@
59	#include "screenc.h"	59	#include "screenc.h"
60	#include "telnetc.h"	60	#include "telnetc.h"
61	#include "trace_dsc.h"	61	#include "trace_dsc.h"
62	-#include "utf8c.h"	62	+//#include "utf8c.h"
63	#if defined(X3270_DBCS) /[/	63	#if defined(X3270_DBCS) /[/
64	#include "widec.h"	64	#include "widec.h"
65	#endif /]/	65	#endif /]/
	@@ -49,36 +49,10 @@		@@ -49,36 +49,10 @@
49	lib3270_set_url(hSession,url);	49	lib3270_set_url(hSession,url);
50	}	50	}
51		51
52	- return lib3270_reconnect(hSession, seconds);	52	+ return hSession->cbk.reconnect(hSession, seconds);
53		53
54	}	54	}
55		55
56	-/*
57	- void connection_failed(H3270 hSession, const char message)
58	- {
59	- lib3270_disconnect(hSession);
60	-
61	- lib3270_autoptr(char) summary = lib3270_strdup_printf(
62	- _( "Can't connect to %s:%s"),
63	- hSession->host.current,
64	- hSession->host.srvc
65	- );
66	-
67	- LIB3270_POPUP popup = {
68	- .name = "CantConnect",
69	-// .title = _( "Connection failed" ),
70	- .type = LIB3270_NOTIFY_INFO,
71	- .summary = summary,
72	- .body = message,
73	- .label = _("Try again")
74	- };
75	-
76	- if(hSession->cbk.popup(hSession,&popup,!hSession->auto_reconnect_inprogress) == 0)
77	- lib3270_activate_auto_reconnect(hSession,1000);
78	-
79	- }
80	-*/
81	-
82	int lib3270_allow_reconnect(const H3270 *hSession)	56	int lib3270_allow_reconnect(const H3270 *hSession)
83	{	57	{
84	//	58	//
	@@ -103,7 +77,8 @@		@@ -103,7 +77,8 @@
103	// Do I have a defined host?	77	// Do I have a defined host?
104	if(!(hSession->host.current && hSession->host.srvc && hSession->host.current && hSession->host.srvc))	78	if(!(hSession->host.current && hSession->host.srvc && hSession->host.current && hSession->host.srvc))
105	{	79	{
106	- errno = EINVAL;	80	+ debug("%s('%s')",__FUNCTION__,hSession->host.url);
		81	+ errno = ENODATA;
107	return 0;	82	return 0;
108	}	83	}
109		84
	@@ -46,7 +46,7 @@		@@ -46,7 +46,7 @@
46	#include <stdlib.h>	46	#include <stdlib.h>
47	#include "3270ds.h"	47	#include "3270ds.h"
48	#include "screen.h"	48	#include "screen.h"
49	-#include "resources.h"	49	+//#include "resources.h"
50		50
51	#include "ctlrc.h"	51	#include "ctlrc.h"
52	#include "ftc.h"	52	#include "ftc.h"
	@@ -205,7 +205,7 @@ void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr)		@@ -205,7 +205,7 @@ void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr)
205	// popup_an_error(session,"Invalid %s %dx%d:\nToo big",ResOversize, ovc, ovr);	205	// popup_an_error(session,"Invalid %s %dx%d:\nToo big",ResOversize, ovc, ovr);
206		206
207	}	207	}
208	- else if (ovc > 0 && ovc < session->max.cols)	208	+ else if (ovc < session->max.cols)
209	{	209	{
210		210
211	lib3270_popup_dialog(	211	lib3270_popup_dialog(
	@@ -219,7 +219,7 @@ void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr)		@@ -219,7 +219,7 @@ void ctlr_set_rows_cols(H3270 *session, int mn, int ovc, int ovr)
219		219
220	// popup_an_error(session,"Invalid %s cols (%d):\nLess than model %d cols (%d)",ResOversize, ovc, session->model_num, session->maxCOLS);	220	// popup_an_error(session,"Invalid %s cols (%d):\nLess than model %d cols (%d)",ResOversize, ovc, session->model_num, session->maxCOLS);
221	}	221	}
222	- else if (ovr > 0 && ovr < session->max.rows)	222	+ else if (ovr < session->max.rows)
223	{	223	{
224		224
225	lib3270_popup_dialog(	225	lib3270_popup_dialog(
	@@ -43,7 +43,7 @@		@@ -43,7 +43,7 @@
43		43
44	#include <internals.h>	44	#include <internals.h>
45	#include <stdlib.h>	45	#include <stdlib.h>
46	-#include "resources.h"	46	+//#include "resources.h"
47		47
48	#include "hostc.h"	48	#include "hostc.h"
49	#include "statusc.h"	49	#include "statusc.h"
	@@ -74,7 +74,7 @@ static int check_for_auto_reconnect(H3270 hSession, void GNUC_UNUSED(userdata)		@@ -74,7 +74,7 @@ static int check_for_auto_reconnect(H3270 hSession, void GNUC_UNUSED(userdata)
74	{	74	{
75	lib3270_write_log(hSession,"3270","Starting auto-reconnect on %s",lib3270_get_url(hSession));	75	lib3270_write_log(hSession,"3270","Starting auto-reconnect on %s",lib3270_get_url(hSession));
76	hSession->auto_reconnect_inprogress = 0; // Reset "in-progress" to allow reconnection.	76	hSession->auto_reconnect_inprogress = 0; // Reset "in-progress" to allow reconnection.
77	- if(lib3270_reconnect(hSession,0))	77	+ if(hSession->cbk.reconnect(hSession,0))
78	lib3270_write_log(hSession,"3270","Auto-reconnect fails: %s",strerror(errno));	78	lib3270_write_log(hSession,"3270","Auto-reconnect fails: %s",strerror(errno));
79	}	79	}
80		80
	@@ -57,7 +57,7 @@ struct ta;		@@ -57,7 +57,7 @@ struct ta;
57		57
58	#include <fcntl.h>	58	#include <fcntl.h>
59	#include "3270ds.h"	59	#include "3270ds.h"
60	-#include "resources.h"	60	+//#include "resources.h"
61		61
62	#include "ansic.h"	62	#include "ansic.h"
63	#include "ctlrc.h"	63	#include "ctlrc.h"
	@@ -71,7 +71,7 @@ struct ta;		@@ -71,7 +71,7 @@ struct ta;
71	#include "telnetc.h"	71	#include "telnetc.h"
72	#include "togglesc.h"	72	#include "togglesc.h"
73	#include "trace_dsc.h"	73	#include "trace_dsc.h"
74	-#include "utf8c.h"	74	+//#include "utf8c.h"
75	#include "utilc.h"	75	#include "utilc.h"
76	#if defined(X3270_DBCS) /[/	76	#if defined(X3270_DBCS) /[/
77	#include "widec.h"	77	#include "widec.h"
	@@ -44,7 +44,7 @@		@@ -44,7 +44,7 @@
44	#include <fcntl.h>	44	#include <fcntl.h>
45		45
46	#include "3270ds.h"	46	#include "3270ds.h"
47	-#include "resources.h"	47	+//#include "resources.h"
48		48
49	//#include "actionsc.h"	49	//#include "actionsc.h"
50	#include "ansic.h"	50	#include "ansic.h"
	@@ -69,7 +69,7 @@		@@ -69,7 +69,7 @@
69	#include "telnetc.h"	69	#include "telnetc.h"
70	#include "togglesc.h"	70	#include "togglesc.h"
71	#include "trace_dsc.h"	71	#include "trace_dsc.h"
72	-#include "utf8c.h"	72	+//#include "utf8c.h"
73	#include "utilc.h"	73	#include "utilc.h"
74	#if defined(X3270_DBCS) /[/	74	#if defined(X3270_DBCS) /[/
75	#include "widec.h"	75	#include "widec.h"
	@@ -58,7 +58,7 @@		@@ -58,7 +58,7 @@
58	#include "3270ds.h"	58	#include "3270ds.h"
59	#include "appres.h"	59	#include "appres.h"
60	#include "objects.h"	60	#include "objects.h"
61	-#include "resources.h"	61	+//#include "resources.h"
62		62
63	#include "charsetc.h"	63	#include "charsetc.h"
64	#include "ctlrc.h"	64	#include "ctlrc.h"
	@@ -198,3 +198,8 @@ int lib3270_set_uint_property(H3270 hSession, const char name, unsigned int va		@@ -198,3 +198,8 @@ int lib3270_set_uint_property(H3270 hSession, const char name, unsigned int va
198		198
199	}	199	}
200		200
		201	+LIB3270_EXPORT unsigned int lib3270_get_task_count(const H3270 *h)
		202	+{
		203	+ return h->tasks;
		204	+}
		205	+
	@@ -37,7 +37,7 @@		@@ -37,7 +37,7 @@
37	#include <internals.h>	37	#include <internals.h>
38	#include <signal.h>	38	#include <signal.h>
39	#include "3270ds.h"	39	#include "3270ds.h"
40	-#include "resources.h"	40	+//#include "resources.h"
41	#include "ctlrc.h"	41	#include "ctlrc.h"
42	#include "hostc.h"	42	#include "hostc.h"
43	#include "kybdc.h"	43	#include "kybdc.h"