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

TMXR: Properly honor tmxr_set_notelnet and tmxr_set_nomessage APIs

Browse source
This commit is contained in:
Mark Pizzolato 2020-06-26 22:57:57 -07:00
parent fe4a2a28b6
commit c00376d363
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sim_tmxr.c
View file

@ -868,9 +868,10 @@ if (tptr == NULL) /* no more mem? */
return tptr; return tptr;
if (mp->port) /* copy port */ if (mp->port) /* copy port */
sprintf (growstring(&tptr, 13 + strlen (mp->port)), "%s%s%s", mp->port, sprintf (growstring(&tptr, 33 + strlen (mp->port)), "%s%s", mp->port,
mp->notelnet ? ";notelnet" : "", mp->notelnet ? ";notelnet" :
mp->nomessage ? ";nomessage" : ""); (mp->nomessage ? ";nomessage" :
""));
if (mp->logfiletmpl[0]) /* logfile info */ if (mp->logfiletmpl[0]) /* logfile info */
sprintf (growstring(&tptr, 7 + strlen (mp->logfiletmpl)), ",Log=%s", mp->logfiletmpl); sprintf (growstring(&tptr, 7 + strlen (mp->logfiletmpl)), ",Log=%s", mp->logfiletmpl);
if (mp->buffered) if (mp->buffered)
@ -940,7 +941,7 @@ if (lp->destination || lp->port || lp->txlogname || (lp->conn == TMXR_LINE_DISAB
if (lp->mp->packet != lp->packet) if (lp->mp->packet != lp->packet)
sprintf (growstring(&tptr, 8), ",Packet"); sprintf (growstring(&tptr, 8), ",Packet");
if (lp->port) if (lp->port)
sprintf (growstring(&tptr, 12 + strlen (lp->port)), ",%s%s%s", lp->port, sprintf (growstring(&tptr, 32 + strlen (lp->port)), ",%s%s%s", lp->port,
((lp->mp->notelnet != lp->notelnet) && (!lp->datagram)) ? (lp->notelnet ? ";notelnet" : ";telnet") : "", ((lp->mp->notelnet != lp->notelnet) && (!lp->datagram)) ? (lp->notelnet ? ";notelnet" : ";telnet") : "",
((lp->mp->nomessage != lp->nomessage) && (!lp->datagram)) ? (lp->nomessage ? ";nomessage" : ";message") : ""); ((lp->mp->nomessage != lp->nomessage) && (!lp->datagram)) ? (lp->nomessage ? ";nomessage" : ";message") : "");
if (lp->destination) { if (lp->destination) {
@ -2734,6 +2735,8 @@ for (i = 0; i < mp->lines; i++) { /* initialize lines */
if (lp->bpsfactor == 0.0) if (lp->bpsfactor == 0.0)
lp->bpsfactor = 1.0; lp->bpsfactor = 1.0;
} }
notelnet = listennotelnet = mp->notelnet;
nomessage = listennomessage = mp->nomessage;
mp->ring_sock = INVALID_SOCKET; mp->ring_sock = INVALID_SOCKET;
free (mp->ring_ipad); free (mp->ring_ipad);
mp->ring_ipad = NULL; mp->ring_ipad = NULL;
@ -2748,7 +2751,7 @@ while (*tptr) {
memset(port, '\0', sizeof(port)); memset(port, '\0', sizeof(port));
memset(option, '\0', sizeof(option)); memset(option, '\0', sizeof(option));
memset(speed, '\0', sizeof(speed)); memset(speed, '\0', sizeof(speed));
nolog = notelnet = listennotelnet = nomessage = listennomessage = loopback = disabled = FALSE; nolog = loopback = disabled = FALSE;
datagram = mp->datagram; datagram = mp->datagram;
packet = mp->packet; packet = mp->packet;
if (mp->buffered) if (mp->buffered)