diff options
Diffstat (limited to 'ktalkd/ktalkd/machines/forwmach.cpp')
| -rw-r--r-- | ktalkd/ktalkd/machines/forwmach.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ktalkd/ktalkd/machines/forwmach.cpp b/ktalkd/ktalkd/machines/forwmach.cpp index 402e4f01..f94c15d4 100644 --- a/ktalkd/ktalkd/machines/forwmach.cpp +++ b/ktalkd/ktalkd/machines/forwmach.cpp @@ -224,14 +224,14 @@ void ForwMachine::connect_FWT(TalkConnection * tcCaller) int socktA = tcAnsw->get_sockt(); int max_sockt = (socktC>socktA) ? socktC : socktA; unsigned char buf[BUFSIZ]; - fd_set read_mask; + fd_set read_tqmask; int nb; int nbtot = 0; for (;;) { - FD_ZERO(&read_mask); - FD_SET(socktA, &read_mask); // wait on both connections - FD_SET(socktC, &read_mask); - nb = select(max_sockt+1, &read_mask, NULL, NULL, NULL); // no timeout + FD_ZERO(&read_tqmask); + FD_SET(socktA, &read_tqmask); // wait on both connections + FD_SET(socktC, &read_tqmask); + nb = select(max_sockt+1, &read_tqmask, NULL, NULL, NULL); // no timeout if (nb <= 0) { if (errno == EINTR) { continue; @@ -239,12 +239,12 @@ void ForwMachine::connect_FWT(TalkConnection * tcCaller) /* panic, we don't know what happened */ TalkConnection::p_error("Unexpected error from select"); } - if (FD_ISSET(socktA, &read_mask)) { + if (FD_ISSET(socktA, &read_tqmask)) { /* There is data on sockt A */ nb = transmit_chars(socktA, socktC, buf); if (nb==0) return ; } - if (FD_ISSET(socktC, &read_mask)) { + if (FD_ISSET(socktC, &read_tqmask)) { /* There is data on sockt C */ nb = transmit_chars(socktC, socktA, buf); if (nb==0) return ; @@ -284,7 +284,7 @@ void ForwMachine::sendResponse(const struct talk_addr target, NEW_CTL_RESPONSE * * value of answ_id_num) and waits for SIGDELETE to use this value. */ void ForwMachine::processAnnounce() { - if ((pid=fork())==0) // store pid in the parent + if ((pid=fork())==0) // store pid in the tqparent { // Send announce to the answerer, and wait for response ktalk_debug("-------------- ForwMachine : sending ANNOUNCE to %s",answ_user); |