}
lc->lconn_status = LDAP_CONNST_CONNECTED;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
lc->lconn_next = ld->ld_conns;
ld->ld_conns = lc;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
/*
* XXX for now, we always do a synchronous bind. This will have
LDAPConn *lc;
LDAPURLDesc *lcu, *lsu;
int lcu_port, lsu_port;
+ int found = 0;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
for ( lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next ) {
lcu = lc->lconn_server;
lcu_port = ldap_pvt_url_scheme_port( lcu->lud_scheme,
lsu_port = ldap_pvt_url_scheme_port( lsu->lud_scheme,
lsu->lud_port );
- if ( strcmp( lcu->lud_scheme, lsu->lud_scheme ) == 0
+ if ( lsu_port == lcu_port
+ && strcmp( lcu->lud_scheme, lsu->lud_scheme ) == 0
&& lcu->lud_host != NULL && *lcu->lud_host != '\0'
&& lsu->lud_host != NULL && *lsu->lud_host != '\0'
- && strcasecmp( lsu->lud_host, lcu->lud_host ) == 0
- && lsu_port == lcu_port )
+ && strcasecmp( lsu->lud_host, lcu->lud_host ) == 0 )
{
- return lc;
+ found = 1;
+ break;
}
if ( !any ) break;
}
+ if ( found )
+ break;
}
-
- return NULL;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
+ return lc;
}
ldap_int_sasl_close( ld, lc );
prevlc = NULL;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
for ( tmplc = ld->ld_conns;
tmplc != NULL;
tmplc = tmplc->lconn_next )
}
prevlc = tmplc;
}
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
ldap_free_urllist( lc->lconn_server );
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
if ( lc->lconn_krbinstance != NULL ) {
LDAPConn *lc;
char timebuf[32];
- fprintf( stderr, "** Connection%s:\n", all ? "s" : "" );
+ fprintf( stderr, "** ld %p Connection%s:\n", ld, all ? "s" : "" );
for ( lc = lconns; lc != NULL; lc = lc->lconn_next ) {
if ( lc->lconn_server != NULL ) {
fprintf( stderr, "* host: %s port: %d%s\n",
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
#endif
- fprintf( stderr, "** Outstanding Requests:\n" );
+ fprintf( stderr, "** ld %p Outstanding Requests:\n", ld );
if (( lr = ld->ld_requests ) == NULL ) {
fprintf( stderr, " Empty\n" );
}
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
#endif
- fprintf( stderr, "** Response Queue:\n" );
+ fprintf( stderr, "** ld %p Response Queue:\n", ld );
if (( lm = ld->ld_responses ) == NULL ) {
fprintf( stderr, " Empty\n" );
}
assert( ld != NULL );
assert( result != NULL );
- Debug( LDAP_DEBUG_TRACE, "ldap_result msgid %d\n", msgid, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "ldap_result ld %p msgid %d\n", ld, msgid, 0 );
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex );
*/
Debug( LDAP_DEBUG_TRACE,
- "ldap_chkResponseList for msgid=%d, all=%d\n",
- msgid, all, 0 );
+ "ldap_chkResponseList ld %p msgid %d all %d\n",
+ ld, msgid, all );
lastlm = &ld->ld_responses;
for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) {
nextlm = lm->lm_next;
#ifdef LDAP_DEBUG
if( lm == NULL) {
Debug( LDAP_DEBUG_TRACE,
- "ldap_chkResponseList returns NULL\n", 0, 0, 0);
+ "ldap_chkResponseList returns ld %p NULL\n", ld, 0, 0);
} else {
Debug( LDAP_DEBUG_TRACE,
- "ldap_chkResponseList returns msgid %d, type 0x%02lu\n",
- lm->lm_msgid, (unsigned long) lm->lm_msgtype, 0);
+ "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lu\n",
+ ld, lm->lm_msgid, (unsigned long) lm->lm_msgtype);
}
#endif
return lm;
#ifdef LDAP_DEBUG
if ( timeout == NULL ) {
- Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout), msgid %d\n",
- msgid, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n",
+ ld, msgid, 0 );
} else {
- Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
- (long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
+ Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (timeout %ld usec)\n",
+ ld, msgid, (long)timeout->tv_sec * 1000000 + timeout->tv_usec );
}
#endif /* LDAP_DEBUG */
while ( rc == -2 ) {
#ifdef LDAP_DEBUG
if ( ldap_debug & LDAP_DEBUG_TRACE ) {
- Debug( LDAP_DEBUG_TRACE, "wait4msg continue, msgid %d, all %d\n",
- msgid, all, 0 );
+ Debug( LDAP_DEBUG_TRACE, "wait4msg continue ld %p msgid %d all %d\n",
+ ld, msgid, all );
ldap_dump_connection( ld, ld->ld_conns, 1 );
ldap_dump_requests_and_responses( ld );
}
} else {
int lc_ready = 0;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
for ( lc = ld->ld_conns; lc != NULL; lc = nextlc ) {
nextlc = lc->lconn_next;
if ( ber_sockbuf_ctrl( lc->lconn_sb,
LBER_SB_OPT_DATA_READY, NULL ) ) {
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
rc = try_read1msg( ld, msgid, all, lc->lconn_sb,
&lc, result );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
lc_ready = 1;
break;
}
- }
+ }
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
if ( !lc_ready ) {
rc = ldap_int_select( ld, tvp );
}
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
#endif
for ( lc = ld->ld_conns; rc == -2 && lc != NULL;
lc = nextlc )
if ( lc->lconn_status == LDAP_CONNST_CONNECTED &&
ldap_is_read_ready( ld, lc->lconn_sb ))
{
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
rc = try_read1msg( ld, msgid, all,
lc->lconn_sb, &lc, result );
if ( lc == NULL ) lc = nextlc;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
}
}
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
}
}
}
}
tv.tv_sec = tv0.tv_sec;
- Debug( LDAP_DEBUG_TRACE, "wait4msg: %ld secs to go\n",
- (long) tv.tv_sec, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld secs to go\n",
+ ld, (long) tv.tv_sec, 0 );
start_time = tmp_time;
}
}
assert( lcp != NULL );
assert( *lcp != NULL );
- Debug( LDAP_DEBUG_TRACE, "read1msg: msgid %d, all %d\n", msgid, all, 0 );
+ Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n", ld, msgid, all );
lc = *lcp;
/* if it's been abandoned, toss it */
if ( ldap_abandoned( ld, id ) ) {
- Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0);
+ Debug( LDAP_DEBUG_ANY, "abandoned ld %p msgid %ld\n",
+ ld, (long) id, 0);
retry_ber:
ber_free( ber, 1 );
if ( ber_sockbuf_ctrl( sb, LBER_SB_OPT_DATA_READY, NULL ) ) {
lr = ldap_find_request_by_msgid( ld, id );
if ( lr == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "no request for response with msgid %ld (tossing)\n",
- (long) id, 0, 0 );
+ "no request for response on ld %p msgid %ld (tossing)\n",
+ ld, (long) id, 0 );
goto retry_ber;
}
#ifdef LDAP_CONNECTIONLESS
}
Debug( LDAP_DEBUG_TRACE,
- "ldap_read: message type %s msgid %ld, original id %ld\n",
- ldap_int_msgtype2str( tag ),
- (long) lr->lr_msgid, (long) lr->lr_origid );
+ "read1msg: ld %p msgid %ld message type %s\n",
+ ld, (long) lr->lr_msgid, ldap_int_msgtype2str( tag ));
id = lr->lr_origid;
refer_cnt = 0;
rc = LDAP_DECODING_ERROR;
lr->lr_status = LDAP_REQST_COMPLETED;
Debug( LDAP_DEBUG_TRACE,
- "read1msg: referral decode error, mark request completed, id = %d\n",
- lr->lr_msgid, 0, 0);
+ "read1msg: referral decode error, mark request completed, ld %p msgid %d\n",
+ ld, lr->lr_msgid, 0);
} else {
/* Chase the referral
* Note: refs arrary is freed by ldap_chase_v3referrals
0, &lr->lr_res_error, &hadref );
lr->lr_status = LDAP_REQST_COMPLETED;
Debug( LDAP_DEBUG_TRACE,
- "read1msg: referral chased, mark request completed, id = %d\n",
- lr->lr_msgid, 0, 0);
+ "read1msg: referral chased, mark request completed, ld %p msgid %d\n",
+ ld, lr->lr_msgid, 0);
if( refer_cnt > 0) {
/* Referral successfully chased */
v3ref = V3REF_SUCCESS;
}
Debug( LDAP_DEBUG_TRACE,
- "read1msg: %d new referrals\n", refer_cnt, 0, 0 );
+ "read1msg: ld %p %d new referrals\n", ld, refer_cnt, 0 );
if ( refer_cnt != 0 ) { /* chasing referrals */
ber_free( ber, 1 );
lr->lr_status = LDAP_REQST_COMPLETED; /* declare this request done */
Debug( LDAP_DEBUG_TRACE,
- "read1msg: mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
+ "read1msg: mark request completed, ld %p msgid %d\n", ld, lr->lr_msgid, 0);
while ( lr->lr_parent != NULL ) {
merge_error_info( ld, lr->lr_parent, lr );
{
id = lr->lr_msgid;
tag = lr->lr_res_msgtype;
- Debug( LDAP_DEBUG_ANY, "request %ld done\n",
- (long) id, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "request done: ld %p msgid %ld\n",
+ ld, (long) id, 0 );
Debug( LDAP_DEBUG_TRACE,
"res_errno: %d, res_error: <%s>, res_matched: <%s>\n",
lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
goto exit;
}
- Debug( LDAP_DEBUG_TRACE, "adding response id %ld type %ld:\n",
- (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype, 0 );
+ Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %ld type %ld:\n",
+ ld, (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype );
/* part of a search response - add to end of list of entries */
l->lm_chain_tail->lm_chain = newmsg;