mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move the input data exhaustion loop to connection.c from daemon.c

Browse Source 
Let transport (TLS or somesuch) force reading or writing on
sockets even if the higher layers think otherwise.
This commit is contained in:
Julio Sánchez Fernández 1999-07-20 18:02:44 +00:00
parent 535cc34421
commit 76227acb1f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/connection.c
View File

@ -817,9 +817,9 @@ int connection_read(ber_socket_t s)
#define CONNECTION_INPUT_LOOP 1
#ifdef DATA_READY_LOOP
while(!rc && ber_pvt_sb_data_ready(&c->c_sb))
while(rc >= 0 && ber_pvt_sb_data_ready(&c->c_sb))
#elif CONNECTION_INPUT_LOOP
while(!rc)
while(rc >= 0)
#endif
{
rc = connection_input( c );
@ -835,6 +835,10 @@ int connection_read(ber_socket_t s)
connection_close( c );
}
if ( ber_pvt_sb_needs_read( c->c_sb ) )
slapd_set_read( s, 1 );
if ( ber_pvt_sb_needs_write( c->c_sb ) )
slapd_set_write( s, 1 );
connection_return( c );
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return 0;
@ -1054,6 +1058,10 @@ int connection_write(ber_socket_t s)
ldap_pvt_thread_cond_signal( &c->c_write_cv );
if ( ber_pvt_sb_needs_read( c->c_sb ) )
slapd_set_read( s, 1 );
if ( ber_pvt_sb_needs_write( c->c_sb ) )
slapd_set_write( s, 1 );
connection_return( c );
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return 0;