upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 01:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop the read callback on a dead connection.

Browse source 
The connection might be ready to read (close) but if we can't destroy it
yet, we don't want the callback to trigger all the time or process new
data.
This commit is contained in:
Ondřej Kuzník 2017-05-09 16:24:14 +01:00 committed by Ondřej Kuzník
parent 6899d0123d
commit 8eb7f3fbca
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
servers/lloadd/client.c
View file

@ -35,6 +35,11 @@ client_read_cb( evutil_socket_t s, short what, void *arg )
ber_len_t len;
CONNECTION_LOCK(c);
if ( !c->c_live ) {
event_del( c->c_read_event );
CONNECTION_UNLOCK(c);
return;
}
Debug( LDAP_DEBUG_CONNS, "client_read_cb: "
"connection %lu ready to read\n",
@ -61,6 +66,8 @@ client_read_cb( evutil_socket_t s, short what, void *arg )
c->c_currentber = NULL;
ber_free( ber, 1 );
event_del( c->c_read_event );
CLIENT_DESTROY(c);
return;
}

7
servers/lloadd/upstream.c
View file

@ -488,6 +488,11 @@ upstream_read_cb( evutil_socket_t s, short what, void *arg )
ber_len_t len;
CONNECTION_LOCK(c);
if ( !c->c_live ) {
event_del( c->c_read_event );
CONNECTION_UNLOCK(c);
return;
}
Debug( LDAP_DEBUG_CONNS, "upstream_read_cb: "
"connection %lu ready to read\n",
c->c_connid );
@ -513,6 +518,8 @@ upstream_read_cb( evutil_socket_t s, short what, void *arg )
c->c_currentber = NULL;
ber_free( ber, 1 );
event_del( c->c_read_event );
UPSTREAM_DESTROY(c);
return;
}