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

Split client/upstream PDU size limits

Browse source
This commit is contained in:
Ondřej Kuzník 2017-06-13 19:32:35 +01:00 committed by Ondřej Kuzník
parent 3fa8a0cdf2
commit 495dfa69a2
7 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/man/man5/lloadd.conf.5
View file

@ -251,12 +251,13 @@ The (absolute) name of a file that will hold the
server's process ID (see
.BR getpid (2)).
.TP
.B sockbuf_max_incoming <integer>
Specify the maximum incoming LDAP PDU size for anonymous sessions.
.B sockbuf_max_incoming_client <integer>
Specify the maximum LDAP PDU size accepted coming from clients.
The default is 262143.
.TP
.B sockbuf_max_incoming_auth <integer>
Specify the maximum incoming LDAP PDU size for authenticated sessions.
.B sockbuf_max_incoming_upstream <integer>
Specify the maximum LDAP PDU size accepted coming from upstream
connections.
The default is 4194303.
.TP
.B tcp-buffer [listener=<URL>] [{read|write}=]<size>

5
servers/lloadd/client.c
View file

@ -268,6 +268,11 @@ client_init(
c = connection_init( s, peername, flags );
{
ber_len_t max = sockbuf_max_incoming_client;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
c->c_state = SLAP_C_READY;
event = event_new( base, s, EV_READ|EV_PERSIST, client_read_cb, c );

12
servers/lloadd/config.c
View file

@ -71,8 +71,8 @@ static char *logfileName;
lload_features_t lload_features;
ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT;
ber_len_t sockbuf_max_incoming_auth = SLAP_SB_MAX_INCOMING_AUTH;
ber_len_t sockbuf_max_incoming_client = SLAP_SB_MAX_INCOMING_CLIENT;
ber_len_t sockbuf_max_incoming_upstream = SLAP_SB_MAX_INCOMING_UPSTREAM;
int slap_conn_max_pdus_per_cycle = SLAP_CONN_MAX_PDUS_PER_CYCLE_DEFAULT;
@ -203,13 +203,13 @@ static ConfigTable config_back_cf_table[] = {
ARG_MAGIC,
&config_restrict,
},
{ "sockbuf_max_incoming", "max", 2, 2, 0,
{ "sockbuf_max_incoming_client", "max", 2, 2, 0,
ARG_BER_LEN_T,
&sockbuf_max_incoming,
&sockbuf_max_incoming_client,
},
{ "sockbuf_max_incoming_auth", "max", 2, 2, 0,
{ "sockbuf_max_incoming_upstream", "max", 2, 2, 0,
ARG_BER_LEN_T,
&sockbuf_max_incoming_auth,
&sockbuf_max_incoming_upstream,
},
{ "tcp-buffer", "[listener=<listener>] [{read|write}=]size", 0, 0, 0,
#ifdef LDAP_TCP_BUFFER

5
servers/lloadd/connection.c
View file

@ -107,11 +107,6 @@ connection_init( ber_socket_t s, const char *peername, int flags )
c->c_sb = ber_sockbuf_alloc();
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_FD, &s );
{
ber_len_t max = sockbuf_max_incoming;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
#ifdef LDAP_PF_LOCAL
if ( flags & CONN_IS_IPC ) {
#ifdef LDAP_DEBUG

4
servers/lloadd/proto-slap.h
View file

@ -227,8 +227,8 @@ LDAP_SLAPD_F (int) slap_zn_wlock( void *, void * );
LDAP_SLAPD_F (int) slap_zn_wunlock( void *, void * );
#endif
LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming;
LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming_auth;
LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming_client;
LDAP_SLAPD_V (ber_len_t) sockbuf_max_incoming_upstream;
LDAP_SLAPD_V (int) slap_conn_max_pdus_per_cycle;
LDAP_SLAPD_V (lload_features_t) lload_features;

4
servers/lloadd/slap.h
View file

@ -84,8 +84,8 @@ LDAP_BEGIN_DECL
#define SLAP_MAX_WORKER_THREADS ( 16 )
#define SLAP_SB_MAX_INCOMING_DEFAULT ( ( 1 << 18 ) - 1 )
#define SLAP_SB_MAX_INCOMING_AUTH ( ( 1 << 24 ) - 1 )
#define SLAP_SB_MAX_INCOMING_CLIENT ( ( 1 << 18 ) - 1 )
#define SLAP_SB_MAX_INCOMING_UPSTREAM ( ( 1 << 24 ) - 1 )
#define SLAP_CONN_MAX_PDUS_PER_CYCLE_DEFAULT 10

5
servers/lloadd/upstream.c
View file

@ -818,6 +818,11 @@ upstream_init( ber_socket_t s, Backend *b )
c = connection_init( s, b->b_host, flags );
c->c_private = b;
{
ber_len_t max = sockbuf_max_incoming_upstream;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
event = event_new( base, s, EV_WRITE, upstream_write_cb, c );
if ( !event ) {
Debug( LDAP_DEBUG_ANY, "upstream_init: "