Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
54e04dda7f
1 changed files with 3 additions and 5 deletions
|
@ -1375,10 +1375,6 @@ if ((lp->sock) || (lp->serport) || (lp->loopback)) {
|
|||
incoming_state = TMXR_MDM_RNG | TMXR_MDM_DCD | TMXR_MDM_DSR;
|
||||
}
|
||||
else
|
||||
if ((lp->master) || (lp->mp && lp->mp->master) ||
|
||||
(lp->port && lp->destination))
|
||||
incoming_state = TMXR_MDM_DCD | TMXR_MDM_DSR;
|
||||
else
|
||||
incoming_state = 0;
|
||||
lp->modembits |= incoming_state;
|
||||
dptr = (lp->dptr ? lp->dptr : (lp->mp ? lp->mp->dptr : NULL));
|
||||
|
@ -2082,6 +2078,8 @@ while (*tptr) {
|
|||
nolog = notelnet = listennotelnet = unbuffered = loopback = FALSE;
|
||||
datagram = mp->datagram;
|
||||
packet = mp->packet;
|
||||
if (mp->buffered)
|
||||
sprintf(buffered, "%d", mp->buffered);
|
||||
if (line != -1)
|
||||
notelnet = listennotelnet = mp->notelnet;
|
||||
modem_control = mp->modem_control;
|
||||
|
|
Loading…
Add table
Reference in a new issue