github.com/open-simh.simh
1
0
Fork 0
mirror of https://github.com/open-simh/simh.git synced 2026-01-25 11:55:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix TMXR for devices which reference the TMLN conn variable as a connection state flag

Browse Source
This commit is contained in:
Mark Pizzolato
2012-12-18 09:53:01 -08:00
parent 50cf91d441
commit a72d85b2bd
3 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sim_console.c
View File

@@ -538,11 +538,11 @@ else {
tmxr_fconns (st, &sim_con_ldsc, -1);
}
else
if (sim_con_ldsc.conn == 0)
if (sim_con_ldsc.sock == 0)
fprintf (st, "Listening on port %s\n", sim_con_tmxr.port);
else {
fprintf (st, "Listening on port %s, connected to socket %d\n",
sim_con_tmxr.port, sim_con_ldsc.conn);
fprintf (st, "Listening on port %s, connection from %s\n",
sim_con_tmxr.port, sim_con_ldsc.ipad);
tmxr_fconns (st, &sim_con_ldsc, -1);
}
tmxr_fstats (st, &sim_con_ldsc, -1);
@@ -830,8 +830,7 @@ if ((c == SCPE_STOP) || /* ^E or not Telnet? */
((sim_con_tmxr.master == 0) && /* and not serial? */
(sim_con_ldsc.serport == 0)))
return c; /* in-window */
if ((sim_con_ldsc.conn == 0) && /* no Telnet conn */
(sim_con_ldsc.serport == 0)) { /* and no serial conn? */
if (!sim_con_ldsc.conn) { /* no telnet or serial connection? */
if (!sim_con_ldsc.txbfd) /* unbuffered? */
return SCPE_LOST; /* connection lost */
if (tmxr_poll_conn (&sim_con_tmxr) >= 0) /* poll connect */
@@ -857,8 +856,7 @@ if ((sim_con_tmxr.master == 0) && /* not Telnet? */
}
if (sim_log && !sim_con_ldsc.txlog) /* log file, but no line log? */
fputc (c, sim_log);
if ((sim_con_ldsc.serport == 0) && /* no serial port */
(sim_con_ldsc.conn == 0)) { /* and no Telnet conn? */
if (!sim_con_ldsc.conn) { /* no Telnet or serial connection? */
if (!sim_con_ldsc.txbfd) /* unbuffered? */
return SCPE_LOST; /* connection lost */
if (tmxr_poll_conn (&sim_con_tmxr) >= 0) /* poll connect */
@@ -881,9 +879,8 @@ if ((sim_con_tmxr.master == 0) && /* not Telnet? */
}
if (sim_log && !sim_con_ldsc.txlog) /* log file, but no line log? */
fputc (c, sim_log);
if ((sim_con_ldsc.serport == 0) && /* no serial port */
(sim_con_ldsc.conn == 0)) { /* and no Telnet conn? */
if (!sim_con_ldsc.txbfd) /* non-buffered Telnet conn? */
if (!sim_con_ldsc.conn) { /* no Telnet or serial connection? */
if (!sim_con_ldsc.txbfd) /* non-buffered Telnet connection? */
return SCPE_LOST; /* lost */
if (tmxr_poll_conn (&sim_con_tmxr) >= 0) /* poll connect */
sim_con_ldsc.rcve = 1; /* rcv enabled */