diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:20:34 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:20:34 +0000 |
| commit | d9aeb2773e236e662c8b493f4bcee978f9908d7c (patch) | |
| tree | bac48e388bf3ac739ae14cdf98da0eb4bb9d17bf /common-channel.c | |
| parent | 056b92bd4c8a42ce1843493310d382159166edb8 (diff) | |
| parent | c5fd7dd5548f28e32d846e39d17e5c4de4e769af (diff) | |
merge of '5fdf69ca60d1683cdd9f4c2595134bed26394834'
and '6b61c50f4cf888bea302ac8fcf5dbb573b443251'
--HG--
extra : convert_revision : b1dd3b94e60a07a176dba2b035ac79968595990a
Diffstat (limited to 'common-channel.c')
| -rw-r--r-- | common-channel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common-channel.c b/common-channel.c index 7e8d428..0be354d 100644 --- a/common-channel.c +++ b/common-channel.c @@ -181,7 +181,6 @@ void channelio(fd_set *readfds, fd_set *writefds) { struct Channel *channel; unsigned int i; - int ret; /* iterate through all the possible channels */ for (i = 0; i < ses.chansize; i++) { @@ -237,7 +236,7 @@ static void checkclose(struct Channel *channel) { TRACE(("checkclose: writefd %d, readfd %d, errfd %d, sentclosed %d, recvclosed %d", channel->writefd, channel->readfd, channel->errfd, channel->sentclosed, channel->recvclosed)) - TRACE(("writebuf %d extrabuf %s extrabuf %d", + TRACE(("writebuf size %d extrabuf ptr 0x%x extrabuf size %d", cbuf_getused(channel->writebuf), channel->writebuf, channel->writebuf ? 0 : cbuf_getused(channel->extrabuf))) @@ -377,7 +376,7 @@ static void writechannel(struct Channel* channel, int fd, circbuffer *cbuf) { cbuf_incrread(cbuf, len); channel->recvdonelen += len; - if (fd == channel->writefd && len == maxlen && channel->recveof) { + if (fd == channel->writefd && cbuf_getused(cbuf) == 0 && channel->recveof) { /* Check if we're closing up */ closewritefd(channel); TRACE(("leave writechannel: recveof set")) |