X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fresult.c;h=ebbb97c17ee0b29b12ba13fdd8223bb3416fabe6;hb=9446f8554b7173c2b73a6e7710e95c89808bbefb;hp=c99e2a84ff93a43036a1e537d1d7b30116392ca9;hpb=bb17493d31e19c47bc3a906a39ffa3d57e28aaa4;p=openldap
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index c99e2a84ff..ebbb97c17e 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -1,14 +1,22 @@
+/* result.c - wait for an ldap result */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
- * All rights reserved.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
*/
-/*---
- * This notice applies to changes, created by or for Novell, Inc.,
+/* This notice applies to changes, created by or for Novell, Inc.,
* to preexisting works for which notices appear elsewhere in this file.
*
* Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
@@ -24,17 +32,19 @@
*---
* Modification to OpenLDAP source by Novell, Inc.
* April 2000 sfs Add code to process V3 referrals and search results
- *
- * result.c - wait for an ldap result
+ *---
+ * Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License
+ * can be found in the file "build/LICENSE-2.0.1" in this distribution
+ * of OpenLDAP Software.
*/
/*
- * LDAPv3 (RFC2251)
+ * LDAPv3 (RFC 4511)
* LDAPResult ::= SEQUENCE {
- * resultCode ENUMERATED { ... },
- * matchedDN LDAPDN,
- * errorMessage LDAPString,
- * referral Referral OPTIONAL
+ * resultCode ENUMERATED { ... },
+ * matchedDN LDAPDN,
+ * diagnosticMessage LDAPString,
+ * referral [3] Referral OPTIONAL
* }
* Referral ::= SEQUENCE OF LDAPURL (one or more)
* LDAPURL ::= LDAPString (limited to URL chars)
@@ -53,18 +63,21 @@
#include
#include "ldap-int.h"
+#include "ldap_log.h"
-
-static int ldap_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid ));
+static int ldap_abandoned_idx LDAP_P(( LDAP *ld, ber_int_t msgid ));
+#define ldap_abandoned(ld, msgid) ( ldap_abandoned_idx((ld), (msgid)) > -1 )
static int ldap_mark_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid ));
static int wait4msg LDAP_P(( LDAP *ld, ber_int_t msgid, int all, struct timeval *timeout,
LDAPMessage **result ));
static ber_tag_t try_read1msg LDAP_P(( LDAP *ld, ber_int_t msgid,
- int all, Sockbuf *sb, LDAPConn *lc, LDAPMessage **result ));
+ int all, LDAPConn **lc, LDAPMessage **result ));
static ber_tag_t build_result_ber LDAP_P(( LDAP *ld, BerElement **bp, LDAPRequest *lr ));
static void merge_error_info LDAP_P(( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ));
static LDAPMessage * chkResponseList LDAP_P(( LDAP *ld, int msgid, int all));
+#define LDAP_MSG_X_KEEP_LOOKING (-2)
+
/*
* ldap_result - wait for an ldap result response to a message from the
@@ -92,35 +105,37 @@ ldap_result(
struct timeval *timeout,
LDAPMessage **result )
{
- LDAPMessage *lm;
+ LDAPMessage *lm = NULL;
+ int rc;
assert( ld != NULL );
assert( result != NULL );
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ARGS, "ldap_result msgid %d\n", msgid ));
-#else
- Debug( LDAP_DEBUG_TRACE, "ldap_result msgid %d\n", msgid, 0, 0 );
-#endif
+ Debug( LDAP_DEBUG_TRACE, "ldap_result ld %p msgid %d\n", (void *)ld, msgid, 0 );
- if( ld == NULL ) {
- return -1;
- }
-
- if( result == NULL ) {
- ld->ld_errno = LDAP_PARAM_ERROR;
- return -1;
- }
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex );
+#endif
- lm = chkResponseList(ld, msgid, all);
+#if 0
+ /* this is already done inside wait4msg(), right?... */
+ lm = chkResponseList( ld, msgid, all );
+#endif
if ( lm == NULL ) {
- return( wait4msg( ld, msgid, all, timeout, result ) );
+ rc = wait4msg( ld, msgid, all, timeout, result );
+
+ } else {
+ *result = lm;
+ ld->ld_errno = LDAP_SUCCESS;
+ rc = lm->lm_msgtype;
}
- *result = lm;
- ld->ld_errno = LDAP_SUCCESS;
- return( lm->lm_msgtype );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
+#endif
+
+ return rc;
}
static LDAPMessage *
@@ -129,43 +144,37 @@ chkResponseList(
int msgid,
int all)
{
- LDAPMessage *lm, *lastlm, *nextlm;
- /*
+ LDAPMessage *lm, **lastlm, *nextlm;
+ int cnt = 0;
+
+ /*
* Look through the list of responses we have received on
* this association and see if the response we're interested in
* is there. If it is, return it. If not, call wait4msg() to
* wait until it arrives or timeout occurs.
*/
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
- "ldap_chkResponseList for msgid=%d, all=%d\n", msgid, all ));
-#else
- Debug( LDAP_DEBUG_TRACE,
- "ldap_chkResponseList for msgid=%d, all=%d\n",
- msgid, all, 0 );
+#ifdef LDAP_R_COMPILE
+ LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
#endif
- lastlm = NULL;
+
+ Debug( LDAP_DEBUG_TRACE,
+ "ldap_chkResponseList ld %p msgid %d all %d\n",
+ (void *)ld, msgid, all );
+
+ lastlm = &ld->ld_responses;
for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) {
nextlm = lm->lm_next;
+ ++cnt;
if ( ldap_abandoned( ld, lm->lm_msgid ) ) {
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "ldap_chkResponseList msg abandoned, msgid %d\n", msgid ));
-#else
Debug( LDAP_DEBUG_TRACE,
"ldap_chkResponseList msg abandoned, msgid %d\n",
- msgid, 0, 0 );
-#endif
+ msgid, 0, 0 );
ldap_mark_abandoned( ld, lm->lm_msgid );
- if ( lastlm == NULL ) {
- /* Remove first entry in list */
- ld->ld_responses = lm->lm_next;
- } else {
- lastlm->lm_next = nextlm;
- }
+ /* Remove this entry from list */
+ *lastlm = nextlm;
ldap_msgfree( lm );
@@ -175,17 +184,18 @@ chkResponseList(
if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) {
LDAPMessage *tmp;
- if ( all == LDAP_MSG_ONE || msgid == LDAP_RES_UNSOLICITED ) {
+ if ( all == LDAP_MSG_ONE || all == LDAP_MSG_RECEIVED ||
+ msgid == LDAP_RES_UNSOLICITED )
+ {
break;
}
- for ( tmp = lm; tmp != NULL; tmp = tmp->lm_chain ) {
- if ( tmp->lm_msgtype != LDAP_RES_SEARCH_ENTRY
- && tmp->lm_msgtype != LDAP_RES_SEARCH_REFERENCE
- && tmp->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL )
- {
- break;
- }
+ tmp = lm->lm_chain_tail;
+ if ( (tmp->lm_msgtype == LDAP_RES_SEARCH_ENTRY) ||
+ (tmp->lm_msgtype == LDAP_RES_SEARCH_REFERENCE) ||
+ (tmp->lm_msgtype == LDAP_RES_INTERMEDIATE) )
+ {
+ tmp = NULL;
}
if ( tmp == NULL ) {
@@ -194,44 +204,41 @@ chkResponseList(
break;
}
- lastlm = lm;
+ lastlm = &lm->lm_next;
}
- if ( lm != NULL ) {
+#if 0
+ {
+ char buf[ BUFSIZ ];
+
+ snprintf( buf, sizeof( buf ), "ld=%p msgid=%d%s cnt=%d",
+ ld, msgid, all ? " all" : "", cnt );
+ Debug( LDAP_DEBUG_TRACE, "+++ chkResponseList %s\n", buf, 0, 0 );
+ }
+#endif
+
+ if ( lm != NULL ) {
/* Found an entry, remove it from the list */
- if ( lastlm == NULL ) {
- ld->ld_responses = (all == LDAP_MSG_ONE && lm->lm_chain != NULL
- ? lm->lm_chain : lm->lm_next);
- } else {
- lastlm->lm_next = (all == LDAP_MSG_ONE && lm->lm_chain != NULL
- ? lm->lm_chain : lm->lm_next);
- }
- if ( all == LDAP_MSG_ONE && lm->lm_chain != NULL ) {
- lm->lm_chain->lm_next = lm->lm_next;
- lm->lm_chain = NULL;
- }
- lm->lm_next = NULL;
- }
+ if ( all == LDAP_MSG_ONE && lm->lm_chain != NULL ) {
+ *lastlm = lm->lm_chain;
+ lm->lm_chain->lm_next = lm->lm_next;
+ lm->lm_chain->lm_chain_tail = ( lm->lm_chain_tail != lm ) ? lm->lm_chain_tail : lm->lm_chain;
+ lm->lm_chain = NULL;
+ lm->lm_chain_tail = NULL;
+ } else {
+ *lastlm = lm->lm_next;
+ }
+ lm->lm_next = NULL;
+ }
#ifdef LDAP_DEBUG
- if( lm == NULL) {
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_RESULTS,
- "ldap_chkResponseList returns NULL\n" ));
-#else
+ if ( lm == NULL) {
Debug( LDAP_DEBUG_TRACE,
- "ldap_chkResponseList returns NULL\n", 0, 0, 0);
-#endif
+ "ldap_chkResponseList returns ld %p NULL\n", (void *)ld, 0, 0);
} else {
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_RESULTS,
- "ldap_chkResponseList returns msgid %d, type 0x02lu\n",
- lm->lm_msgid, (unsigned long) lm->lm_msgtype ));
-#else
Debug( LDAP_DEBUG_TRACE,
- "ldap_chkResponseList returns msgid %d, type 0x%02lu\n",
- lm->lm_msgid, (unsigned long) lm->lm_msgtype, 0);
-#endif
+ "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lu\n",
+ (void *)ld, lm->lm_msgid, (unsigned long) lm->lm_msgtype );
}
#endif
return lm;
@@ -246,133 +253,174 @@ wait4msg(
LDAPMessage **result )
{
int rc;
- struct timeval tv, *tvp;
+ struct timeval tv = { 0 },
+ tv0 = { 0 },
+ *tvp;
time_t start_time = 0;
time_t tmp_time;
- LDAPConn *lc, *nextlc;
+ LDAPConn *lc;
assert( ld != NULL );
assert( result != NULL );
+#ifdef LDAP_R_COMPILE
+ LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
+#endif
+
#ifdef LDAP_DEBUG
if ( timeout == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
- "wait4msg (infinite timeout), msgid %d\n", msgid ));
-#else
- Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout), msgid %d\n",
- msgid, 0, 0 );
-#endif
+ Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n",
+ (void *)ld, msgid, 0 );
} else {
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
- "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
- (long) timeout->tv_sec, (long) timeout->tv_usec, msgid ));
-#else
- Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
- (long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
-#endif
+ Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (timeout %ld usec)\n",
+ (void *)ld, msgid, (long)timeout->tv_sec * 1000000 + timeout->tv_usec );
}
#endif /* LDAP_DEBUG */
if ( timeout == NULL ) {
tvp = NULL;
} else {
+ tv0 = *timeout;
tv = *timeout;
tvp = &tv;
start_time = time( NULL );
}
- rc = -2;
- while ( rc == -2 ) {
+ rc = LDAP_MSG_X_KEEP_LOOKING;
+ while ( rc == LDAP_MSG_X_KEEP_LOOKING ) {
#ifdef LDAP_DEBUG
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
- "wait4msg continue, msgid %d, all %d\n", msgid, all ));
-#else
- Debug( LDAP_DEBUG_TRACE, "wait4msg continue, msgid %d, all %d\n",
- msgid, all, 0 );
-#endif
if ( ldap_debug & LDAP_DEBUG_TRACE ) {
+ Debug( LDAP_DEBUG_TRACE, "wait4msg continue ld %p msgid %d all %d\n",
+ (void *)ld, msgid, all );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
ldap_dump_connection( ld, ld->ld_conns, 1 );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+ ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
+#endif
ldap_dump_requests_and_responses( ld );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
+#endif
}
#endif /* LDAP_DEBUG */
- if( (*result = chkResponseList(ld, msgid, all)) != NULL ) {
- rc = (*result)->lm_msgtype;
- } else {
+ if ( ( *result = chkResponseList( ld, msgid, all ) ) != NULL ) {
+ rc = (*result)->lm_msgtype;
+
+ } 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 = lc->lconn_next ) {
if ( ber_sockbuf_ctrl( lc->lconn_sb,
- LBER_SB_OPT_DATA_READY, NULL ) ) {
- rc = try_read1msg( ld, msgid, all, lc->lconn_sb,
- lc, result );
- break;
+ 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, 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 == NULL ) {
- rc = ldap_int_select( ld, tvp );
+ if ( !lc_ready ) {
+ rc = ldap_int_select( ld, tvp );
+#ifdef LDAP_DEBUG
+ if ( rc == -1 ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "ldap_int_select returned -1: errno %d\n",
+ sock_errno(), 0, 0 );
+ }
+#endif
+ if ( rc == 0 || ( rc == -1 && (
+ !LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART)
+ || sock_errno() != EINTR ) ) )
+ {
+ ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
+ LDAP_TIMEOUT);
+ return( rc );
+ }
-#ifdef LDAP_DEBUG
- if ( rc == -1 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ARGS,
- "wait4msg: ldap_int_select returned -1: errno %d\n",
- errno ));
-#else
- Debug( LDAP_DEBUG_TRACE,
- "ldap_int_select returned -1: errno %d\n",
- errno, 0, 0 );
+ if ( rc == -1 ) {
+ rc = LDAP_MSG_X_KEEP_LOOKING; /* select interrupted: loop */
+
+ } else {
+ rc = LDAP_MSG_X_KEEP_LOOKING;
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
#endif
- }
+ if ( ld->ld_requests &&
+ ld->ld_requests->lr_status == LDAP_REQST_WRITING &&
+ ldap_is_write_ready( ld,
+ ld->ld_requests->lr_conn->lconn_sb ) )
+ {
+ ldap_int_flush_request( ld, ld->ld_requests );
+ }
+#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 == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; )
+ {
+ 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, result );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
+#endif
+ if ( lc == NULL ) {
+ /* if lc gets free()'d,
+ * there's no guarantee
+ * lc->lconn_next is still
+ * sane; better restart
+ * (ITS#4405) */
+ lc = ld->ld_conns;
+
+ /* don't get to next conn! */
+ break;
+ }
+ }
- if ( rc == 0 || ( rc == -1 && (
- !LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART)
- || errno != EINTR )))
- {
- ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
- LDAP_TIMEOUT);
- return( rc );
- }
-
- if ( rc == -1 ) {
- rc = -2; /* select interrupted: loop */
- } else {
- rc = -2;
- for ( lc = ld->ld_conns; rc == -2 && lc != NULL;
- lc = nextlc ) {
- nextlc = lc->lconn_next;
- if ( lc->lconn_status ==
- LDAP_CONNST_CONNECTED &&
- ldap_is_read_ready( ld,
- lc->lconn_sb )) {
- rc = try_read1msg( ld, msgid, all,
- lc->lconn_sb, lc, result );
- }
- }
- }
- }
+ /* next conn */
+ lc = lc->lconn_next;
+ }
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
+#endif
+ }
+ }
}
- if ( rc == -2 && tvp != NULL ) {
+ if ( rc == LDAP_MSG_X_KEEP_LOOKING && tvp != NULL ) {
tmp_time = time( NULL );
- if (( tv.tv_sec -= ( tmp_time - start_time )) <= 0 ) {
+ tv0.tv_sec -= ( tmp_time - start_time );
+ if ( tv0.tv_sec <= 0 ) {
rc = 0; /* timed out */
ld->ld_errno = LDAP_TIMEOUT;
break;
}
+ tv.tv_sec = tv0.tv_sec;
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "wait4msg: %ld secs to go\n", (long) tv.tv_sec ));
-#else
- Debug( LDAP_DEBUG_TRACE, "wait4msg: %ld secs to go\n",
- (long) tv.tv_sec, 0, 0 );
-#endif
+ Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld secs to go\n",
+ (void *)ld, (long) tv.tv_sec, 0 );
start_time = tmp_time;
}
}
@@ -386,86 +434,100 @@ try_read1msg(
LDAP *ld,
ber_int_t msgid,
int all,
- Sockbuf *sb,
- LDAPConn *lc,
+ LDAPConn **lcp,
LDAPMessage **result )
{
BerElement *ber;
- LDAPMessage *new, *l, *prev, *tmp;
+ LDAPMessage *newmsg, *l, *prev;
ber_int_t id;
ber_tag_t tag;
ber_len_t len;
int foundit = 0;
LDAPRequest *lr, *tmplr;
+ LDAPConn *lc;
BerElement tmpber;
int rc, refer_cnt, hadref, simple_request;
ber_int_t lderr;
+
+#ifdef LDAP_CONNECTIONLESS
+ LDAPMessage *tmp = NULL, *chain_head = NULL;
+ int moremsgs = 0, isv2 = 0;
+#endif
+
/*
* v3ref = flag for V3 referral / search reference
* 0 = not a ref, 1 = sucessfully chased ref, -1 = pass ref to application
*/
- int v3ref;
+ enum {
+ V3REF_NOREF = 0,
+ V3REF_SUCCESS = 1,
+ V3REF_TOAPP = -1
+ } v3ref;
assert( ld != NULL );
- assert( lc != NULL );
+ assert( lcp != NULL );
+ assert( *lcp != NULL );
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ARGS, "read1msg: msgid %d, all %d\n",
- msgid, all ));
-#else
- Debug( LDAP_DEBUG_TRACE, "read1msg: msgid %d, all %d\n", msgid, all, 0 );
+#ifdef LDAP_R_COMPILE
+ LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
#endif
- if ( lc->lconn_ber == NULL ) {
- lc->lconn_ber = ldap_alloc_ber_with_options(ld);
+ Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n",
+ (void *)ld, msgid, all );
+
+ lc = *lcp;
+
+retry:
+ if ( lc->lconn_ber == NULL ) {
+ lc->lconn_ber = ldap_alloc_ber_with_options( ld );
if( lc->lconn_ber == NULL ) {
return -1;
}
- }
+ }
ber = lc->lconn_ber;
assert( LBER_VALID (ber) );
/* get the next message */
- errno = 0;
+ sock_errset(0);
#ifdef LDAP_CONNECTIONLESS
if ( LDAP_IS_UDP(ld) ) {
struct sockaddr from;
- ber_int_sb_read(sb, &from, sizeof(struct sockaddr));
+ ber_int_sb_read( lc->lconn_sb, &from, sizeof(struct sockaddr) );
+ if (ld->ld_options.ldo_version == LDAP_VERSION2) isv2 = 1;
}
+nextresp3:
#endif
- if ( (tag = ber_get_next( sb, &len, ber ))
- != LDAP_TAG_MESSAGE ) {
- if ( tag == LBER_DEFAULT) {
+ tag = ber_get_next( lc->lconn_sb, &len, ber );
+ switch ( tag ) {
+ case LDAP_TAG_MESSAGE:
+ /*
+ * We read a complete message.
+ * The connection should no longer need this ber.
+ */
+ lc->lconn_ber = NULL;
+ break;
+
+ case LBER_DEFAULT:
#ifdef LDAP_DEBUG
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: ber_get_next failed\n" ));
-#else
- Debug( LDAP_DEBUG_CONNS,
- "ber_get_next failed.\n", 0, 0, 0 );
-#endif
+ Debug( LDAP_DEBUG_CONNS,
+ "ber_get_next failed.\n", 0, 0, 0 );
#endif
#ifdef EWOULDBLOCK
- if (errno==EWOULDBLOCK) return -2;
+ if ( sock_errno() == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING;
#endif
#ifdef EAGAIN
- if (errno == EAGAIN) return -2;
+ if ( sock_errno() == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING;
#endif
- ld->ld_errno = LDAP_SERVER_DOWN;
- return -1;
- }
+ ld->ld_errno = LDAP_SERVER_DOWN;
+ return -1;
+
+ default:
ld->ld_errno = LDAP_LOCAL_ERROR;
return -1;
}
- /*
- * We read a complete message.
- * The connection should no longer need this ber.
- */
- lc->lconn_ber = NULL;
-
/* message id */
if ( ber_get_int( ber, &id ) == LBER_ERROR ) {
ber_free( ber, 1 );
@@ -475,34 +537,28 @@ try_read1msg(
/* if it's been abandoned, toss it */
if ( ldap_abandoned( ld, id ) ) {
+ Debug( LDAP_DEBUG_ANY, "abandoned/discarded ld %p msgid %ld\n",
+ (void *)ld, (long) id, 0);
+retry_ber:
ber_free( ber, 1 );
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: abandoned\n" ));
-#else
- Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0);
-#endif
- return( -2 ); /* continue looking */
+ if ( ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) {
+ goto retry;
+ }
+ return( LDAP_MSG_X_KEEP_LOOKING ); /* continue looking */
}
- if (( lr = ldap_find_request_by_msgid( ld, id )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: no request for response with msgid %ld (tossing)\n",
- (long) id ));
-#else
+ 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 );
-#endif
- ber_free( ber, 1 );
- return( -2 ); /* continue looking */
+ "no request for response on ld %p msgid %ld (tossing)\n",
+ (void *)ld, (long)id, 0 );
+ goto retry_ber;
}
#ifdef LDAP_CONNECTIONLESS
- if (LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
- struct berval blank;
- ber_scanf(ber, "m{", &blank);
+ if (LDAP_IS_UDP(ld) && isv2) {
+ ber_scanf(ber, "x{");
}
+nextresp2:
#endif
/* the message type */
if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) {
@@ -511,113 +567,110 @@ try_read1msg(
return( -1 );
}
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: ldap_read: message type %s msgid %ld, original id %ld\n",
- ldap_int_msgtype2str( tag ),
- (long) lr->lr_msgid, (long) lr->lr_origid ));
-#else
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 );
-#endif
+ "read1msg: ld %p msgid %ld message type %s\n",
+ (void *)ld, (long) lr->lr_msgid, ldap_int_msgtype2str( tag ));
id = lr->lr_origid;
refer_cnt = 0;
hadref = simple_request = 0;
- rc = -2; /* default is to keep looking (no response found) */
+ rc = LDAP_MSG_X_KEEP_LOOKING; /* default is to keep looking (no response found) */
lr->lr_res_msgtype = tag;
/*
* This code figures out if we are going to chase a
* referral / search reference, or pass it back to the application
*/
- v3ref = 0; /* Assume not a V3 search reference or referral */
+ v3ref = V3REF_NOREF; /* Assume not a V3 search reference/referral */
if( (tag != LDAP_RES_SEARCH_ENTRY) && (ld->ld_version > LDAP_VERSION2) ) {
BerElement tmpber = *ber; /* struct copy */
char **refs = NULL;
- if( tag == LDAP_RES_SEARCH_REFERENCE) {
+ if( tag == LDAP_RES_SEARCH_REFERENCE ) {
/* This is a V3 search reference */
- /* Assume we do not chase the reference, but pass it to application */
- v3ref = -1;
+ /* Assume we do not chase the reference,
+ * but pass it to application */
+ v3ref = V3REF_TOAPP;
if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ||
(lr->lr_parent != NULL) )
{
/* Get the referral list */
if ( ber_scanf( &tmpber, "{v}", &refs ) == LBER_ERROR ) {
rc = LDAP_DECODING_ERROR;
+
} else {
- /* Note: refs arrary is freed by ldap_chase_v3referrals */
+ /* Note: refs array is freed by ldap_chase_v3referrals */
refer_cnt = ldap_chase_v3referrals( ld, lr, refs,
1, &lr->lr_res_error, &hadref );
- if ( refer_cnt > 0 ) { /* sucessfully chased reference */
+ if ( refer_cnt > 0 ) {
+ /* sucessfully chased reference */
/* If haven't got end search, set chasing referrals */
- if( lr->lr_status != LDAP_REQST_COMPLETED) {
+ if ( lr->lr_status != LDAP_REQST_COMPLETED ) {
lr->lr_status = LDAP_REQST_CHASINGREFS;
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: search ref chased,"
- "mark request chasing refs, id = %d\n",
- lr->lr_msgid ));
-#else
Debug( LDAP_DEBUG_TRACE,
- "read1msg: search ref chased, mark request chasing refs, id = %d\n",
- lr->lr_msgid, 0, 0);
-#endif
+ "read1msg: search ref chased, "
+ "mark request chasing refs, "
+ "id = %d\n",
+ lr->lr_msgid, 0, 0);
}
- v3ref = 1; /* We sucessfully chased the reference */
+
+ /* We sucessfully chased the reference */
+ v3ref = V3REF_SUCCESS;
}
}
}
+
} else {
/* Check for V3 referral */
- ber_len_t len;
- if ( ber_scanf( &tmpber, "{iaa",/*}*/ &lderr,
- &lr->lr_res_matched, &lr->lr_res_error )
- != LBER_ERROR ) {
+ ber_len_t len;
+ char *lr_res_error = NULL;
+
+ if ( ber_scanf( &tmpber, "{eAA",/*}*/ &lderr,
+ &lr->lr_res_matched, &lr_res_error )
+ != LBER_ERROR )
+ {
+ if ( lr_res_error != NULL ) {
+ if ( lr->lr_res_error != NULL ) {
+ (void)ldap_append_referral( ld, &lr->lr_res_error, lr_res_error );
+ LDAP_FREE( (char *)lr_res_error );
+
+ } else {
+ lr->lr_res_error = lr_res_error;
+ }
+ lr_res_error = NULL;
+ }
+
/* Check if V3 referral */
- if( ber_peek_tag( &tmpber, &len) == LDAP_TAG_REFERRAL ) {
+ if ( ber_peek_tag( &tmpber, &len ) == LDAP_TAG_REFERRAL ) {
/* We have a V3 referral, assume we cannot chase it */
- v3ref = -1;
+ v3ref = V3REF_TOAPP;
if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS)
|| (lr->lr_parent != NULL) )
{
- v3ref = -1; /* Assume referral not chased and return it to app */
+ /* Assume referral not chased and return it to app */
+ v3ref = V3REF_TOAPP;
+
/* Get the referral list */
if( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) {
rc = LDAP_DECODING_ERROR;
lr->lr_status = LDAP_REQST_COMPLETED;
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: referral decode error,"
- "mark request completed, id = %d\n",
- lr->lr_msgid ));
-#else
Debug( LDAP_DEBUG_TRACE,
- "read1msg: referral decode error, mark request completed, id = %d\n",
- lr->lr_msgid, 0, 0);
-#endif
+ "read1msg: referral decode error, mark request completed, ld %p msgid %d\n",
+ (void *)ld, lr->lr_msgid, 0);
+
} else {
/* Chase the referral
* Note: refs arrary is freed by ldap_chase_v3referrals
*/
refer_cnt = ldap_chase_v3referrals( ld, lr, refs,
- 0, &lr->lr_res_error, &hadref );
+ 0, &lr->lr_res_error, &hadref );
lr->lr_status = LDAP_REQST_COMPLETED;
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: referral chased,"
- "mark request completed, id = %d\n",
- lr->lr_msgid ));
-#else
Debug( LDAP_DEBUG_TRACE,
- "read1msg: referral chased, mark request completed, id = %d\n",
- lr->lr_msgid, 0, 0);
-#endif
+ "read1msg: referral chased, mark request completed, ld %p msgid %d\n",
+ (void *)ld, lr->lr_msgid, 0);
if( refer_cnt > 0) {
- v3ref = 1; /* Referral successfully chased */
+ /* Referral successfully chased */
+ v3ref = V3REF_SUCCESS;
}
}
}
@@ -627,6 +680,7 @@ try_read1msg(
LDAP_FREE( lr->lr_res_matched );
lr->lr_res_matched = NULL;
}
+
if( lr->lr_res_error != NULL ) {
LDAP_FREE( lr->lr_res_error );
lr->lr_res_error = NULL;
@@ -639,32 +693,62 @@ try_read1msg(
* go through the following code. This code also chases V2 referrals
* and checks if all referrals have been chased.
*/
- if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref > -1) ) {
+ if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref != V3REF_TOAPP) &&
+ (tag != LDAP_RES_INTERMEDIATE ))
+ {
/* For a v3 search referral/reference, only come here if already chased it */
if ( ld->ld_version >= LDAP_VERSION2 &&
( lr->lr_parent != NULL ||
LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ) )
{
+ char *lr_res_error = NULL;
+
tmpber = *ber; /* struct copy */
- if ( v3ref == 1 ) {
- ; /* V3 search reference or V3 referral sucessfully chased */
- } else if ( ber_scanf( &tmpber, "{iaa}", &lderr,
- &lr->lr_res_matched, &lr->lr_res_error )
- != LBER_ERROR ) {
- if ( lderr != LDAP_SUCCESS ) {
+ if ( v3ref == V3REF_SUCCESS ) {
+ /* V3 search reference or V3 referral
+ * sucessfully chased. If this message
+ * is a search result, then it has no more
+ * outstanding referrals.
+ */
+ if ( tag == LDAP_RES_SEARCH_RESULT )
+ refer_cnt = 0;
+
+ } else if ( ber_scanf( &tmpber, "{eAA}", &lderr,
+ &lr->lr_res_matched, &lr_res_error )
+ != LBER_ERROR )
+ {
+ if ( lr_res_error != NULL ) {
+ if ( lr->lr_res_error != NULL ) {
+ (void)ldap_append_referral( ld, &lr->lr_res_error, lr_res_error );
+ LDAP_FREE( (char *)lr_res_error );
+ } else {
+ lr->lr_res_error = lr_res_error;
+ }
+ lr_res_error = NULL;
+ }
+
+ switch ( lderr ) {
+ case LDAP_SUCCESS:
+ case LDAP_COMPARE_TRUE:
+ case LDAP_COMPARE_FALSE:
+ break;
+
+ default:
+ if ( lr->lr_res_error == NULL
+ || lr->lr_res_error[ 0 ] == '\0' )
+ {
+ break;
+ }
+
/* referrals are in error string */
refer_cnt = ldap_chase_referrals( ld, lr,
&lr->lr_res_error, -1, &hadref );
lr->lr_status = LDAP_REQST_COMPLETED;
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: V2 referral chased,"
- "mark request completed, id = %d\n",
- lr->lr_msgid ));
-#else
Debug( LDAP_DEBUG_TRACE,
- "read1msg: V2 referral chased, mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
-#endif
+ "read1msg: V2 referral chased, "
+ "mark request completed, id = %d\n",
+ lr->lr_msgid, 0, 0 );
+ break;
}
/* save errno, message, and matched string */
@@ -672,44 +756,47 @@ try_read1msg(
lr->lr_res_errno = ( lderr ==
LDAP_PARTIAL_RESULTS ) ? LDAP_SUCCESS
: lderr;
+
} else if ( ld->ld_errno != LDAP_SUCCESS ) {
lr->lr_res_errno = ld->ld_errno;
+
} else {
lr->lr_res_errno = LDAP_PARTIAL_RESULTS;
}
-#ifdef NEW_LOGGING
-LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: new result: res_errno: %d, res_error: <%s>, res_matched: <%s>\n",
- lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
- lr->lr_res_matched ? lr->lr_res_matched : "" ));
-#else
-Debug( LDAP_DEBUG_TRACE,
- "new result: res_errno: %d, res_error: <%s>, res_matched: <%s>\n",
- lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
- lr->lr_res_matched ? lr->lr_res_matched : "" );
-#endif
+
+ Debug( LDAP_DEBUG_TRACE, "new result: "
+ "res_errno: %d, "
+ "res_error: <%s>, "
+ "res_matched: <%s>\n",
+ lr->lr_res_errno,
+ lr->lr_res_error ? lr->lr_res_error : "",
+ lr->lr_res_matched ? lr->lr_res_matched : "" );
+ }
+
+ /* in any case, don't leave any lr_res_error 'round */
+ if ( lr_res_error ) {
+ LDAP_FREE( lr_res_error );
}
}
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: %d new referrals\n", refer_cnt ));
-#else
Debug( LDAP_DEBUG_TRACE,
- "read1msg: %d new referrals\n", refer_cnt, 0, 0 );
-#endif
+ "read1msg: ld %p %d new referrals\n",
+ (void *)ld, refer_cnt, 0 );
if ( refer_cnt != 0 ) { /* chasing referrals */
ber_free( ber, 1 );
ber = NULL;
if ( refer_cnt < 0 ) {
+ ldap_return_request( ld, lr, 0 );
return( -1 ); /* fatal error */
}
lr->lr_res_errno = LDAP_SUCCESS; /* sucessfully chased referral */
+
} else {
if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) {
/* request without any referrals */
simple_request = ( hadref ? 0 : 1 );
+
} else {
/* request with referrals or child request */
ber_free( ber, 1 );
@@ -717,13 +804,9 @@ Debug( LDAP_DEBUG_TRACE,
}
lr->lr_status = LDAP_REQST_COMPLETED; /* declare this request done */
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: mark request completed, id = %d\n", lr->lr_msgid ));
-#else
Debug( LDAP_DEBUG_TRACE,
- "read1msg: mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
-#endif
+ "read1msg: mark request completed, ld %p msgid %d\n",
+ (void *)ld, lr->lr_msgid, 0);
while ( lr->lr_parent != NULL ) {
merge_error_info( ld, lr->lr_parent, lr );
@@ -735,81 +818,165 @@ Debug( LDAP_DEBUG_TRACE,
/* Check if all requests are finished, lr is now parent */
tmplr = lr;
- if (tmplr->lr_status == LDAP_REQST_COMPLETED) {
- for(tmplr=lr->lr_child; tmplr != NULL; tmplr=tmplr->lr_refnext) {
- if( tmplr->lr_status != LDAP_REQST_COMPLETED) {
- break;
- }
+ if ( tmplr->lr_status == LDAP_REQST_COMPLETED ) {
+ for ( tmplr = lr->lr_child;
+ tmplr != NULL;
+ tmplr = tmplr->lr_refnext )
+ {
+ if ( tmplr->lr_status != LDAP_REQST_COMPLETED ) break;
}
}
/* This is the parent request if the request has referrals */
- if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL && tmplr == NULL ) {
+ if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL &&
+ tmplr == NULL )
+ {
id = lr->lr_msgid;
tag = lr->lr_res_msgtype;
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: request %ld done\n", (long) id ));
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: res_errno: %d,res_error: <%s>, res_matched: <%s>\n",
- lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "",
- lr->lr_res_matched ? lr->lr_res_matched : "" ));
-#else
- Debug( LDAP_DEBUG_ANY, "request %ld done\n",
- (long) id, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "request done: ld %p msgid %ld\n",
+ (void *)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 : "",
lr->lr_res_matched ? lr->lr_res_matched : "" );
-#endif
if ( !simple_request ) {
ber_free( ber, 1 );
ber = NULL;
if ( build_result_ber( ld, &ber, lr )
- == LBER_ERROR ) {
+ == LBER_ERROR )
+ {
rc = -1; /* fatal error */
}
}
- ldap_free_request( ld, lr );
+ ldap_return_request( ld, lr, 1 );
+ lr = NULL;
}
if ( lc != NULL ) {
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
+#endif
ldap_free_connection( ld, lc, 0, 1 );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
+#endif
+ lc = *lcp = NULL;
}
}
}
+ if ( lr != NULL ) {
+ ldap_return_request( ld, lr, 0 );
+ lr = NULL;
+ }
+
if ( ber == NULL ) {
return( rc );
}
/* make a new ldap message */
- if ( (new = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) ))
- == NULL ) {
+ newmsg = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) );
+ if ( newmsg == NULL ) {
ld->ld_errno = LDAP_NO_MEMORY;
return( -1 );
}
- new->lm_msgid = (int)id;
- new->lm_msgtype = tag;
- new->lm_ber = ber;
+ newmsg->lm_msgid = (int)id;
+ newmsg->lm_msgtype = tag;
+ newmsg->lm_ber = ber;
+ newmsg->lm_chain_tail = newmsg;
-#ifndef LDAP_NOCACHE
- if ( ld->ld_cache != NULL ) {
- ldap_add_result_to_cache( ld, new );
+#ifdef LDAP_CONNECTIONLESS
+ /* CLDAP replies all fit in a single datagram. In LDAPv2 RFC1798
+ * the responses are all a sequence wrapped in one message. In
+ * LDAPv3 each response is in its own message. The datagram must
+ * end with a SearchResult. We can't just parse each response in
+ * separate calls to try_read1msg because the header info is only
+ * present at the beginning of the datagram, not at the beginning
+ * of each response. So parse all the responses at once and queue
+ * them up, then pull off the first response to return to the
+ * caller when all parsing is complete.
+ */
+ if ( LDAP_IS_UDP(ld) ) {
+ /* If not a result, look for more */
+ if ( tag != LDAP_RES_SEARCH_RESULT ) {
+ int ok = 0;
+ moremsgs = 1;
+ if (isv2) {
+ /* LDAPv2: dup the current ber, skip past the current
+ * response, and see if there are any more after it.
+ */
+ ber = ber_dup( ber );
+ ber_scanf( ber, "x" );
+ if (ber_peek_tag(ber, &len) != LBER_DEFAULT) {
+ /* There's more - dup the ber buffer so they can all be
+ * individually freed by ldap_msgfree.
+ */
+ struct berval bv;
+ ber_get_option(ber, LBER_OPT_BER_REMAINING_BYTES, &len);
+ bv.bv_val = LDAP_MALLOC(len);
+ if (bv.bv_val) {
+ ok=1;
+ ber_read(ber, bv.bv_val, len);
+ bv.bv_len = len;
+ ber_init2(ber, &bv, ld->ld_lberoptions );
+ }
+ }
+ } else {
+ /* LDAPv3: Just allocate a new ber. Since this is a buffered
+ * datagram, if the sockbuf is readable we still have data
+ * to parse.
+ */
+ ber = ldap_alloc_ber_with_options( ld );
+ if ( ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) ok = 1;
+ }
+ /* set up response chain */
+ if ( tmp == NULL ) {
+ newmsg->lm_next = ld->ld_responses;
+ ld->ld_responses = newmsg;
+ chain_head = newmsg;
+ } else {
+ tmp->lm_chain = newmsg;
+ }
+ chain_head->lm_chain_tail = newmsg;
+ tmp = newmsg;
+ /* "ok" means there's more to parse */
+ if (ok) {
+ if (isv2) goto nextresp2;
+ else goto nextresp3;
+ } else {
+ /* got to end of datagram without a SearchResult. Free
+ * our dup'd ber, but leave any buffer alone. For v2 case,
+ * the previous response is still using this buffer. For v3,
+ * the new ber has no buffer to free yet.
+ */
+ ber_free(ber, 0);
+ return -1;
+ }
+ } else if ( moremsgs ) {
+ /* got search result, and we had multiple responses in 1 datagram.
+ * stick the result onto the end of the chain, and then pull the
+ * first response off the head of the chain.
+ */
+ tmp->lm_chain = newmsg;
+ chain_head->lm_chain_tail = newmsg;
+ *result = chkResponseList( ld, msgid, all );
+ ld->ld_errno = LDAP_SUCCESS;
+ return( (*result)->lm_msgtype );
}
-#endif /* LDAP_NOCACHE */
+ }
+#endif /* LDAP_CONNECTIONLESS */
/* is this the one we're looking for? */
if ( msgid == LDAP_RES_ANY || id == msgid ) {
if ( all == LDAP_MSG_ONE
- || (new->lm_msgtype != LDAP_RES_SEARCH_RESULT
- && new->lm_msgtype != LDAP_RES_SEARCH_ENTRY
- && new->lm_msgtype != LDAP_RES_SEARCH_REFERENCE) ) {
- *result = new;
+ || (newmsg->lm_msgtype != LDAP_RES_SEARCH_RESULT
+ && newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY
+ && newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE) ) {
+ *result = newmsg;
ld->ld_errno = LDAP_SUCCESS;
return( tag );
- } else if ( new->lm_msgtype == LDAP_RES_SEARCH_RESULT) {
+ } else if ( newmsg->lm_msgtype == LDAP_RES_SEARCH_RESULT) {
foundit = 1; /* return the chain later */
}
}
@@ -822,7 +989,7 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
prev = NULL;
for ( l = ld->ld_responses; l != NULL; l = l->lm_next ) {
- if ( l->lm_msgid == new->lm_msgid )
+ if ( l->lm_msgid == newmsg->lm_msgid )
break;
prev = l;
}
@@ -830,33 +997,21 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
/* not part of an existing search response */
if ( l == NULL ) {
if ( foundit ) {
- *result = new;
- ld->ld_errno = LDAP_SUCCESS;
- return( tag );
+ *result = newmsg;
+ goto exit;
}
- new->lm_next = ld->ld_responses;
- ld->ld_responses = new;
- return( -2 ); /* continue looking */
+ newmsg->lm_next = ld->ld_responses;
+ ld->ld_responses = newmsg;
+ goto exit;
}
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: adding response id %ld type %ld\n",
- (long) new->lm_msgid, (long) new->lm_msgtype ));
-#else
- Debug( LDAP_DEBUG_TRACE, "adding response id %ld type %ld:\n",
- (long) new->lm_msgid, (long) new->lm_msgtype, 0 );
-#endif
+ Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %ld type %ld:\n",
+ (void *)ld, (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype );
/* part of a search response - add to end of list of entries */
- for ( tmp = l; (tmp->lm_chain != NULL) &&
- ((tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY) ||
- (tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE) ||
- (tmp->lm_chain->lm_msgtype == LDAP_RES_EXTENDED_PARTIAL ));
- tmp = tmp->lm_chain )
- ; /* NULL */
- tmp->lm_chain = new;
+ l->lm_chain_tail->lm_chain = newmsg;
+ l->lm_chain_tail = newmsg;
/* return the whole chain if that's what we were looking for */
if ( foundit ) {
@@ -865,22 +1020,17 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
else
prev->lm_next = l->lm_next;
*result = l;
+ }
+
+exit:
+ if ( foundit ) {
ld->ld_errno = LDAP_SUCCESS;
-#ifdef LDAP_WORLD_P16
- /*
- * XXX questionable fix; see text for [P16] on
- * http://www.critical-angle.com/ldapworld/patch/
- *
- * inclusion of this patch causes searchs to hang on
- * multiple platforms
- */
- return( l->lm_msgtype );
-#else /* LDAP_WORLD_P16 */
return( tag );
-#endif /* !LDAP_WORLD_P16 */
}
-
- return( -2 ); /* continue looking */
+ if ( lc && ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) {
+ goto retry;
+ }
+ return( LDAP_MSG_X_KEEP_LOOKING ); /* continue looking */
}
@@ -901,10 +1051,10 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
}
if ( ber_printf( ber, "{it{ess}}", lr->lr_msgid,
- lr->lr_res_msgtype, lr->lr_res_errno,
- lr->lr_res_matched ? lr->lr_res_matched : "",
- lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) {
-
+ lr->lr_res_msgtype, lr->lr_res_errno,
+ lr->lr_res_matched ? lr->lr_res_matched : "",
+ lr->lr_res_error ? lr->lr_res_error : "" ) == -1 )
+ {
ld->ld_errno = LDAP_ENCODING_ERROR;
ber_free(ber, 1);
return( LBER_ERROR );
@@ -918,7 +1068,7 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
return( LBER_ERROR );
}
- if ( ber_get_int( ber, &along ) == LBER_ERROR ) {
+ if ( ber_get_enum( ber, &along ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
ber_free(ber, 1);
return( LBER_ERROR );
@@ -937,27 +1087,29 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
}
-static void
-merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr )
-{
/*
* Merge error information in "lr" with "parentr" error code and string.
*/
+static void
+merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr )
+{
if ( lr->lr_res_errno == LDAP_PARTIAL_RESULTS ) {
parentr->lr_res_errno = lr->lr_res_errno;
if ( lr->lr_res_error != NULL ) {
(void)ldap_append_referral( ld, &parentr->lr_res_error,
lr->lr_res_error );
}
+
} else if ( lr->lr_res_errno != LDAP_SUCCESS &&
- parentr->lr_res_errno == LDAP_SUCCESS ) {
+ parentr->lr_res_errno == LDAP_SUCCESS )
+ {
parentr->lr_res_errno = lr->lr_res_errno;
if ( parentr->lr_res_error != NULL ) {
LDAP_FREE( parentr->lr_res_error );
}
parentr->lr_res_error = lr->lr_res_error;
lr->lr_res_error = NULL;
- if ( LDAP_NAME_ERROR( lr->lr_res_errno )) {
+ if ( LDAP_NAME_ERROR( lr->lr_res_errno ) ) {
if ( parentr->lr_res_matched != NULL ) {
LDAP_FREE( parentr->lr_res_matched );
}
@@ -966,21 +1118,12 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr )
}
}
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_DETAIL1,
- "read1msg: merged parent (id %d) error info: result errno %d, "
- "error <%s>, matched <%s>\n", parentr->lr_msgid,
- parentr->lr_res_errno, parentr->lr_res_error ?
- parentr->lr_res_error : "", parentr->lr_res_matched ?
- parentr->lr_res_matched : "" ));
-#else
Debug( LDAP_DEBUG_TRACE, "merged parent (id %d) error info: ",
- parentr->lr_msgid, 0, 0 );
+ parentr->lr_msgid, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "result errno %d, error <%s>, matched <%s>\n",
- parentr->lr_res_errno, parentr->lr_res_error ?
- parentr->lr_res_error : "", parentr->lr_res_matched ?
- parentr->lr_res_matched : "" );
-#endif
+ parentr->lr_res_errno,
+ parentr->lr_res_error ? parentr->lr_res_error : "",
+ parentr->lr_res_matched ? parentr->lr_res_matched : "" );
}
@@ -989,7 +1132,7 @@ int
ldap_msgtype( LDAPMessage *lm )
{
assert( lm != NULL );
- return ( lm != NULL ) ? lm->lm_msgtype : -1;
+ return ( lm != NULL ) ? (int)lm->lm_msgtype : -1;
}
@@ -1010,7 +1153,7 @@ char * ldap_int_msgtype2str( ber_tag_t tag )
case LDAP_RES_COMPARE: return "compare";
case LDAP_RES_DELETE: return "delete";
case LDAP_RES_EXTENDED: return "extended-result";
- case LDAP_RES_EXTENDED_PARTIAL: return "extended-partial";
+ case LDAP_RES_INTERMEDIATE: return "intermediate";
case LDAP_RES_MODIFY: return "modify";
case LDAP_RES_RENAME: return "rename";
case LDAP_RES_SEARCH_ENTRY: return "search-entry";
@@ -1026,11 +1169,7 @@ ldap_msgfree( LDAPMessage *lm )
LDAPMessage *next;
int type = 0;
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ENTRY, "ldap_msgfree\n" ));
-#else
Debug( LDAP_DEBUG_TRACE, "ldap_msgfree\n", 0, 0, 0 );
-#endif
for ( ; lm != NULL; lm = next ) {
next = lm->lm_chain;
@@ -1039,7 +1178,7 @@ ldap_msgfree( LDAPMessage *lm )
LDAP_FREE( (char *) lm );
}
- return( type );
+ return type;
}
/*
@@ -1051,74 +1190,124 @@ int
ldap_msgdelete( LDAP *ld, int msgid )
{
LDAPMessage *lm, *prev;
+ int rc = 0;
assert( ld != NULL );
-#ifdef NEW_LOGGING
- LDAP_LOG (( "result", LDAP_LEVEL_ENTRY, "ldap_msgdelete\n" ));
-#else
- Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete\n", 0, 0, 0 );
-#endif
+ Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete ld=%p msgid=%d\n",
+ (void *)ld, msgid, 0 );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex );
+#endif
prev = NULL;
for ( lm = ld->ld_responses; lm != NULL; lm = lm->lm_next ) {
- if ( lm->lm_msgid == msgid )
+ if ( lm->lm_msgid == msgid ) {
break;
+ }
prev = lm;
}
- if ( lm == NULL )
- return( -1 );
-
- if ( prev == NULL )
- ld->ld_responses = lm->lm_next;
- else
- prev->lm_next = lm->lm_next;
+ if ( lm == NULL ) {
+ rc = -1;
- if ( ldap_msgfree( lm ) == LDAP_RES_SEARCH_ENTRY )
- return( -1 );
+ } else {
+ if ( prev == NULL ) {
+ ld->ld_responses = lm->lm_next;
+ } else {
+ prev->lm_next = lm->lm_next;
+ }
+ }
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
+#endif
+ if ( lm && ldap_msgfree( lm ) == LDAP_RES_SEARCH_ENTRY ) {
+ rc = -1;
+ }
- return( 0 );
+ return rc;
}
/*
- * return 1 if message msgid is waiting to be abandoned, 0 otherwise
+ * ldap_abandoned_idx
+ *
+ * return the location of the message id in the array of abandoned
+ * message ids, or -1
+ *
+ * expects ld_res_mutex to be locked
*/
static int
-ldap_abandoned( LDAP *ld, ber_int_t msgid )
+ldap_abandoned_idx( LDAP *ld, ber_int_t msgid )
{
- int i;
+ int begin,
+ end;
- if ( ld->ld_abandoned == NULL )
- return( 0 );
+#ifdef LDAP_R_COMPILE
+ LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
+#endif
- for ( i = 0; ld->ld_abandoned[i] != -1; i++ )
- if ( ld->ld_abandoned[i] == msgid )
- return( 1 );
+ assert( ld->ld_nabandoned >= 0 );
- return( 0 );
-}
+ if ( ld->ld_abandoned == NULL || ld->ld_nabandoned == 0 ) {
+ return -1;
+ }
+ begin = 0;
+ end = ld->ld_nabandoned - 1;
+ /* use bisection */
+ if ( msgid < ld->ld_abandoned[ begin ] ) {
+ return -1;
+ }
+
+ if ( msgid > ld->ld_abandoned[ end ] ) {
+ return -1;
+ }
+
+ while ( end >= begin ) {
+ int pos = (begin + end)/2;
+ int curid = ld->ld_abandoned[ pos ];
+
+ if ( msgid < curid ) {
+ end = pos - 1;
+
+ } else if ( msgid > curid ) {
+ begin = pos + 1;
+
+ } else {
+ return pos;
+ }
+ }
+
+ /* not abandoned */
+ return -1;
+}
+
+/*
+ * ldap_mark_abandoned
+ *
+ * expects ld_res_mutex to be locked
+ */
static int
ldap_mark_abandoned( LDAP *ld, ber_int_t msgid )
{
- int i;
+ int i, idx;
- if ( ld->ld_abandoned == NULL )
- return( -1 );
-
- for ( i = 0; ld->ld_abandoned[i] != -1; i++ )
- if ( ld->ld_abandoned[i] == msgid )
- break;
+#ifdef LDAP_R_COMPILE
+ LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
+#endif
- if ( ld->ld_abandoned[i] == -1 )
- return( -1 );
+ idx = ldap_abandoned_idx( ld, msgid );
+ if ( idx == -1 ) {
+ return -1;
+ }
- for ( ; ld->ld_abandoned[i] != -1; i++ ) {
- ld->ld_abandoned[i] = ld->ld_abandoned[i + 1];
+ --ld->ld_nabandoned;
+ assert( ld->ld_nabandoned >= 0 );
+ for ( i = idx; i < ld->ld_nabandoned; i++ ) {
+ ld->ld_abandoned[ i ] = ld->ld_abandoned[ i + 1 ];
}
- return( 0 );
+ return 0;
}