diff --git a/.gitignore b/.gitignore index 65cc81b..ff19fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ certs confdefs.h conftest.* mstest.* +*.cscope_file_list diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 1731f17..812be8a 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-04 14:53-0300\n" +"POT-Creation-Date: 2020-07-09 20:22-0300\n" "PO-Revision-Date: 2020-05-08 00:52-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" @@ -265,8 +265,8 @@ msgstr "Não foi possível criar requisição HTTP" msgid "Can't decode CRL" msgstr "Não foi possível decodificar arquivo CRL" -#: src/ssl/windows/ldap.c:259 src/ssl/windows/http.c:74 -#: src/ssl/windows/curl.c:264 +#: src/ssl/windows/curl.c:264 src/ssl/windows/http.c:74 +#: src/ssl/windows/ldap.c:259 msgid "Can't decode certificate revocation list" msgstr "Não foi possível decodificar a lista de certificados revogados" @@ -371,7 +371,7 @@ msgstr "Não foi possível iniciar transferência de arquivo." msgid "Can't use winsock version %d.%d" msgstr "Não posso usar versão winsock %d.%d" -#: src/ssl/negotiate.c:370 src/ssl/crl.c:165 +#: src/ssl/crl.c:165 src/ssl/negotiate.c:370 msgid "Can't verify." msgstr "Não foi possível verificar" @@ -637,12 +637,12 @@ msgstr "Apagar campos" msgid "Error" msgstr "Erro" -#: src/core/ft/ft_dft.c:454 src/core/ft/ft_cut.c:423 +#: src/core/ft/ft_cut.c:423 src/core/ft/ft_dft.c:454 #, c-format msgid "Error \"%s\" reading from local file (rc=%d)" msgstr "Erro \"%s\" lendo arquivo local (rc=%d)" -#: src/core/ft/ft_dft.c:332 src/core/ft/ft_cut.c:528 +#: src/core/ft/ft_cut.c:528 src/core/ft/ft_dft.c:332 #, c-format msgid "Error \"%s\" writing to local file (rc=%d)" msgstr "Erro \"%s\" gravando arquivo local (rc=%d)" @@ -1006,8 +1006,8 @@ msgstr "Move o cursor para o primeiro branco após o último não branco no camp msgid "Move to first unprotected field on screen" msgstr "Move para o primeiro campo desprotegido" -#: src/core/telnet.c:320 src/core/windows/event_dispatcher.c:149 -#: src/core/windows/connect.c:78 +#: src/core/telnet.c:320 src/core/windows/connect.c:78 +#: src/core/windows/event_dispatcher.c:149 msgid "Network error" msgstr "Erro de rede" @@ -1282,22 +1282,22 @@ msgstr "Pesquisa não produziu nenhum valor" msgid "Secure connection was successful." msgstr "Conexão segura efetuada com sucesso." -#: src/ssl/negotiate.c:107 src/ssl/negotiate.c:241 src/ssl/negotiate.c:275 -#: src/ssl/negotiate.c:369 src/ssl/negotiate.c:391 src/ssl/negotiate.c:412 -#: src/ssl/crl.c:164 src/ssl/windows/ldap.c:108 src/ssl/windows/ldap.c:122 -#: src/ssl/windows/ldap.c:151 src/ssl/windows/ldap.c:165 -#: src/ssl/windows/ldap.c:180 src/ssl/windows/ldap.c:210 -#: src/ssl/windows/ldap.c:222 src/ssl/windows/ldap.c:234 -#: src/ssl/windows/ldap.c:258 src/ssl/windows/init.c:91 -#: src/ssl/windows/init.c:112 src/ssl/windows/init.c:138 -#: src/ssl/windows/init.c:149 src/ssl/windows/http.c:57 -#: src/ssl/windows/http.c:73 src/ssl/windows/getcrl.c:57 -#: src/ssl/windows/getcrl.c:74 src/ssl/windows/getcrl.c:86 -#: src/ssl/windows/getcrl.c:118 src/ssl/windows/curl.c:188 +#: src/ssl/crl.c:164 src/ssl/negotiate.c:107 src/ssl/negotiate.c:241 +#: src/ssl/negotiate.c:275 src/ssl/negotiate.c:369 src/ssl/negotiate.c:391 +#: src/ssl/negotiate.c:412 src/ssl/windows/curl.c:188 #: src/ssl/windows/curl.c:218 src/ssl/windows/curl.c:242 #: src/ssl/windows/curl.c:263 src/ssl/windows/curl.c:272 #: src/ssl/windows/curl.c:300 src/ssl/windows/curl.c:333 -#: src/ssl/windows/curl.c:369 +#: src/ssl/windows/curl.c:369 src/ssl/windows/getcrl.c:57 +#: src/ssl/windows/getcrl.c:74 src/ssl/windows/getcrl.c:86 +#: src/ssl/windows/getcrl.c:118 src/ssl/windows/http.c:57 +#: src/ssl/windows/http.c:73 src/ssl/windows/init.c:91 +#: src/ssl/windows/init.c:112 src/ssl/windows/init.c:138 +#: src/ssl/windows/init.c:149 src/ssl/windows/ldap.c:108 +#: src/ssl/windows/ldap.c:122 src/ssl/windows/ldap.c:151 +#: src/ssl/windows/ldap.c:165 src/ssl/windows/ldap.c:180 +#: src/ssl/windows/ldap.c:210 src/ssl/windows/ldap.c:222 +#: src/ssl/windows/ldap.c:234 src/ssl/windows/ldap.c:258 msgid "Security error" msgstr "Erro de segurança" @@ -1781,8 +1781,8 @@ msgstr "Mostrar posição do cursor" msgid "Transfer cancelled by host" msgstr "Transferência cancelada pelo host" -#: src/core/ft/ft_dft.c:230 src/core/ft/ft_dft.c:373 src/core/ft/ft_cut.c:400 -#: src/core/ft/ft_cut.c:495 +#: src/core/ft/ft_cut.c:400 src/core/ft/ft_cut.c:495 src/core/ft/ft_dft.c:230 +#: src/core/ft/ft_dft.c:373 msgid "Transfer cancelled by user" msgstr "Transferência cancelada pelo usuário" diff --git a/src/core/connect.c b/src/core/connect.c index 1c54d5c..664acdb 100644 --- a/src/core/connect.c +++ b/src/core/connect.c @@ -115,6 +115,10 @@ } #if defined(HAVE_LIBSSL) + debug("%s: TLS/SSL is %s",__FUNCTION__,hSession->ssl.enabled ? "ENABLED" : "DISABLED") + trace_dsn(hSession,"TLS/SSL is %s\n", hSession->ssl.enabled ? "enabled" : "disabled" ); + + if(hSession->ssl.enabled) { SSL_ERROR_MESSAGE ssl_error; memset(&ssl_error,0,sizeof(ssl_error)); diff --git a/src/core/iocalls.c b/src/core/iocalls.c index 03e0a71..1138ca9 100644 --- a/src/core/iocalls.c +++ b/src/core/iocalls.c @@ -575,6 +575,8 @@ int non_blocking(H3270 *hSession, Boolean on) #endif + debug("Socket %d is now %s",hSession->connection.sock,(on ? "Non Blocking" : "Blocking")); + lib3270_set_poll_state(hSession,hSession->xio.read, on); lib3270_set_poll_state(hSession,hSession->xio.write, on); lib3270_set_poll_state(hSession,hSession->xio.except, on); diff --git a/src/core/linux/connect.c b/src/core/linux/connect.c index c8d6478..162165d 100644 --- a/src/core/linux/connect.c +++ b/src/core/linux/connect.c @@ -196,8 +196,6 @@ static void net_connected(H3270 *hSession, int GNUC_UNUSED(fd), LIB3270_IO_FLAG hSession->ever_3270 = False; #if defined(HAVE_LIBSSL) - debug("%s: TLS/SSL is %s",__FUNCTION__,hSession->ssl.enabled ? "ENABLED" : "DISABLED") - trace_dsn(hSession,"TLS/SSL is %s\n", hSession->ssl.enabled ? "enabled" : "disabled" ); if(hSession->ssl.enabled) { hSession->ssl.host = 1; diff --git a/src/core/telnet.c b/src/core/telnet.c index 1dcf259..5b8da4f 100644 --- a/src/core/telnet.c +++ b/src/core/telnet.c @@ -482,6 +482,9 @@ LIB3270_EXPORT void lib3270_setup_session(H3270 *hSession) trace_ds(hSession,"SENT HOSTNAME %s:%d\n", hSession->hostname, hSession->current_port); } */ + + non_blocking(hSession,True); + } /** diff --git a/src/core/windows/connect.c b/src/core/windows/connect.c index 427b8d8..7c018a5 100644 --- a/src/core/windows/connect.c +++ b/src/core/windows/connect.c @@ -190,19 +190,22 @@ static void sockstart(H3270 *session) for(rp = result; hSession->connection.sock < 0 && rp != NULL; rp = rp->ai_next) { hSession->connection.sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if(hSession->connection.sock < 0) { ((struct resolver *) host)->rc = errno; ((struct resolver *) host)->message = strerror(errno); + debug("Socket error %d: %s",((struct resolver *) host)->rc,((struct resolver *) host)->message); continue; } // Connected! if(connect(hSession->connection.sock, rp->ai_addr, rp->ai_addrlen)) { - SOCK_CLOSE(hSession); ((struct resolver *) host)->rc = errno; ((struct resolver *) host)->message = strerror(errno); + debug("Connection error %d: %s",((struct resolver *) host)->rc,((struct resolver *) host)->message); + SOCK_CLOSE(hSession); continue; } @@ -210,6 +213,8 @@ static void sockstart(H3270 *session) freeaddrinfo(result); + debug("%s: Connected using socket %d",__FUNCTION__,hSession->connection.sock); + return 0; } @@ -314,6 +319,7 @@ int net_reconnect(H3270 *hSession, int seconds) if(hSession->ssl.enabled) { + debug("%s: Enabling SSL ****************************",__FUNCTION__); hSession->ssl.host = 1; if(ssl_init(hSession)) return errno = ENOTCONN; diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index c147c99..abb9d2b 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -36,6 +36,10 @@ static void online_group_state_changed(H3270 GNUC_UNUSED(*hSession), void GNUC_U int main(int argc, char *argv[]) { +#ifdef _WIN32 + printf("Process %s running on pid %u\n",argv[0],(unsigned int) GetCurrentProcessId()); +#endif // _WIN32 + #ifdef LC_ALL setlocale( LC_ALL, "" ); #endif -- libgit2 0.21.2