Download as
Browse Code »

Commit 01ba74fa4b3bd5f4b078e624bc469dfdb5623549

Authored by Perry Werneck
1 parent 32c4eeca
Exists in master and in 2 other branches develop, macos

On TN3270-E the model name should be "IBM-3279-4-E" and not "IBM-3279-4"

Showing 2 changed files with 17 additions and 1 deletions   Show diff stats
src/core/connect.c
  Diff comments   View file @01ba74f
@@ -130,7 +130,15 @@ @@ -130,7 +130,15 @@
130 130
131 set_ssl_state(hSession,LIB3270_SSL_UNDEFINED); 131 set_ssl_state(hSession,LIB3270_SSL_UNDEFINED);
132 132
133 - snprintf(hSession->full_model_name,LIB3270_FULL_MODEL_NAME_LENGTH,"IBM-327%c-%d",hSession->m3279 ? '9' : '8', hSession->model_num); 133 + snprintf(
  134 + hSession->full_model_name,
  135 + LIB3270_FULL_MODEL_NAME_LENGTH,
  136 + "IBM-327%c-%d%s",
  137 + hSession->m3279 ? '9' : '8',
  138 + hSession->model_num,
  139 + hSession->extended ? "-E" : ""
  140 + );
  141 +
134 lib3270_write_event_trace(hSession,"Reconnecting to %s\n",lib3270_get_url(hSession)); 142 lib3270_write_event_trace(hSession,"Reconnecting to %s\n",lib3270_get_url(hSession));
135 143
136 hSession->ever_3270 = False; 144 hSession->ever_3270 = False;
@@ -167,7 +175,9 @@ @@ -167,7 +175,9 @@
167 non_blocking(hSession,False); 175 non_blocking(hSession,False);
168 176
169 #pragma GCC diagnostic push 177 #pragma GCC diagnostic push
  178 +#ifdef _WIN32
170 #pragma GCC diagnostic ignored "-Wcast-function-type" 179 #pragma GCC diagnostic ignored "-Wcast-function-type"
  180 +#endif // _WIN32
171 int rc = lib3270_run_task( 181 int rc = lib3270_run_task(
172 hSession, 182 hSession,
173 (int(*)(H3270 *h, void *)) hSession->network.module->start_tls, 183 (int(*)(H3270 *h, void *)) hSession->network.module->start_tls,
src/core/telnet.c
  Diff comments   View file @01ba74f
@@ -1006,6 +1006,12 @@ static int telnet_fsm(H3270 *hSession, unsigned char c) @@ -1006,6 +1006,12 @@ static int telnet_fsm(H3270 *hSession, unsigned char c)
1006 IAC, SE); 1006 IAC, SE);
1007 net_rawout(hSession, (unsigned char *)tt_out, tb_len); 1007 net_rawout(hSession, (unsigned char *)tt_out, tb_len);
1008 1008
  1009 + debug("\n\n\ntermtype=%s lu.try=[%s] - [%s]\n\n\n",
  1010 + hSession->termtype,
  1011 + (hSession->lu.try != CN && *hSession->lu.try) ? "@" : "",
  1012 + (hSession->lu.try != CN && *hSession->lu.try) ? hSession->lu.try : ""
  1013 + );
  1014 +
1009 trace_dsn(hSession,"SENT %s %s %s %.*s %s\n", 1015 trace_dsn(hSession,"SENT %s %s %s %.*s %s\n",
1010 cmd(SB), opt(TELOPT_TTYPE), 1016 cmd(SB), opt(TELOPT_TTYPE),
1011 telquals[TELQUAL_IS], 1017 telquals[TELQUAL_IS],