[tor-commits] [obfsproxy/master] error_or_eof was setting flushing callbacks statically to conn->output.

[nickm at torproject.org]

commit cd64d970de8fee355e261c053cd407ee80f7247e
Author: George Kadianakis <desnacked at gmail.com>
Date:   Tue May 17 03:07:57 2011 +0200

    error_or_eof was setting flushing callbacks statically to conn->output.
    Instead it should be setting the callbacks to the bufferevent
    we are trying to close/flush.
---
 src/network.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/network.c b/src/network.c
index 1199c96..9ab8f17 100644
--- a/src/network.c
+++ b/src/network.c
@@ -316,7 +316,7 @@ error_or_eof(conn_t *conn,
   bufferevent_disable(bev_err, EV_READ|EV_WRITE);
   bufferevent_disable(bev_flush, EV_READ);
 
-  bufferevent_setcb(conn->output, NULL,
+  bufferevent_setcb(bev_flush, NULL,
                     close_conn_on_flush, output_event_cb, conn);
   bufferevent_enable(bev_flush, EV_WRITE);
 }