comparison common-channel.c @ 743:09c5eb71ec96 kexguess

merge from head roundtrip changes
author Matt Johnston <matt@ucc.asn.au>
date Mon, 01 Apr 2013 00:13:41 +0800
parents 9a5438271556
children 7577a3afc42d
comparison
equal deleted inserted replaced
742:cd201dc2da9a 743:09c5eb71ec96
271 271
272 /* EOF/close handling */ 272 /* EOF/close handling */
273 static void check_close(struct Channel *channel) { 273 static void check_close(struct Channel *channel) {
274 int close_allowed = 0; 274 int close_allowed = 0;
275 275
276 TRACE(("check_close: writefd %d, readfd %d, errfd %d, sent_close %d, recv_close %d", 276 TRACE2(("check_close: writefd %d, readfd %d, errfd %d, sent_close %d, recv_close %d",
277 channel->writefd, channel->readfd, 277 channel->writefd, channel->readfd,
278 channel->errfd, channel->sent_close, channel->recv_close)) 278 channel->errfd, channel->sent_close, channel->recv_close))
279 TRACE(("writebuf size %d extrabuf size %d", 279 TRACE2(("writebuf size %d extrabuf size %d",
280 channel->writebuf ? cbuf_getused(channel->writebuf) : 0, 280 channel->writebuf ? cbuf_getused(channel->writebuf) : 0,
281 channel->extrabuf ? cbuf_getused(channel->extrabuf) : 0)) 281 channel->extrabuf ? cbuf_getused(channel->extrabuf) : 0))
282 282
283 if (!channel->flushing 283 if (!channel->flushing
284 && !channel->close_handler_done 284 && !channel->close_handler_done