[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Make connection_write_to_buf_zlib set outbuf_flushlen right.
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv12050/src/or
Modified Files:
connection.c
Log Message:
Make connection_write_to_buf_zlib set outbuf_flushlen right.
Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -p -d -r1.456 -r1.457
--- connection.c 18 Jun 2006 08:46:55 -0000 1.456
+++ connection.c 18 Jun 2006 08:53:09 -0000 1.457
@@ -1602,12 +1602,14 @@ connection_write_to_buf_zlib(connection_
int done)
{
int r;
+ size_t old_datalen;
if (!data_len)
return;
/* if it's marked for close, only allow write if we mean to flush it */
if (conn->marked_for_close && !conn->hold_open_until_flushed)
return;
+ old_datalen = buf_datalen(conn->outbuf);
/* XXXX TOO much duplicate code! XXXX012NM */
CONN_LOG_PROTECT(conn, r = write_to_buf_zlib(
conn->outbuf, state, data, data_len,
@@ -1629,7 +1631,7 @@ connection_write_to_buf_zlib(connection_
}
connection_start_writing(conn);
- conn->outbuf_flushlen += data_len;
+ conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen;
}
/** Return the conn to addr/port that has the most recent