diff --git a/po/pt_BR.po b/po/pt_BR.po index afb8fec..28aac55 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-11 15:41-0200\n" -"PO-Revision-Date: 2013-12-11 15:45-0200\n" +"POT-Creation-Date: 2013-12-12 07:39-0200\n" +"PO-Revision-Date: 2013-12-12 07:39-0200\n" "Last-Translator: Perry Werneck \n" "Language-Team: Portugues <>\n" "Language: pt_BR\n" @@ -19,8 +19,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.6\n" -#: telnet.c:1054 ssl.c:257 ssl.c:310 connect.c:91 connect.c:107 connect.c:109 -#: connect.c:600 connect.c:617 +#: telnet.c:1050 ssl.c:257 ssl.c:310 connect.c:91 connect.c:107 connect.c:109 +#: connect.c:562 connect.c:579 #, c-format msgid "%s" msgstr "%s" @@ -85,11 +85,6 @@ msgstr "%s: Caractere desconhecido depois de \\pf" msgid "%s: Vertical tab not supported" msgstr "%s: Tabulação vertical não é suportada" -#: resolver.c:122 -#, c-format -msgid "%s: unknown family %d" -msgstr "%s: Familia %d é inválida" - #: main.c:419 msgid "- 3270 Emulator for Gtk" msgstr "- Emulador 3270 para GTK" @@ -209,7 +204,7 @@ msgstr "Sobre a segurança" #: ft.c:98 msgid "Ack received, data flowing" -msgstr "Ack received, data flowing" +msgstr "Confirmação recebida, transferindo dados" #: paste.c:300 msgid "Action failed" @@ -267,13 +262,13 @@ msgstr "Avblock" #: ft.c:99 msgid "Awaiting chance to send an abort" -msgstr "Awaiting chance to send an abort" +msgstr "Aguardando para enviar pedido de cancelamento" #: colors.c:435 msgid "Background" msgstr "Fundo" -#: connect.c:173 +#: connect.c:168 msgid "Bad winsock version" msgstr "Versão winsock inválida" @@ -309,7 +304,7 @@ msgstr "Portal do Software Público Brasileiro" msgid "Break" msgstr "Break" -#: telnet.c:2018 +#: telnet.c:2014 msgid "Broken pipe" msgstr "Conexão interrompida" @@ -343,26 +338,26 @@ msgstr "C_odificação de caracteres:" msgid "C_olor scheme:" msgstr "Tema de c_ores:" -#: v3270/hostselect.c:389 +#: v3270/hostselect.c:390 msgid "C_onnect" msgstr "_Conectar" -#: toggles.c:177 connect.c:387 connect.c:482 +#: toggles.c:177 connect.c:354 connect.c:449 #, c-format msgid "Can't %s network keep-alive" -msgstr "Can't %s network keep-alive" +msgstr "Não foi possível %s opção \"keep-alive\"" #: uiparser/parsefile.c:225 #, c-format msgid "Can't accept unnamed %s" msgstr "Não posso aceitar elemento %s sem nome" -#: connect.c:99 connect.c:418 +#: connect.c:99 connect.c:385 #, c-format msgid "Can't connect to %s" msgstr "Não foi possível conectar a %s" -#: connect.c:271 connect.c:452 +#: connect.c:266 connect.c:419 #, c-format msgid "Can't connect to %s:%s" msgstr "Não foi possível conectar a %s:%s" @@ -376,7 +371,7 @@ msgstr "Não foi possível converter a linha %d de %s para %s" msgid "Can't cut rectangular regions" msgstr "Recortar não permitido em seleção retangular" -#: connect.c:199 +#: connect.c:194 #, c-format msgid "Can't determine value for environment variable \"%s\" " msgstr "Can't determine value for environment variable \"%s\" " @@ -460,15 +455,15 @@ msgstr "Não foi possível salvar trace no arquivo %s" msgid "Can't set host charset" msgstr "Não foi possível definir o charset do host" -#: v3270/iocallback.c:359 +#: v3270/iocallback.c:353 msgid "Can't set lib3270 I/O handlers" msgstr "Não foi possível registrar manipuladores de I/O 3270" -#: connect.c:616 +#: connect.c:578 msgid "Can't set socket to blocking mode." msgstr "Não foi possível mudar o socket para o modo blocante." -#: connect.c:616 +#: connect.c:578 msgid "Can't set socket to non blocking mode" msgstr "Não foi possível setar o socket para o modo não blocante." @@ -484,16 +479,16 @@ msgstr "Não foi possível iniciar transferência de arquivo." msgid "Can't start upload." msgstr "Não foi possível iniciar upload." -#: connect.c:174 +#: connect.c:169 #, c-format msgid "Can't use winsock version %d.%d" msgstr "Não é possível usar a Winsock versão %d.%d" -#: ft/ftdialog.c:408 +#: ft/ftdialog.c:399 msgid "Cancel download." msgstr "Cancelar recebimento." -#: ft/ftdialog.c:408 +#: ft/ftdialog.c:399 msgid "Cancel upload." msgstr "Cancelar envio." @@ -501,10 +496,6 @@ msgstr "Cancelar envio." msgid "Cancelled by user" msgstr "Cancelado pelo usuário" -#: connect.c:363 -msgid "Cannot create socket event" -msgstr "Não foi possível criar um semáforo para comunicação" - #: ssl.c:309 msgid "Cant create a new SSL structure for current connection." msgstr "Cant create a new SSL structure for current connection." @@ -523,8 +514,8 @@ msgid "" "Cant set the file descriptor for the input/output facility for the TLS/SSL " "(encrypted) side of ssl." msgstr "" -"Cant set the file descriptor for the input/output facility for the TLS/SSL " -"(encrypted) side of ssl." +"Não foi possível definir o descritor de arquivo para a conexão TLS/SSL " +"(encriptada)." #: v3270/security.c:110 msgid "Certificate has expired" @@ -582,13 +573,17 @@ msgstr "Cores" msgid "Command:" msgstr "Command:" +#: v3270/hostselect.c:386 ui/00default.xml:282 +msgid "Configure host" +msgstr "Configurar host" + #: ui/00default.xml:307 msgid "Connect on startup" msgstr "Conectar ao iniciar" -#: connect.c:197 connect.c:292 connect.c:301 connect.c:391 connect.c:406 -#: connect.c:422 connect.c:436 connect.c:456 connect.c:470 connect.c:486 -#: connect.c:585 +#: connect.c:192 connect.c:287 connect.c:296 connect.c:358 connect.c:373 +#: connect.c:389 connect.c:403 connect.c:423 connect.c:437 connect.c:453 +#: connect.c:547 msgid "Connection error" msgstr "Erro de conexão" @@ -596,7 +591,7 @@ msgstr "Erro de conexão" msgid "Connection failed" msgstr "Conexão falhou" -#: telnet.c:2022 +#: telnet.c:2018 msgid "Connection reset by peer" msgstr "Conexão foi cancelada pelo servidor" @@ -686,7 +681,7 @@ msgstr "Padrão" msgid "Delete field" msgstr "Apagar campo" -#: telnet.c:1693 +#: telnet.c:1689 msgid "Device type rejected" msgstr "Tipo de dispositivo rejeitado" @@ -698,7 +693,7 @@ msgstr "Desconectado do servidor." msgid "Display current charset" msgstr "Mostrar a tabela de caracteres ativa" -#: telnet.c:1245 +#: telnet.c:1241 msgid "EOR received when not in 3270 mode, ignored." msgstr "EOR recebido fora do modo 3270, ignorado." @@ -748,21 +743,11 @@ msgstr "Erro \"%s\" lendo arquivo local (rc=%d)" msgid "Error \"%s\" writing to local file (rc=%d)" msgstr "Erro \"%s\" gravando arquivo local (rc=%d)" -#: resolver.c:106 -#, c-format -msgid "Error %d resolving %s" -msgstr "Erro %d resolvendo %s" - #: dialog.c:377 #, c-format msgid "Error loading %s" msgstr "Erro lendo %s" -#: resolver.c:108 -#, c-format -msgid "Error resolving %s: %s" -msgstr "Erro ao resolver %s: %s" - #: ui/98trace.xml:494 msgid "Event Trace" msgstr "Trace de eventos" @@ -843,15 +828,15 @@ msgstr "Ajuda" msgid "Host disconnected, transfer cancelled" msgstr "Servidor desconectou, transferência cancelada" -#: telnet.c:1751 +#: telnet.c:1747 msgid "Host illegally added function(s)" msgstr "Host illegally added function(s)" -#: telnet.c:1676 +#: telnet.c:1672 msgid "Host rejected device type or request type" msgstr "Servidor rejeitou o tipo de dispositivo ou requisição" -#: telnet.c:1689 +#: telnet.c:1685 msgid "Host rejected resource(s)" msgstr "Servidor rejeitou recurso(s)" @@ -964,7 +949,7 @@ msgstr "Nome do arquivo destino." msgid "Network Trace" msgstr "Trace do tráfego de rede" -#: telnet.c:344 iocalls.c:428 iocalls.c:520 connect.c:86 +#: telnet.c:344 iocalls.c:408 iocalls.c:551 connect.c:86 msgid "Network error" msgstr "Erro de rede" @@ -972,7 +957,7 @@ msgstr "Erro de rede" msgid "Network keep alive" msgstr "Network keep alive" -#: connect.c:161 connect.c:172 connect.c:362 connect.c:373 +#: connect.c:156 connect.c:167 msgid "Network startup error" msgstr "Erro ao iniciar a rede" @@ -1207,7 +1192,7 @@ msgstr "Rosa" #: v3270/hostselect.c:163 msgid "Port or service name (empty for \"telnet\")." -msgstr "Port or service name (empty for \"telnet\")." +msgstr "Nº da porta ou nome do serviço (em branco para \"telnet\")." #: ui/00default.xml:379 msgid "Previous field" @@ -1410,15 +1395,15 @@ msgstr "Return" msgid "SSL Connect failed" msgstr "Conexão SSL falhou" -#: telnet.c:1037 +#: telnet.c:1033 msgid "SSL Error" msgstr "Erro SSL" -#: telnet.c:1037 +#: telnet.c:1033 msgid "SSL Read error" msgstr "Erro de leitura SSL" -#: connect.c:329 +#: connect.c:324 msgid "SSL error" msgstr "Erro SSL" @@ -1430,7 +1415,7 @@ msgstr "Negociação SSL falhou" msgid "SSL_CTX_new() has failed" msgstr "SSL_CTX_new() has failed" -#: telnet.c:2008 +#: telnet.c:2004 #, c-format msgid "" "SSL_write:\n" @@ -1527,11 +1512,7 @@ msgstr "Selecione arquivo a enviar" msgid "Select font" msgstr "Selecione fonte" -#: v3270/hostselect.c:386 -msgid "Select hostname" -msgstr "Selecione host" - -#: iocalls.c:521 +#: iocalls.c:409 iocalls.c:552 msgid "Select() failed when processing for events." msgstr "Select() falhou ao processar eventos." @@ -1579,10 +1560,6 @@ msgstr "Nome da sessão" msgid "Set host charset" msgstr "Define página de código do host" -#: ui/00default.xml:282 -msgid "Set hostname" -msgstr "Selecione servidor" - #: main.c:404 msgid "Set reported colors (8/16)" msgstr "Define número de cores informadas (8/16)" @@ -1615,15 +1592,15 @@ msgstr "Mostrar padrão de teste" msgid "Smart paste" msgstr "Colar inteligente" -#: connect.c:598 connect.c:615 +#: connect.c:560 connect.c:577 msgid "Socket error" msgstr "Erro no socket" -#: telnet.c:1058 +#: telnet.c:1054 msgid "Socket read error" msgstr "Erro ao ler dados da rede" -#: telnet.c:2029 +#: telnet.c:2025 msgid "Socket write error" msgstr "Erro ao enviar dados para a rede" @@ -1669,11 +1646,11 @@ msgstr "" msgid "Speed" msgstr "Velocidade" -#: ft/ftdialog.c:404 +#: ft/ftdialog.c:408 msgid "Start download." msgstr "Iniciar recebimento." -#: ft/ftdialog.c:404 +#: ft/ftdialog.c:408 msgid "Start upload." msgstr "Iniciar envio." @@ -1693,7 +1670,7 @@ msgstr "Divergência na identidade do emissor" msgid "System _type:" msgstr "Tipo de servidor:" -#: telnet.c:1518 +#: telnet.c:1514 msgid "TLS negotiation failure" msgstr "Negociação TLS falhou" @@ -1931,7 +1908,7 @@ msgstr "" msgid "This program requires GTK version %d.%d.%d" msgstr "Este programa precisa do GTK versão %d.%d.%d" -#: connect.c:331 +#: connect.c:326 #, c-format msgid "" "This version of %s was built without support for secure sockets layer (SSL)." @@ -1993,7 +1970,7 @@ msgstr "UTF-8" msgid "Uknown DFT Open type from host" msgstr "Host enviou código de abertura DFT desconhecido" -#: connect.c:330 +#: connect.c:325 msgid "Unable to connect to secure hosts" msgstr "Não é possível conectar em servidores seguros" @@ -2010,7 +1987,7 @@ msgstr "" msgid "Unable to decrypt certificate's signature" msgstr "Incapaz de decifrar a assinatura do certificado" -#: connect.c:198 +#: connect.c:193 msgid "Unable to find selected hostname." msgstr "Não consegui encontrar o host selecionado." @@ -2138,25 +2115,11 @@ msgstr "PF %d desconhecida" msgid "Unknown frame type from host" msgstr "Servidor enviou tipo de frame desconhecido" -#: resolver.c:166 -#, c-format -msgid "" -"Unknown host:\n" -"%s" -msgstr "" -"Servidor desconhecido:\n" -"%s" - #: uiparser/popup.c:76 #, c-format msgid "Unknown popup type \"%s\"" msgstr "Tipo de popup \"%s\" não é conhecido" -#: resolver.c:147 -#, c-format -msgid "Unknown port number or service: %s" -msgstr "Número de porta ou serviço desconhecido: %s" - #: rpq.c:227 msgid "Unsupported RPQ term" msgstr "Unsupported RPQ term" @@ -2186,18 +2149,10 @@ msgstr "Versão %s - Revisão %s" msgid "View Field Delimiters" msgstr "Mostrar delimitadores de campo" -#: connect.c:374 -msgid "WSAEventSelect failed" -msgstr "WSAEventSelect falhou" - -#: connect.c:162 +#: connect.c:157 msgid "WSAStartup failed" msgstr "WSAStartup falhou" -#: iocalls.c:429 -msgid "WaitForMultipleObjects() failed when processing for events." -msgstr "WaitForMultipleObjects() falhou ao processar eventos" - #: ft.c:433 msgid "Waiting for GET response" msgstr "Aguardando resposta do pedido de download" @@ -2287,8 +2242,8 @@ msgstr "_Adicionar ao arquivo de destino" msgid "_Browse" msgstr "_Procurar" -#: v3270/hostselect.c:390 filetransfer.c:250 ft/ftdialog.c:133 -#: ft/ftdialog.c:407 +#: v3270/hostselect.c:389 filetransfer.c:250 ft/ftdialog.c:133 +#: ft/ftdialog.c:398 msgid "_Cancel" msgstr "_Cancelar" @@ -2340,7 +2295,7 @@ msgstr "_Rede" msgid "_Options" msgstr "_Opções" -#: ft/ftdialog.c:399 +#: ft/ftdialog.c:403 msgid "_Receive" msgstr "_Receber" @@ -2352,13 +2307,13 @@ msgstr "_Gravar" msgid "_Secure connection." msgstr "Conexão _Segura." -#: ft/ftdialog.c:134 ft/ftdialog.c:399 +#: ft/ftdialog.c:134 ft/ftdialog.c:403 msgid "_Send" msgstr "_Enviar" #: v3270/hostselect.c:148 msgid "_Service:" -msgstr "_Service:" +msgstr "_Serviço:" #: ft/ftdialog.c:454 ft/ftdialog.c:544 msgid "_Text file." @@ -2389,27 +2344,27 @@ msgstr "Atributo inesperado \"action\" em <%s>" msgid "an action attribute" msgstr "um atributo \"action\"" -#: session.c:340 +#: session.c:335 msgid "bracket" msgstr "bracket" -#: toggles.c:177 connect.c:387 connect.c:482 +#: toggles.c:177 connect.c:354 connect.c:449 msgid "disable" msgstr "desabilitar" -#: toggles.c:177 connect.c:387 connect.c:482 +#: toggles.c:177 connect.c:354 connect.c:449 msgid "enable" msgstr "enable" -#: connect.c:599 +#: connect.c:561 msgid "fcntl() error when getting socket state." msgstr "fcntl() error when getting socket state." -#: connect.c:407 connect.c:586 +#: connect.c:374 connect.c:548 msgid "ioctlsocket(FIONBIO) failed." msgstr "ioctlsocket(FIONBIO) failed." -#: connect.c:437 connect.c:471 +#: connect.c:404 connect.c:438 msgid "setsockopt(SO_OOBINLINE) has failed" msgstr "setsockopt(SO_OOBINLINE) has failed" @@ -2417,10 +2372,44 @@ msgstr "setsockopt(SO_OOBINLINE) has failed" msgid "translator-credits" msgstr "translator-credits" -#: telnet.c:1033 +#: telnet.c:1029 msgid "unknown error" msgstr "Erro desconhecido" +#~ msgid "Select hostname" +#~ msgstr "Selecione host" + +#~ msgid "Set hostname" +#~ msgstr "Selecione servidor" + +#~ msgid "%s: unknown family %d" +#~ msgstr "%s: Familia %d é inválida" + +#~ msgid "Cannot create socket event" +#~ msgstr "Não foi possível criar um semáforo para comunicação" + +#~ msgid "Error %d resolving %s" +#~ msgstr "Erro %d resolvendo %s" + +#~ msgid "Error resolving %s: %s" +#~ msgstr "Erro ao resolver %s: %s" + +#~ msgid "" +#~ "Unknown host:\n" +#~ "%s" +#~ msgstr "" +#~ "Servidor desconhecido:\n" +#~ "%s" + +#~ msgid "Unknown port number or service: %s" +#~ msgstr "Número de porta ou serviço desconhecido: %s" + +#~ msgid "WSAEventSelect failed" +#~ msgstr "WSAEventSelect falhou" + +#~ msgid "WaitForMultipleObjects() failed when processing for events." +#~ msgstr "WaitForMultipleObjects() falhou ao processar eventos" + #~ msgid "Host is AS/400" #~ msgstr "Servidor é AS/400" diff --git a/src/include/lib3270.h b/src/include/lib3270.h index 7d178a5..c31d454 100644 --- a/src/include/lib3270.h +++ b/src/include/lib3270.h @@ -664,7 +664,7 @@ void * (*AddExcept)(int source, H3270 *session, void (*fn)(H3270 *session)); - int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm); +// int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm); int (*Wait)(H3270 *hSession, int seconds); int (*event_dispatcher)(H3270 *hSession, int wait); @@ -753,7 +753,7 @@ * @param parm Parameter to be passed to the function. * */ - LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *h, void *parm); +// LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *h, void *parm); /** diff --git a/src/lib3270/iocalls.c b/src/lib3270/iocalls.c index 311da3b..c1fbf7f 100644 --- a/src/lib3270/iocalls.c +++ b/src/lib3270/iocalls.c @@ -55,7 +55,7 @@ static void * internal_add_input(int source, H3270 *session, void (*fn)(H3270 *s static void * internal_add_output(int source, H3270 *session, void (*fn)(H3270 *session)); static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *session)); -static int internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm); +// static int internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm); static int internal_wait(H3270 *hSession, int seconds); static int internal_event_dispatcher(H3270 *hSession, int block); @@ -81,8 +81,8 @@ static void internal_ring_bell(H3270 *); static void * (*add_except)(int source, H3270 *session, void (*fn)(H3270 *session)) = internal_add_except; - static int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm) - = internal_callthread; +// static int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm) +// = internal_callthread; static int (*wait)(H3270 *hSession, int seconds) = internal_wait; @@ -621,10 +621,12 @@ retry: } +/* static int internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm) { return callback(session,parm); } +*/ static int internal_wait(H3270 *hSession, int seconds) { @@ -755,8 +757,8 @@ LIB3270_EXPORT int lib3270_register_handlers(const struct lib3270_callbacks *cbk if(cbk->AddExcept) add_except = cbk->AddExcept; - if(cbk->callthread) - callthread = cbk->callthread; +// if(cbk->callthread) +// callthread = cbk->callthread; if(cbk->Wait) wait = cbk->Wait; @@ -771,6 +773,7 @@ LIB3270_EXPORT int lib3270_register_handlers(const struct lib3270_callbacks *cbk } +/* LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *h, void *parm) { int rc; @@ -786,6 +789,7 @@ LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 * return rc; } +*/ LIB3270_EXPORT void lib3270_main_iterate(H3270 *hSession, int block) { diff --git a/src/lib3270/proxy.c b/src/lib3270/proxy.c index c791b04..cf93c58 100644 --- a/src/lib3270/proxy.c +++ b/src/lib3270/proxy.c @@ -694,15 +694,15 @@ static int proxy_socks4(H3270 *hSession, int fd, char *host, unsigned short port } #endif // HAVE_GETADDRINFO -/* SOCKS version 5 (RFC 1928) proxy. */ +/* SOCKS version 5 (RFC 1928) proxy. */ /* static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port, int force_d) { union { struct sockaddr sa; struct sockaddr_in sin; -#if defined(AF_INET6) /*[*/ +#if defined(AF_INET6) struct sockaddr_in6 sin6; -#endif /*]*/ +#endif } ha; socklen_t ha_len = 0; int use_name = 0; @@ -715,7 +715,7 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port char nbuf[256]; int done = 0; -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) const char *atype_name[] = { "", @@ -725,7 +725,7 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port "IPv6" }; unsigned char *portp; -#endif /*]*/ +#endif unsigned short rport; if (force_d) @@ -734,7 +734,7 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port char errmsg[1024]; int rv; - /* Resolve the hostname. */ + // Resolve the hostname. rv = resolve_host_and_port(hSession,host, CN, &rport, &ha.sa, &ha_len,errmsg, sizeof(errmsg)); if (rv == -2) use_name = 1; @@ -744,22 +744,22 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port } } - /* Send the authentication request to the server. */ + // Send the authentication request to the server. strcpy((char *)rbuf, "\005\001\000"); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) trace_dsn(hSession,_("SOCKS5 Proxy: xmit version 5 nmethods 1 (no auth)\n")); trace_netdata(hSession, '>', rbuf, 3); -#endif /*]*/ +#endif if (send(fd, (const char *) rbuf, 3, 0) < 0) { popup_a_sockerr(hSession,_("SOCKS5 Proxy: send error")); return -1; } - /* - * Wait for the server reply. - * Read 2 bytes of response. - */ + // + // Wait for the server reply. + // Read 2 bytes of response. + // nread = 0; for (;;) { fd_set rfds; @@ -772,10 +772,10 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port if (select(fd + 1, &rfds, NULL, NULL, &tv) < 0) { popup_an_error(hSession,_("SOCKS5 Proxy: server timeout")); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (nread) trace_netdata(hSession, '<', rbuf, nread); -#endif /*]*/ +#endif return -1; } @@ -783,28 +783,28 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port if (nr < 0) { popup_a_sockerr(hSession,_("SOCKS5 Proxy: receive error")); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (nread) trace_netdata(hSession, '<', rbuf, nread); -#endif /*]*/ +#endif return -1; } if (nr == 0) { popup_a_sockerr(hSession,_("SOCKS5 Proxy: unexpected EOF")); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (nread) trace_netdata(hSession, '<', rbuf, nread); -#endif /*]*/ +#endif return -1; } if (++nread >= 2) break; } -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) trace_netdata(hSession, '<', rbuf, nread); -#endif /*]*/ +#endif if (rbuf[0] != 0x05 || (rbuf[1] != 0 && rbuf[1] != 0xff)) { @@ -812,9 +812,9 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port return -1; } -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) trace_dsn(hSession,"SOCKS5 Proxy: recv version %d method %d\n", rbuf[0],rbuf[1]); -#endif /*]*/ +#endif if (rbuf[1] == 0xff) { @@ -822,40 +822,40 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port return -1; } - /* Send the request to the server. */ + // Send the request to the server. buf = lib3270_malloc(32 + strlen(host)); s = buf; - *s++ = 0x05; /* protocol version 5 */ - *s++ = 0x01; /* CONNECT */ - *s++ = 0x00; /* reserved */ + *s++ = 0x05; // protocol version 5 + *s++ = 0x01; // CONNECT + *s++ = 0x00; // reserved if (use_name) { - *s++ = 0x03; /* domain name */ + *s++ = 0x03; // domain name *s++ = strlen(host); strcpy(s, host); s += strlen(host); } else if (ha.sa.sa_family == AF_INET) { - *s++ = 0x01; /* IPv4 */ + *s++ = 0x01; // IPv4 memcpy(s, &ha.sin.sin_addr, 4); s += 4; strcpy(nbuf, inet_ntoa(ha.sin.sin_addr)); -#if defined(AF_INET6) /*[*/ +#if defined(AF_INET6) } else { - *s++ = 0x04; /* IPv6 */ + *s++ = 0x04; // IPv6 memcpy(s, &ha.sin6.sin6_addr, sizeof(struct in6_addr)); s += sizeof(struct in6_addr); (void) inet_ntop(AF_INET6, &ha.sin6.sin6_addr, nbuf, sizeof(nbuf)); -#endif /*]*/ +#endif } SET16(s, port); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) trace_dsn(hSession,"SOCKS5 Proxy: xmit version 5 connect %s %s port %u\n", use_name? "domainname": ((ha.sa.sa_family == AF_INET)? "IPv4": "IPv6"), use_name? host: nbuf, port); trace_netdata(hSession, '>', (unsigned char *)buf, s - buf); -#endif /*]*/ +#endif if (send(fd, buf, s - buf, 0) < 0) { popup_a_sockerr(hSession,_("SOCKS5 Proxy: send error")); @@ -864,11 +864,11 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port } lib3270_free(buf); - /* - * Process the reply. - * Only the first two bytes of the response are interesting; - * skip the rest. - */ + // + // Process the reply. + // Only the first two bytes of the response are interesting; + // skip the rest. + // nread = 0; done = 0; buf = NULL; @@ -892,19 +892,19 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port if (nr < 0) { popup_a_sockerr(hSession,_("SOCKS5 Proxy: receive error")); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (nread) trace_netdata(hSession, '<', (unsigned char *)buf, nread); -#endif /*]*/ +#endif return -1; } if (nr == 0) { popup_an_error(hSession, _("SOCKS5 Proxy: unexpected EOF")); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (nread) trace_netdata(hSession, '<', (unsigned char *)buf, nread); -#endif /*]*/ +#endif return -1; } @@ -916,18 +916,18 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port if (r != 0x05) { popup_an_error(hSession, _("SOCKS5 Proxy: incorrect reply version 0x%02x"), r); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (nread) trace_netdata(hSession, '<', (unsigned char *)buf, nread); -#endif /*]*/ +#endif return -1; } break; case 1: -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (r != 0x00) trace_netdata(hSession, '<', (unsigned char *)buf, nread); -#endif /*]*/ +#endif switch (r) { case 0x00: @@ -973,17 +973,17 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port case 0x03: n2read = -1; break; -#if defined(AF_INET6) /*[*/ +#if defined(AF_INET6) case 0x04: n2read = sizeof(struct in6_addr) + 2; break; -#endif /*]*/ +#endif default: popup_an_error(hSession, _("SOCKS5 Proxy: unknown server address type 0x%02x"), r); -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) if (nread) trace_netdata(hSession, '<', (unsigned char *)buf, nread); -#endif /*]*/ +#endif return -1; } break; @@ -996,29 +996,29 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port } } -#if defined(X3270_TRACE) /*[*/ +#if defined(X3270_TRACE) trace_netdata(hSession, '<', (unsigned char *)buf, nread); switch (buf[3]) { - case 0x01: /* IPv4 */ + case 0x01: // IPv4 memcpy(&ha.sin.sin_addr, &buf[4], 4); strcpy(nbuf, inet_ntoa(ha.sin.sin_addr)); portp = (unsigned char *)&buf[4 + 4]; break; - case 0x03: /* domainname */ + case 0x03: // domainname strncpy(nbuf, &buf[5], buf[4]); nbuf[(unsigned char)buf[4]] = '\0'; portp = (unsigned char *)&buf[5 + (unsigned char)buf[4]]; break; -#if defined(AF_INET6) /*[*/ - case 0x04: /* IPv6 */ +#if defined(AF_INET6) + case 0x04: // IPv6 memcpy(&ha.sin6.sin6_addr, &buf[4], sizeof(struct in6_addr)); (void) inet_ntop(AF_INET6, &ha.sin6.sin6_addr, nbuf, sizeof(nbuf)); portp = (unsigned char *)&buf[4 + sizeof(struct in6_addr)]; break; -#endif /*]*/ +#endif default: - /* can't happen */ + // can't happen nbuf[0] = '\0'; portp = (unsigned char *)buf; break; @@ -1029,8 +1029,9 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port atype_name[(unsigned char)buf[3]], nbuf, rport); -#endif /*]*/ +#endif lib3270_free(buf); return 0; } +*/ diff --git a/src/lib3270/resolver.c b/src/lib3270/resolver.c index c2d93b4..087bcc9 100644 --- a/src/lib3270/resolver.c +++ b/src/lib3270/resolver.c @@ -83,7 +83,7 @@ struct parms * Resolve a hostname and port. * Returns 0 for success, -1 for fatal error (name resolution impossible), * -2 for simple error (cannot resolve the name). - */ + */ /* static int cresolve_host_and_port(H3270 *h, struct parms *p) { #if defined( HAVE_GETADDRINFO ) || defined(WIN32) @@ -91,7 +91,7 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) struct addrinfo hints, *res; int rc; - /* Use getaddrinfo() to resolve the hostname and port together. */ + // Use getaddrinfo() to resolve the hostname and port together. (void) memset(&hints, '\0', sizeof(struct addrinfo)); hints.ai_flags = 0; hints.ai_family = PF_UNSPEC; @@ -138,7 +138,7 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) char *ptr; struct sockaddr_in *sin = (struct sockaddr_in *) p->sa; - /* Get the port number. */ + // Get the port number. lport = strtoul(p->portname, &ptr, 0); if (ptr == p->portname || *ptr != '\0' || lport == 0L || lport & ~0xffff) { @@ -155,7 +155,7 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) } *p->pport = ntohs(port); - /* Use gethostbyname() to resolve the hostname. */ + // Use gethostbyname() to resolve the hostname. hp = gethostbyname(p->host); if (hp == (struct hostent *) 0) { @@ -178,8 +178,9 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) #endif // HAVE_GETADDRINFO return 0; -} +} */ +/* int resolve_host_and_port(H3270 *hSession, const char *host, char *portname, unsigned short *pport,struct sockaddr *sa, socklen_t *sa_len, char *errmsg, int em_len) { int rc; @@ -203,3 +204,4 @@ int resolve_host_and_port(H3270 *hSession, const char *host, char *portname, uns return rc; } +*/ diff --git a/src/lib3270/resolverc.h b/src/lib3270/resolverc.h index c5c00cd..ac76720 100644 --- a/src/lib3270/resolverc.h +++ b/src/lib3270/resolverc.h @@ -17,6 +17,6 @@ * 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); +// 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); diff --git a/src/pw3270/v3270/hostselect.c b/src/pw3270/v3270/hostselect.c index 04cf4d1..6dc6721 100644 --- a/src/pw3270/v3270/hostselect.c +++ b/src/pw3270/v3270/hostselect.c @@ -383,7 +383,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) GtkWidget * dialog = v3270_host_select_new(widget); GtkWidget * win = gtk_dialog_new_with_buttons( - _( "Select hostname" ), + _( "Configure host" ), GTK_WINDOW(gtk_widget_get_toplevel(widget)), GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, _( "_Cancel" ), GTK_RESPONSE_REJECT, diff --git a/src/pw3270/v3270/iocallback.c b/src/pw3270/v3270/iocallback.c index 5976636..260e9b6 100644 --- a/src/pw3270/v3270/iocallback.c +++ b/src/pw3270/v3270/iocallback.c @@ -43,7 +43,7 @@ #include #include "../globals.h" -static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm); +// static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm); static void static_RemoveSource(void *id); static void * static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session)); @@ -265,6 +265,7 @@ gpointer BgCall(struct bgParameter *p) return 0; } +/* static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm) { struct bgParameter p = { TRUE, session, -1, callback, parm }; @@ -286,6 +287,7 @@ static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *ses return p.rc; } +*/ static int static_Sleep(H3270 *hSession, int seconds) { @@ -333,12 +335,13 @@ void v3270_register_io_handlers(v3270Class *cls) static_AddExcept, +/* #ifdef G_THREADS_ENABLED static_CallAndWait, #else NULL, #endif - +*/ static_Sleep, static_RunPendingEvents, beep diff --git a/ui/00default.xml b/ui/00default.xml index 4453506..efef1ca 100644 --- a/ui/00default.xml +++ b/ui/00default.xml @@ -89,7 +89,7 @@ - +