folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support to the Remote Console facility to close a remote console session on EOF

Browse source
This commit is contained in:
Mark Pizzolato 2013-05-31 09:33:05 -07:00
parent bc49f6b78a
commit 881f53e457
3 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -35,6 +35,8 @@ A subset of normal simh commands are available for use in remote console session
The Single Command Mode commands are: ATTACH, DETACH, PWD, SHOW, DIR, LS, ECHO, HELP The Single Command Mode commands are: ATTACH, DETACH, PWD, SHOW, DIR, LS, ECHO, HELP
The Multiple Command Mode commands are: EXAMINE, IEXAMINE, DEPOSIT, EVALUATE, ATTACH, DETACH, ASSIGN, DEASSIGN, STEP, CONTINUE, PWD, SAVE, SET, SHOW, DIR, LS, ECHO, HELP The Multiple Command Mode commands are: EXAMINE, IEXAMINE, DEPOSIT, EVALUATE, ATTACH, DETACH, ASSIGN, DEASSIGN, STEP, CONTINUE, PWD, SAVE, SET, SHOW, DIR, LS, ECHO, HELP
A remote console session will close when an EOF character is entered (i.e. ^D or ^Z).
#### VAX/PDP11 Enhancements #### VAX/PDP11 Enhancements
RQ has new disk types: RC25, RCF25, RA80 RQ has new disk types: RC25, RCF25, RA80
RQ device has a settable controller type (RQDX3, UDA50, KLESI, RUX50) RQ device has a settable controller type (RQDX3, UDA50, KLESI, RUX50)

BIN
doc/simh_doc.doc
View file

Binary file not shown.

44
sim_console.c
View file

@ -518,6 +518,7 @@ t_bool stepping = FALSE;
int32 steps = 1; int32 steps = 1;
t_bool was_stepping = (sim_rem_step_line != -1); t_bool was_stepping = (sim_rem_step_line != -1);
t_bool got_command; t_bool got_command;
t_bool close_session = FALSE;
TMLN *lp; TMLN *lp;
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *cptr, *argv[1] = {NULL}; char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *cptr, *argv[1] = {NULL};
CTAB *cmdp; CTAB *cmdp;
@ -535,15 +536,15 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
sim_rem_step_line = -1; /* Done with step */ sim_rem_step_line = -1; /* Done with step */
stat = SCPE_STEP; stat = SCPE_STEP;
cmdp = find_cmd ("STEP"); cmdp = find_cmd ("STEP");
stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */ stat_nomessage = stat & SCPE_NOMESSAGE; /* extract possible message supression flag */
stat = SCPE_BARE_STATUS(stat); /* remove possible flag */ stat = SCPE_BARE_STATUS(stat); /* remove possible flag */
if (!stat_nomessage) { /* displaying message status? */ if (!stat_nomessage) { /* displaying message status? */
fflush (sim_log); fflush (sim_log);
cmd_log_start = sim_ftell (sim_log); cmd_log_start = sim_ftell (sim_log);
if (cmdp && (cmdp->message)) /* special message handler? */ if (cmdp && (cmdp->message)) /* special message handler? */
cmdp->message (NULL, stat); /* let it deal with display */ cmdp->message (NULL, stat); /* let it deal with display */
else else
if (stat >= SCPE_BASE) { /* error? */ if (stat >= SCPE_BASE) { /* error? */
printf ("%s\r\n", sim_error_text (stat)); printf ("%s\r\n", sim_error_text (stat));
if (sim_log) if (sim_log)
fprintf (sim_log, "%s\n", sim_error_text (stat)); fprintf (sim_log, "%s\n", sim_error_text (stat));
@ -579,6 +580,12 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
tmxr_linemsgf (lp, "Simulation will resume automatically if input is not received in %d seconds\n", sim_rem_read_timeout); tmxr_linemsgf (lp, "Simulation will resume automatically if input is not received in %d seconds\n", sim_rem_read_timeout);
} }
else { else {
if ((c == '\004') || (c == '\032')) { /* EOF character (^D or ^Z) ? */
tmxr_linemsgf (lp, "\r\nGoodbye\r\n");
tmxr_send_buffered_data (lp); /* flush any buffered data */
tmxr_reset_ln (lp);
continue;
}
sim_rem_single_mode[i] = TRUE; sim_rem_single_mode[i] = TRUE;
tmxr_linemsgf (lp, "\r\n%s", sim_prompt); tmxr_linemsgf (lp, "\r\n%s", sim_prompt);
tmxr_send_buffered_data (lp); /* flush any buffered data */ tmxr_send_buffered_data (lp); /* flush any buffered data */
@ -648,6 +655,23 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
sim_rem_buf[i][sim_rem_buf_ptr[i]++] = '\0'; sim_rem_buf[i][sim_rem_buf_ptr[i]++] = '\0';
got_command = TRUE; got_command = TRUE;
break; break;
case '\004': /* EOF (^D) */
case '\032': /* EOF (^Z) */
while (sim_rem_buf_ptr[i] > 0) { /* Erase current input line */
tmxr_linemsg (lp, "\b \b");
--sim_rem_buf_ptr[i];
}
if (!sim_rem_single_mode[i]) {
if (sim_rem_buf_ptr[i]+80 >= sim_rem_buf_size[i]) {
sim_rem_buf_size[i] += 1024;
sim_rem_buf[i] = realloc (sim_rem_buf[i], sim_rem_buf_size[i]);
}
strcpy (sim_rem_buf[i], "CONTINUE ! Automatic continue before close");
tmxr_linemsgf (lp, "%s\n", sim_rem_buf[i]);
got_command = TRUE;
}
close_session = TRUE;
break;
default: default:
tmxr_putc_ln (lp, c); tmxr_putc_ln (lp, c);
if (sim_rem_buf_ptr[i]+2 >= sim_rem_buf_size[i]) { if (sim_rem_buf_ptr[i]+2 >= sim_rem_buf_size[i]) {
@ -662,8 +686,9 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
} }
} while ((!got_command) && (!sim_rem_single_mode[i])); } while ((!got_command) && (!sim_rem_single_mode[i]));
tmxr_send_buffered_data (lp); /* flush any buffered data */ tmxr_send_buffered_data (lp); /* flush any buffered data */
if ((sim_rem_single_mode[i]) && !got_command) if ((sim_rem_single_mode[i]) && !got_command) {
break; break;
}
printf ("Remote Console Command from %s> %s\r\n", lp->ipad, sim_rem_buf[i]); printf ("Remote Console Command from %s> %s\r\n", lp->ipad, sim_rem_buf[i]);
if (sim_log) if (sim_log)
fprintf (sim_log, "Remote Console Command from %s> %s\n", lp->ipad, sim_rem_buf[i]); fprintf (sim_log, "Remote Console Command from %s> %s\n", lp->ipad, sim_rem_buf[i]);
@ -790,6 +815,11 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
break; break;
} }
} }
if (close_session) {
tmxr_linemsgf (lp, "\r\nGoodbye\r\n");
tmxr_send_buffered_data (lp); /* flush any buffered data */
tmxr_reset_ln (lp);
}
} }
if (stepping) if (stepping)
sim_activate(uptr, steps); /* check again after 'steps' instructions */ sim_activate(uptr, steps); /* check again after 'steps' instructions */