Mercurial > dropbear
diff common-channel.c @ 330:5488db2e9e4e
merge of 332f709a4cb39cde4cedab7c3be89e05f3023067
and ca4ca78b82c5d430c69ce01bf794e8886ce81431
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sat, 10 Jun 2006 16:39:40 +0000 |
| parents | 8ed0dce45126 baea1d43e7eb |
| children | d6b8815a9b5e |
line wrap: on
line diff
--- a/common-channel.c Sat Jun 10 16:39:37 2006 +0000 +++ b/common-channel.c Sat Jun 10 16:39:40 2006 +0000 @@ -181,7 +181,6 @@ struct Channel *channel; unsigned int i; - int ret; /* iterate through all the possible channels */ for (i = 0; i < ses.chansize; i++) { @@ -255,7 +254,7 @@ 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))) @@ -395,7 +394,7 @@ 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"))