From 5b4ec24debf683a594ac5505c39c78e92c7e624c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 18 Jan 2010 19:26:46 +0000 Subject: [PATCH] (trunk libT) tweak the peer-io bugfix --- configure.ac | 2 +- libtransmission/peer-io.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index de78b6d25..9920fd484 100644 --- a/configure.ac +++ b/configure.ac @@ -192,7 +192,7 @@ dnl because "make dist" needs its Makefiles to exist, and dnl AM_CONDITIONAL + AC_CONFIG_SUBDIRS don't seem to play nice AC_CONFIG_SUBDIRS([third-party/libevent]) libevent_source=bundled -AC_CHECK_LIB([event],[evbuffer_readln], +AC_CHECK_LIB([event],[evutil_vsnprintf], [libevent_found=yes], [libevent_found=no], [$libevent_extra_libs]) diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c index 363e039fe..3f1fd89b9 100644 --- a/libtransmission/peer-io.c +++ b/libtransmission/peer-io.c @@ -530,7 +530,7 @@ io_dtor( void * vio ) assert( io->session->events != NULL ); dbgmsg( io, "in tr_peerIo destructor" ); - event_disable( io, ~0 ); + event_disable( io, EV_READ | EV_WRITE ); tr_bandwidthDestruct( &io->bandwidth ); evbuffer_free( io->outbuf ); evbuffer_free( io->inbuf ); @@ -634,7 +634,7 @@ tr_peerIoReconnect( tr_peerIo * io ) session = tr_peerIoGetSession( io ); pendingEvents = io->pendingEvents; - event_disable( io, ~0 ); + event_disable( io, EV_READ | EV_WRITE ); if( io->socket >= 0 ) tr_netClose( session, io->socket ); -- 2.40.0