#include "slapd-common.h"
-#define LOOPS 100
-#define RETRIES 0
-
static char *
get_add_entry( char *filename, LDAPMod ***mods );
static void
-do_addel( char *uri, char *manager, struct berval *passwd,
- char *dn, LDAPMod **attrs, int maxloop, int maxretries, int delay,
- int friendly, int chaserefs );
+do_addel( struct tester_conn_args *config,
+ char *dn, LDAPMod **attrs, int friendly );
static void
-usage( char *name )
+usage( char *name, char opt )
{
- fprintf( stderr,
- "usage: %s "
- "-H <uri> | ([-h <host>] -p <port>) "
- "-D <manager> "
- "-w <passwd> "
+ if ( opt ) {
+ fprintf( stderr, "%s: unable to handle option \'%c\'\n\n",
+ name, opt );
+ }
+
+ fprintf( stderr, "usage: %s " TESTER_COMMON_HELP
"-f <addfile> "
- "[-i <ignore>] "
- "[-l <loops>] "
- "[-L <outerloops>] "
- "[-r <maxretries>] "
- "[-t <delay>] "
- "[-F] "
- "[-C]\n",
- name );
+ "[-F]\n",
+ name );
exit( EXIT_FAILURE );
}
main( int argc, char **argv )
{
int i;
- char *host = "localhost";
- char *uri = NULL;
- int port = -1;
- char *manager = NULL;
- struct berval passwd = { 0, NULL };
char *filename = NULL;
char *entry = NULL;
- int loops = LOOPS;
- int outerloops = 1;
- int retries = RETRIES;
- int delay = 0;
int friendly = 0;
- int chaserefs = 0;
LDAPMod **attrs = NULL;
+ struct tester_conn_args *config;
- tester_init( "slapd-addel", TESTER_ADDEL );
+ config = tester_init( "slapd-addel", TESTER_ADDEL );
- while ( ( i = getopt( argc, argv, "CD:Ff:H:h:i:L:l:p:r:t:w:" ) ) != EOF )
+ while ( ( i = getopt( argc, argv, TESTER_COMMON_OPTS "Ff:" ) ) != EOF )
{
switch ( i ) {
- case 'C':
- chaserefs++;
- break;
-
case 'F':
friendly++;
break;
- case 'H': /* the server's URI */
- uri = strdup( optarg );
- break;
-
- case 'h': /* the servers host */
- host = strdup( optarg );
- break;
-
case 'i':
/* ignored (!) by now */
break;
- case 'p': /* the servers port */
- if ( lutil_atoi( &port, optarg ) != 0 ) {
- usage( argv[0] );
- }
- break;
-
- case 'D': /* the servers manager */
- manager = strdup( optarg );
- break;
-
- case 'w': /* the server managers password */
- passwd.bv_val = strdup( optarg );
- passwd.bv_len = strlen( optarg );
- memset( optarg, '*', passwd.bv_len );
- break;
-
case 'f': /* file with entry search request */
filename = strdup( optarg );
break;
- case 'l': /* the number of loops */
- if ( lutil_atoi( &loops, optarg ) != 0 ) {
- usage( argv[0] );
- }
- break;
-
- case 'L': /* the number of outerloops */
- if ( lutil_atoi( &outerloops, optarg ) != 0 ) {
- usage( argv[0] );
- }
- break;
-
- case 'r': /* number of retries */
- if ( lutil_atoi( &retries, optarg ) != 0 ) {
- usage( argv[0] );
- }
- break;
-
- case 't': /* delay in seconds */
- if ( lutil_atoi( &delay, optarg ) != 0 ) {
- usage( argv[0] );
- }
- break;
-
default:
- usage( argv[0] );
+ if ( tester_config_opt( config, i, optarg ) == LDAP_SUCCESS ) {
+ break;
+ }
+ usage( argv[0], i );
break;
}
}
- if (( filename == NULL ) || ( port == -1 && uri == NULL ) ||
- ( manager == NULL ) || ( passwd.bv_val == NULL ))
- usage( argv[0] );
+ if ( filename == NULL )
+ usage( argv[0], 0 );
entry = get_add_entry( filename, &attrs );
if (( entry == NULL ) || ( *entry == '\0' )) {
}
- uri = tester_uri( uri, host, port );
+ tester_config_finish( config );
- for ( i = 0; i < outerloops; i++ ) {
- do_addel( uri, manager, &passwd, entry, attrs,
- loops, retries, delay, friendly, chaserefs );
+ for ( i = 0; i < config->outerloops; i++ ) {
+ do_addel( config, entry, attrs, friendly );
}
exit( EXIT_SUCCESS );
static void
do_addel(
- char *uri,
- char *manager,
- struct berval *passwd,
+ struct tester_conn_args *config,
char *entry,
LDAPMod **attrs,
- int maxloop,
- int maxretries,
- int delay,
- int friendly,
- int chaserefs )
+ int friendly )
{
LDAP *ld = NULL;
- int i = 0, do_retry = maxretries;
+ int i = 0, do_retry = config->retries;
int rc = LDAP_SUCCESS;
- int version = LDAP_VERSION3;
retry:;
- ldap_initialize( &ld, uri );
if ( ld == NULL ) {
- tester_perror( "ldap_initialize", NULL );
- exit( EXIT_FAILURE );
+ tester_init_ld( &ld, config, 0 );
}
- (void) ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
- (void) ldap_set_option( ld, LDAP_OPT_REFERRALS,
- chaserefs ? LDAP_OPT_ON : LDAP_OPT_OFF );
-
- if ( do_retry == maxretries ) {
+ if ( do_retry == config->retries ) {
fprintf( stderr, "PID=%ld - Add/Delete(%d): entry=\"%s\".\n",
- (long) pid, maxloop, entry );
- }
-
- rc = ldap_sasl_bind_s( ld, manager, LDAP_SASL_SIMPLE, passwd, NULL, NULL, NULL );
- if ( rc != LDAP_SUCCESS ) {
- tester_ldap_error( ld, "ldap_sasl_bind_s", NULL );
- switch ( rc ) {
- case LDAP_BUSY:
- case LDAP_UNAVAILABLE:
- if ( do_retry > 0 ) {
- do_retry--;
- if ( delay != 0 ) {
- sleep( delay );
- }
- goto retry;
- }
- /* fallthru */
- default:
- break;
- }
- exit( EXIT_FAILURE );
+ (long) pid, config->loops, entry );
}
- for ( ; i < maxloop; i++ ) {
+ for ( ; i < config->loops; i++ ) {
/* add the entry */
rc = ldap_add_ext_s( ld, entry, attrs, NULL, NULL );
projects / openldap / blobdiff