version 1.124, 2006/03/24 00:18:36
|
version 1.124.2.24, 2011/01/03 22:00:53
|
Line 1
|
Line 1
|
/* result.c - wait for an ldap result */ |
/* result.c - wait for an ldap result */ |
/* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.123 2006/02/14 22:18:12 kurt Exp $ */ |
/* $OpenLDAP$ */ |
/* This work is part of OpenLDAP Software <http://www.openldap.org/>. |
/* This work is part of OpenLDAP Software <http://www.openldap.org/>. |
* |
* |
* Copyright 1998-2006 The OpenLDAP Foundation. |
* Copyright 1998-2010 The OpenLDAP Foundation. |
* All rights reserved. |
* All rights reserved. |
* |
* |
* Redistribution and use in source and binary forms, with or without |
* Redistribution and use in source and binary forms, with or without |
Line 37
|
Line 37
|
* can be found in the file "build/LICENSE-2.0.1" in this distribution |
* can be found in the file "build/LICENSE-2.0.1" in this distribution |
* of OpenLDAP Software. |
* of OpenLDAP Software. |
*/ |
*/ |
/* Portions Copyright (C) The Internet Society (1997) |
|
* ASN.1 fragments are from RFC 2251; see RFC for full legal notices. |
|
*/ |
|
|
|
/* |
/* |
* LDAPv3 (RFC2251) |
* LDAPv3 (RFC 4511) |
* LDAPResult ::= SEQUENCE { |
* LDAPResult ::= SEQUENCE { |
* resultCode ENUMERATED { ... }, |
* resultCode ENUMERATED { ... }, |
* matchedDN LDAPDN, |
* matchedDN LDAPDN, |
* errorMessage LDAPString, |
* diagnosticMessage LDAPString, |
* referral Referral OPTIONAL |
* referral [3] Referral OPTIONAL |
* } |
* } |
* Referral ::= SEQUENCE OF LDAPURL (one or more) |
* Referral ::= SEQUENCE OF LDAPURL (one or more) |
* LDAPURL ::= LDAPString (limited to URL chars) |
* LDAPURL ::= LDAPString (limited to URL chars) |
*/ |
*/ |
|
|
#include "portable.h" |
#include "portable.h" |
Line 67
|
Line 64
|
|
|
#include "ldap-int.h" |
#include "ldap-int.h" |
#include "ldap_log.h" |
#include "ldap_log.h" |
|
#include "lutil.h" |
|
|
static int ldap_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid )); |
static int ldap_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid, int *idx )); |
static int ldap_mark_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid )); |
static int ldap_mark_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid, int idx )); |
static int wait4msg LDAP_P(( LDAP *ld, ber_int_t msgid, int all, struct timeval *timeout, |
static int wait4msg LDAP_P(( LDAP *ld, ber_int_t msgid, int all, struct timeval *timeout, |
LDAPMessage **result )); |
LDAPMessage **result )); |
static ber_tag_t try_read1msg LDAP_P(( LDAP *ld, ber_int_t msgid, |
static ber_tag_t try_read1msg LDAP_P(( LDAP *ld, ber_int_t msgid, |
int all, 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 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 void merge_error_info LDAP_P(( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr )); |
static LDAPMessage * chkResponseList LDAP_P(( LDAP *ld, int msgid, int all)); |
static LDAPMessage * chkResponseList LDAP_P(( LDAP *ld, int msgid, int all)); |
Line 94 static LDAPMessage * chkResponseList LDA
|
Line 92 static LDAPMessage * chkResponseList LDA
|
* search references, followed by an ldap result). An extension to |
* search references, followed by an ldap result). An extension to |
* LDAPv3 allows partial extended responses to be returned in response |
* LDAPv3 allows partial extended responses to be returned in response |
* to any request. The type of the first message received is returned. |
* to any request. The type of the first message received is returned. |
* When waiting, any messages that have been abandoned are discarded. |
* When waiting, any messages that have been abandoned/discarded are |
|
* discarded. |
* |
* |
* Example: |
* Example: |
* ldap_result( s, msgid, all, timeout, result ) |
* ldap_result( s, msgid, all, timeout, result ) |
Line 107 ldap_result(
|
Line 106 ldap_result(
|
struct timeval *timeout, |
struct timeval *timeout, |
LDAPMessage **result ) |
LDAPMessage **result ) |
{ |
{ |
LDAPMessage *lm; |
int rc; |
int rc; |
|
|
|
assert( ld != NULL ); |
assert( ld != NULL ); |
assert( result != NULL ); |
assert( result != NULL ); |
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_result ld %p msgid %d\n", (void *)ld, msgid, 0 ); |
Debug( LDAP_DEBUG_TRACE, "ldap_result ld %p msgid %d\n", (void *)ld, msgid, 0 ); |
|
|
#ifdef LDAP_R_COMPILE |
LDAP_MUTEX_LOCK( &ld->ld_res_mutex ); |
ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex ); |
rc = wait4msg( ld, msgid, all, timeout, result ); |
#endif |
LDAP_MUTEX_UNLOCK( &ld->ld_res_mutex ); |
lm = chkResponseList(ld, msgid, all); |
|
|
|
if ( lm == NULL ) { |
return rc; |
rc = wait4msg( ld, msgid, all, timeout, result ); |
|
} else { |
|
*result = lm; |
|
ld->ld_errno = LDAP_SUCCESS; |
|
rc = lm->lm_msgtype; |
|
} |
|
#ifdef LDAP_R_COMPILE |
|
ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex ); |
|
#endif |
|
return( rc ); |
|
} |
} |
|
|
static LDAPMessage * |
static LDAPMessage * |
Line 140 chkResponseList(
|
Line 127 chkResponseList(
|
int all) |
int all) |
{ |
{ |
LDAPMessage *lm, **lastlm, *nextlm; |
LDAPMessage *lm, **lastlm, *nextlm; |
/* |
int cnt = 0; |
|
|
|
/* |
* Look through the list of responses we have received on |
* Look through the list of responses we have received on |
* this association and see if the response we're interested in |
* this association and see if the response we're interested in |
* is there. If it is, return it. If not, call wait4msg() to |
* is there. If it is, return it. If not, call wait4msg() to |
* wait until it arrives or timeout occurs. |
* wait until it arrives or timeout occurs. |
*/ |
*/ |
|
|
|
LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); |
|
|
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"ldap_chkResponseList ld %p msgid %d all %d\n", |
"ldap_chkResponseList ld %p msgid %d all %d\n", |
(void *)ld, msgid, all ); |
(void *)ld, msgid, all ); |
|
|
lastlm = &ld->ld_responses; |
lastlm = &ld->ld_responses; |
for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) { |
for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) { |
|
int idx; |
|
|
nextlm = lm->lm_next; |
nextlm = lm->lm_next; |
|
++cnt; |
|
|
if ( ldap_abandoned( ld, lm->lm_msgid ) ) { |
if ( ldap_abandoned( ld, lm->lm_msgid, &idx ) ) { |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_ANY, |
"ldap_chkResponseList msg abandoned, msgid %d\n", |
"response list msg abandoned, " |
msgid, 0, 0 ); |
"msgid %d message type %s\n", |
ldap_mark_abandoned( ld, lm->lm_msgid ); |
lm->lm_msgid, ldap_int_msgtype2str( lm->lm_msgtype ), 0 ); |
|
|
|
switch ( lm->lm_msgtype ) { |
|
case LDAP_RES_SEARCH_ENTRY: |
|
case LDAP_RES_SEARCH_REFERENCE: |
|
case LDAP_RES_INTERMEDIATE: |
|
break; |
|
|
|
default: |
|
/* there's no need to keep the id |
|
* in the abandoned list any longer */ |
|
ldap_mark_abandoned( ld, lm->lm_msgid, idx ); |
|
break; |
|
} |
|
|
/* Remove this entry from list */ |
/* Remove this entry from list */ |
*lastlm = nextlm; |
*lastlm = nextlm; |
Line 171 chkResponseList(
|
Line 179 chkResponseList(
|
if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) { |
if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) { |
LDAPMessage *tmp; |
LDAPMessage *tmp; |
|
|
if ( all == LDAP_MSG_ONE || all == LDAP_MSG_RECEIVED || |
if ( all == LDAP_MSG_ONE || |
msgid == LDAP_RES_UNSOLICITED ) { |
all == LDAP_MSG_RECEIVED || |
|
msgid == LDAP_RES_UNSOLICITED ) |
|
{ |
break; |
break; |
} |
} |
|
|
tmp = lm->lm_chain_tail; |
tmp = lm->lm_chain_tail; |
if ((tmp->lm_msgtype == LDAP_RES_SEARCH_ENTRY) || |
if ( tmp->lm_msgtype == LDAP_RES_SEARCH_ENTRY || |
(tmp->lm_msgtype == LDAP_RES_SEARCH_REFERENCE) || |
tmp->lm_msgtype == LDAP_RES_SEARCH_REFERENCE || |
(tmp->lm_msgtype == LDAP_RES_INTERMEDIATE)) { |
tmp->lm_msgtype == LDAP_RES_INTERMEDIATE ) |
|
{ |
tmp = NULL; |
tmp = NULL; |
} |
} |
|
|
Line 192 chkResponseList(
|
Line 203 chkResponseList(
|
lastlm = &lm->lm_next; |
lastlm = &lm->lm_next; |
} |
} |
|
|
if ( lm != NULL ) { |
if ( lm != NULL ) { |
/* Found an entry, remove it from the list */ |
/* Found an entry, remove it from the list */ |
if ( all == LDAP_MSG_ONE && lm->lm_chain != NULL ) { |
if ( all == LDAP_MSG_ONE && lm->lm_chain != NULL ) { |
*lastlm = lm->lm_chain; |
*lastlm = lm->lm_chain; |
lm->lm_chain->lm_next = lm->lm_next; |
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->lm_chain_tail = ( lm->lm_chain_tail != lm ) ? lm->lm_chain_tail : lm->lm_chain; |
lm->lm_chain = NULL; |
lm->lm_chain = NULL; |
lm->lm_chain_tail = NULL; |
lm->lm_chain_tail = NULL; |
} else { |
} else { |
*lastlm = lm->lm_next; |
*lastlm = lm->lm_next; |
} |
} |
lm->lm_next = NULL; |
lm->lm_next = NULL; |
} |
} |
|
|
#ifdef LDAP_DEBUG |
#ifdef LDAP_DEBUG |
if( lm == NULL) { |
if ( lm == NULL) { |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"ldap_chkResponseList returns ld %p NULL\n", (void *)ld, 0, 0); |
"ldap_chkResponseList returns ld %p NULL\n", (void *)ld, 0, 0); |
} else { |
} else { |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"ldap_chkResponseList returns ld %p msgid %d, type 0x%02lu\n", |
"ldap_chkResponseList returns ld %p msgid %d, type 0x%02lx\n", |
(void *)ld, lm->lm_msgid, (unsigned long) lm->lm_msgtype); |
(void *)ld, lm->lm_msgid, (unsigned long)lm->lm_msgtype ); |
} |
} |
#endif |
#endif |
return lm; |
|
|
return lm; |
} |
} |
|
|
static int |
static int |
Line 230 wait4msg(
|
Line 242 wait4msg(
|
int rc; |
int rc; |
struct timeval tv = { 0 }, |
struct timeval tv = { 0 }, |
tv0 = { 0 }, |
tv0 = { 0 }, |
*tvp; |
start_time_tv = { 0 }, |
time_t start_time = 0; |
*tvp = NULL; |
time_t tmp_time; |
LDAPConn *lc; |
LDAPConn *lc, *nextlc; |
|
|
|
assert( ld != NULL ); |
assert( ld != NULL ); |
assert( result != NULL ); |
assert( result != NULL ); |
|
|
|
LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); |
|
|
|
if ( timeout == NULL && ld->ld_options.ldo_tm_api.tv_sec >= 0 ) { |
|
tv = ld->ld_options.ldo_tm_api; |
|
timeout = &tv; |
|
} |
|
|
#ifdef LDAP_DEBUG |
#ifdef LDAP_DEBUG |
if ( timeout == NULL ) { |
if ( timeout == NULL ) { |
Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n", |
Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n", |
Line 248 wait4msg(
|
Line 266 wait4msg(
|
} |
} |
#endif /* LDAP_DEBUG */ |
#endif /* LDAP_DEBUG */ |
|
|
if ( timeout == NULL ) { |
if ( timeout != NULL && timeout->tv_sec != -1 ) { |
tvp = NULL; |
|
} else { |
|
tv0 = *timeout; |
tv0 = *timeout; |
tv = *timeout; |
tv = *timeout; |
tvp = &tv; |
tvp = &tv; |
start_time = time( NULL ); |
#ifdef HAVE_GETTIMEOFDAY |
|
gettimeofday( &start_time_tv, NULL ); |
|
#else /* ! HAVE_GETTIMEOFDAY */ |
|
time( &start_time_tv.tv_sec ); |
|
start_time_tv.tv_usec = 0; |
|
#endif /* ! HAVE_GETTIMEOFDAY */ |
} |
} |
|
|
rc = LDAP_MSG_X_KEEP_LOOKING; |
rc = LDAP_MSG_X_KEEP_LOOKING; |
Line 263 wait4msg(
|
Line 284 wait4msg(
|
if ( ldap_debug & LDAP_DEBUG_TRACE ) { |
if ( ldap_debug & LDAP_DEBUG_TRACE ) { |
Debug( LDAP_DEBUG_TRACE, "wait4msg continue ld %p msgid %d all %d\n", |
Debug( LDAP_DEBUG_TRACE, "wait4msg continue ld %p msgid %d all %d\n", |
(void *)ld, msgid, all ); |
(void *)ld, msgid, all ); |
|
LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); |
ldap_dump_connection( ld, ld->ld_conns, 1 ); |
ldap_dump_connection( ld, ld->ld_conns, 1 ); |
|
LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); |
|
LDAP_MUTEX_LOCK( &ld->ld_req_mutex ); |
ldap_dump_requests_and_responses( ld ); |
ldap_dump_requests_and_responses( ld ); |
|
LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); |
} |
} |
#endif /* LDAP_DEBUG */ |
#endif /* LDAP_DEBUG */ |
|
|
if ( (*result = chkResponseList(ld, msgid, all)) != NULL ) { |
if ( ( *result = chkResponseList( ld, msgid, all ) ) != NULL ) { |
rc = (*result)->lm_msgtype; |
rc = (*result)->lm_msgtype; |
|
|
} else { |
} else { |
int lc_ready = 0; |
int lc_ready = 0; |
|
|
#ifdef LDAP_R_COMPILE |
LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); |
ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); |
for ( lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next ) { |
#endif |
|
for ( lc = ld->ld_conns; lc != NULL; lc = nextlc ) { |
|
nextlc = lc->lconn_next; |
|
if ( ber_sockbuf_ctrl( lc->lconn_sb, |
if ( ber_sockbuf_ctrl( lc->lconn_sb, |
LBER_SB_OPT_DATA_READY, NULL ) ) { |
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; |
lc_ready = 1; |
break; |
break; |
} |
} |
} |
} |
#ifdef LDAP_R_COMPILE |
LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); |
ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); |
|
#endif |
|
|
|
if ( !lc_ready ) { |
if ( !lc_ready ) { |
|
int err; |
rc = ldap_int_select( ld, tvp ); |
rc = ldap_int_select( ld, tvp ); |
#ifdef LDAP_DEBUG |
|
if ( rc == -1 ) { |
if ( rc == -1 ) { |
|
err = sock_errno(); |
|
#ifdef LDAP_DEBUG |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"ldap_int_select returned -1: errno %d\n", |
"ldap_int_select returned -1: errno %d\n", |
errno, 0, 0 ); |
err, 0, 0 ); |
} |
|
#endif |
#endif |
|
} |
|
|
if ( rc == 0 || ( rc == -1 && ( |
if ( rc == 0 || ( rc == -1 && ( |
!LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) |
!LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) |
|| errno != EINTR ))) |
|| err != EINTR ) ) ) |
{ |
{ |
ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : |
ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : |
LDAP_TIMEOUT); |
LDAP_TIMEOUT); |
Line 317 wait4msg(
|
Line 333 wait4msg(
|
|
|
if ( rc == -1 ) { |
if ( rc == -1 ) { |
rc = LDAP_MSG_X_KEEP_LOOKING; /* select interrupted: loop */ |
rc = LDAP_MSG_X_KEEP_LOOKING; /* select interrupted: loop */ |
|
|
} else { |
} else { |
rc = LDAP_MSG_X_KEEP_LOOKING; |
lc_ready = 1; |
#ifdef LDAP_R_COMPILE |
} |
ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); |
} |
#endif |
if ( lc_ready ) { |
if ( ld->ld_requests && |
LDAPConn *lnext; |
ld->ld_requests->lr_status == LDAP_REQST_WRITING && |
rc = LDAP_MSG_X_KEEP_LOOKING; |
ldap_is_write_ready( ld, |
LDAP_MUTEX_LOCK( &ld->ld_req_mutex ); |
ld->ld_requests->lr_conn->lconn_sb ) ) |
if ( ld->ld_requests && |
{ |
ld->ld_requests->lr_status == LDAP_REQST_WRITING && |
ldap_int_flush_request( ld, ld->ld_requests ); |
ldap_is_write_ready( ld, |
} |
ld->ld_requests->lr_conn->lconn_sb ) ) |
#ifdef LDAP_R_COMPILE |
{ |
ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); |
ldap_int_flush_request( ld, ld->ld_requests ); |
ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); |
} |
#endif |
LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); |
for ( lc = ld->ld_conns; rc == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; |
LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); |
lc = nextlc ) |
for ( lc = ld->ld_conns; |
|
rc == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; |
|
lc = lnext ) |
|
{ |
|
if ( lc->lconn_status == LDAP_CONNST_CONNECTED && |
|
ldap_is_read_ready( ld, lc->lconn_sb ) ) |
{ |
{ |
nextlc = lc->lconn_next; |
/* Don't let it get freed out from under us */ |
if ( lc->lconn_status == LDAP_CONNST_CONNECTED && |
++lc->lconn_refcnt; |
ldap_is_read_ready( ld, lc->lconn_sb )) |
LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); |
{ |
rc = try_read1msg( ld, msgid, all, lc, result ); |
#ifdef LDAP_R_COMPILE |
lnext = lc->lconn_next; |
ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); |
|
#endif |
/* Only take locks if we're really freeing */ |
rc = try_read1msg( ld, msgid, all, &lc, result ); |
if ( lc->lconn_refcnt <= 1 ) { |
if ( lc == NULL ) lc = nextlc; |
LDAP_MUTEX_LOCK( &ld->ld_req_mutex ); |
#ifdef LDAP_R_COMPILE |
ldap_free_connection( ld, lc, 0, 1 ); |
ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); |
LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); |
#endif |
} else { |
|
--lc->lconn_refcnt; |
} |
} |
|
LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); |
|
} else { |
|
lnext = lc->lconn_next; |
} |
} |
#ifdef LDAP_R_COMPILE |
|
ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); |
|
#endif |
|
} |
} |
|
LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); |
} |
} |
} |
} |
|
|
if ( rc == LDAP_MSG_X_KEEP_LOOKING && tvp != NULL ) { |
if ( rc == LDAP_MSG_X_KEEP_LOOKING && tvp != NULL ) { |
tmp_time = time( NULL ); |
struct timeval curr_time_tv = { 0 }, |
tv0.tv_sec -= ( tmp_time - start_time ); |
delta_time_tv = { 0 }; |
if ( tv0.tv_sec <= 0 ) { |
|
rc = 0; /* timed out */ |
#ifdef HAVE_GETTIMEOFDAY |
|
gettimeofday( &curr_time_tv, NULL ); |
|
#else /* ! HAVE_GETTIMEOFDAY */ |
|
time( &curr_time_tv.tv_sec ); |
|
curr_time_tv.tv_usec = 0; |
|
#endif /* ! HAVE_GETTIMEOFDAY */ |
|
|
|
/* delta_time = tmp_time - start_time */ |
|
delta_time_tv.tv_sec = curr_time_tv.tv_sec - start_time_tv.tv_sec; |
|
delta_time_tv.tv_usec = curr_time_tv.tv_usec - start_time_tv.tv_usec; |
|
if ( delta_time_tv.tv_usec < 0 ) { |
|
delta_time_tv.tv_sec--; |
|
delta_time_tv.tv_usec += 1000000; |
|
} |
|
|
|
/* tv0 < delta_time ? */ |
|
if ( ( tv0.tv_sec < delta_time_tv.tv_sec ) || |
|
( ( tv0.tv_sec == delta_time_tv.tv_sec ) && ( tv0.tv_usec < delta_time_tv.tv_usec ) ) ) |
|
{ |
|
rc = 0; /* timed out */ |
ld->ld_errno = LDAP_TIMEOUT; |
ld->ld_errno = LDAP_TIMEOUT; |
break; |
break; |
} |
} |
|
|
|
/* tv0 -= delta_time */ |
|
tv0.tv_sec -= delta_time_tv.tv_sec; |
|
tv0.tv_usec -= delta_time_tv.tv_usec; |
|
if ( tv0.tv_usec < 0 ) { |
|
tv0.tv_sec--; |
|
tv0.tv_usec += 1000000; |
|
} |
|
|
tv.tv_sec = tv0.tv_sec; |
tv.tv_sec = tv0.tv_sec; |
|
tv.tv_usec = tv0.tv_usec; |
|
|
Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld secs to go\n", |
Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld s %ld us to go\n", |
(void *)ld, (long) tv.tv_sec, 0 ); |
(void *)ld, (long) tv.tv_sec, (long) tv.tv_usec ); |
start_time = tmp_time; |
|
|
start_time_tv.tv_sec = curr_time_tv.tv_sec; |
|
start_time_tv.tv_usec = curr_time_tv.tv_usec; |
} |
} |
} |
} |
|
|
Line 382 try_read1msg(
|
Line 437 try_read1msg(
|
LDAP *ld, |
LDAP *ld, |
ber_int_t msgid, |
ber_int_t msgid, |
int all, |
int all, |
LDAPConn **lcp, |
LDAPConn *lc, |
LDAPMessage **result ) |
LDAPMessage **result ) |
{ |
{ |
BerElement *ber; |
BerElement *ber; |
LDAPMessage *newmsg, *l, *prev; |
LDAPMessage *newmsg, *l, *prev; |
ber_int_t id; |
ber_int_t id; |
|
int idx; |
ber_tag_t tag; |
ber_tag_t tag; |
ber_len_t len; |
ber_len_t len; |
int foundit = 0; |
int foundit = 0; |
LDAPRequest *lr, *tmplr; |
LDAPRequest *lr, *tmplr, dummy_lr = { 0 }; |
LDAPConn *lc; |
|
BerElement tmpber; |
BerElement tmpber; |
int rc, refer_cnt, hadref, simple_request; |
int rc, refer_cnt, hadref, simple_request, err; |
ber_int_t lderr; |
ber_int_t lderr; |
|
|
#ifdef LDAP_CONNECTIONLESS |
#ifdef LDAP_CONNECTIONLESS |
Line 402 try_read1msg(
|
Line 457 try_read1msg(
|
int moremsgs = 0, isv2 = 0; |
int moremsgs = 0, isv2 = 0; |
#endif |
#endif |
|
|
/* |
|
* v3ref = flag for V3 referral / search reference |
|
* 0 = not a ref, 1 = sucessfully chased ref, -1 = pass ref to application |
|
*/ |
|
enum { |
|
V3REF_NOREF = 0, |
|
V3REF_SUCCESS = 1, |
|
V3REF_TOAPP = -1 |
|
} v3ref; |
|
|
|
assert( ld != NULL ); |
assert( ld != NULL ); |
assert( lcp != NULL ); |
assert( lc != NULL ); |
assert( *lcp != NULL ); |
|
|
|
|
LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); |
|
|
Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n", |
Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n", |
(void *)ld, msgid, all ); |
(void *)ld, msgid, all ); |
|
|
lc = *lcp; |
|
|
|
retry: |
retry: |
if ( lc->lconn_ber == NULL ) { |
if ( lc->lconn_ber == NULL ) { |
lc->lconn_ber = ldap_alloc_ber_with_options(ld); |
lc->lconn_ber = ldap_alloc_ber_with_options( ld ); |
|
|
if( lc->lconn_ber == NULL ) { |
if ( lc->lconn_ber == NULL ) { |
return -1; |
return -1; |
} |
} |
} |
} |
Line 434 retry:
|
Line 478 retry:
|
assert( LBER_VALID (ber) ); |
assert( LBER_VALID (ber) ); |
|
|
/* get the next message */ |
/* get the next message */ |
errno = 0; |
sock_errset(0); |
#ifdef LDAP_CONNECTIONLESS |
#ifdef LDAP_CONNECTIONLESS |
if ( LDAP_IS_UDP(ld) ) { |
if ( LDAP_IS_UDP(ld) ) { |
struct sockaddr from; |
struct sockaddr from; |
ber_int_sb_read( lc->lconn_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; |
if ( ld->ld_options.ldo_version == LDAP_VERSION2 ) isv2 = 1; |
} |
} |
nextresp3: |
nextresp3: |
#endif |
#endif |
tag = ber_get_next( lc->lconn_sb, &len, ber ); |
tag = ber_get_next( lc->lconn_sb, &len, ber ); |
if ( tag == LDAP_TAG_MESSAGE ) { |
switch ( tag ) { |
|
case LDAP_TAG_MESSAGE: |
/* |
/* |
* We read a complete message. |
* We read a complete message. |
* The connection should no longer need this ber. |
* The connection should no longer need this ber. |
*/ |
*/ |
lc->lconn_ber = NULL; |
lc->lconn_ber = NULL; |
} |
break; |
if ( tag != LDAP_TAG_MESSAGE ) { |
|
if ( tag == LBER_DEFAULT) { |
case LBER_DEFAULT: |
|
err = sock_errno(); |
#ifdef LDAP_DEBUG |
#ifdef LDAP_DEBUG |
Debug( LDAP_DEBUG_CONNS, |
Debug( LDAP_DEBUG_CONNS, |
"ber_get_next failed.\n", 0, 0, 0 ); |
"ber_get_next failed.\n", 0, 0, 0 ); |
#endif |
#endif |
#ifdef EWOULDBLOCK |
#ifdef EWOULDBLOCK |
if (errno==EWOULDBLOCK) return LDAP_MSG_X_KEEP_LOOKING; |
if ( err == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING; |
#endif |
#endif |
#ifdef EAGAIN |
#ifdef EAGAIN |
if (errno == EAGAIN) return LDAP_MSG_X_KEEP_LOOKING; |
if ( err == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING; |
#endif |
#endif |
ld->ld_errno = LDAP_SERVER_DOWN; |
ld->ld_errno = LDAP_SERVER_DOWN; |
return -1; |
--lc->lconn_refcnt; |
} |
lc->lconn_status = 0; |
|
return -1; |
|
|
|
default: |
ld->ld_errno = LDAP_LOCAL_ERROR; |
ld->ld_errno = LDAP_LOCAL_ERROR; |
return -1; |
return -1; |
} |
} |
Line 477 nextresp3:
|
Line 526 nextresp3:
|
return( -1 ); |
return( -1 ); |
} |
} |
|
|
|
/* id == 0 iff unsolicited notification message (RFC 4511) */ |
|
|
|
/* id < 0 is invalid, just toss it. FIXME: should we disconnect? */ |
|
if ( id < 0 ) { |
|
goto retry_ber; |
|
} |
|
|
/* if it's been abandoned, toss it */ |
/* if it's been abandoned, toss it */ |
if ( ldap_abandoned( ld, id ) ) { |
if ( id > 0 ) { |
Debug( LDAP_DEBUG_ANY, "abandoned ld %p msgid %ld\n", |
if ( ldap_abandoned( ld, id, &idx ) ) { |
(void *)ld, (long) id, 0); |
/* the message type */ |
|
tag = ber_peek_tag( ber, &len ); |
|
switch ( tag ) { |
|
case LDAP_RES_SEARCH_ENTRY: |
|
case LDAP_RES_SEARCH_REFERENCE: |
|
case LDAP_RES_INTERMEDIATE: |
|
case LBER_ERROR: |
|
break; |
|
|
|
default: |
|
/* there's no need to keep the id |
|
* in the abandoned list any longer */ |
|
ldap_mark_abandoned( ld, id, idx ); |
|
break; |
|
} |
|
|
|
Debug( LDAP_DEBUG_ANY, |
|
"abandoned/discarded ld %p msgid %d message type %s\n", |
|
(void *)ld, id, ldap_int_msgtype2str( tag ) ); |
|
|
retry_ber: |
retry_ber: |
ber_free( ber, 1 ); |
ber_free( ber, 1 ); |
if ( ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) { |
if ( ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) { |
goto retry; |
goto retry; |
|
} |
|
return( LDAP_MSG_X_KEEP_LOOKING ); /* continue looking */ |
|
} |
|
|
|
lr = ldap_find_request_by_msgid( ld, id ); |
|
if ( lr == NULL ) { |
|
const char *msg = "unknown"; |
|
|
|
/* the message type */ |
|
tag = ber_peek_tag( ber, &len ); |
|
switch ( tag ) { |
|
case LBER_ERROR: |
|
break; |
|
|
|
default: |
|
msg = ldap_int_msgtype2str( tag ); |
|
break; |
|
} |
|
|
|
Debug( LDAP_DEBUG_ANY, |
|
"no request for response on ld %p msgid %d message type %s (tossing)\n", |
|
(void *)ld, id, msg ); |
|
|
|
goto retry_ber; |
} |
} |
return( LDAP_MSG_X_KEEP_LOOKING ); /* continue looking */ |
|
} |
|
|
|
lr = ldap_find_request_by_msgid( ld, id ); |
|
if ( lr == NULL ) { |
|
Debug( LDAP_DEBUG_ANY, |
|
"no request for response on ld %p msgid %ld (tossing)\n", |
|
(void *)ld, (long) id, 0 ); |
|
goto retry_ber; |
|
} |
|
#ifdef LDAP_CONNECTIONLESS |
#ifdef LDAP_CONNECTIONLESS |
if (LDAP_IS_UDP(ld) && isv2) { |
if ( LDAP_IS_UDP(ld) && isv2 ) { |
ber_scanf(ber, "x{"); |
ber_scanf(ber, "x{"); |
} |
} |
nextresp2: |
nextresp2: |
|
; |
#endif |
#endif |
|
} |
|
|
/* the message type */ |
/* the message type */ |
if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) { |
tag = ber_peek_tag( ber, &len ); |
|
if ( tag == LBER_ERROR ) { |
ld->ld_errno = LDAP_DECODING_ERROR; |
ld->ld_errno = LDAP_DECODING_ERROR; |
ber_free( ber, 1 ); |
ber_free( ber, 1 ); |
return( -1 ); |
return( -1 ); |
} |
} |
|
|
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"read1msg: ld %p msgid %ld message type %s\n", |
"read1msg: ld %p msgid %d message type %s\n", |
(void *)ld, (long) lr->lr_msgid, ldap_int_msgtype2str( tag )); |
(void *)ld, id, ldap_int_msgtype2str( tag ) ); |
|
|
|
if ( id == 0 ) { |
|
/* unsolicited notification message (RFC 4511) */ |
|
if ( tag != LDAP_RES_EXTENDED ) { |
|
/* toss it */ |
|
goto retry_ber; |
|
|
|
/* strictly speaking, it's an error; from RFC 4511: |
|
|
|
4.4. Unsolicited Notification |
|
|
|
An unsolicited notification is an LDAPMessage sent from the server to |
|
the client that is not in response to any LDAPMessage received by the |
|
server. It is used to signal an extraordinary condition in the |
|
server or in the LDAP session between the client and the server. The |
|
notification is of an advisory nature, and the server will not expect |
|
any response to be returned from the client. |
|
|
|
The unsolicited notification is structured as an LDAPMessage in which |
|
the messageID is zero and protocolOp is set to the extendedResp |
|
choice using the ExtendedResponse type (See Section 4.12). The |
|
responseName field of the ExtendedResponse always contains an LDAPOID |
|
that is unique for this notification. |
|
|
|
* however, since unsolicited responses |
|
* are of advisory nature, better |
|
* toss it, right now |
|
*/ |
|
|
|
#if 0 |
|
ld->ld_errno = LDAP_DECODING_ERROR; |
|
ber_free( ber, 1 ); |
|
return( -1 ); |
|
#endif |
|
} |
|
|
|
lr = &dummy_lr; |
|
} |
|
|
id = lr->lr_origid; |
id = lr->lr_origid; |
refer_cnt = 0; |
refer_cnt = 0; |
Line 520 nextresp2:
|
Line 652 nextresp2:
|
lr->lr_res_msgtype = tag; |
lr->lr_res_msgtype = tag; |
|
|
/* |
/* |
* This code figures out if we are going to chase a |
* Check for V3 search reference |
* referral / search reference, or pass it back to the application |
|
*/ |
*/ |
v3ref = V3REF_NOREF; /* Assume not a V3 search reference/referral */ |
if ( tag == LDAP_RES_SEARCH_REFERENCE ) { |
if( (tag != LDAP_RES_SEARCH_ENTRY) && (ld->ld_version > LDAP_VERSION2) ) { |
if ( ld->ld_version > LDAP_VERSION2 ) { |
BerElement tmpber = *ber; /* struct copy */ |
|
char **refs = NULL; |
|
|
|
if( tag == LDAP_RES_SEARCH_REFERENCE ) { |
|
/* This is a V3 search reference */ |
/* This is a V3 search reference */ |
/* Assume we do not chase the reference, |
if ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) || |
* but pass it to application */ |
lr->lr_parent != NULL ) |
v3ref = V3REF_TOAPP; |
|
if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) || |
|
(lr->lr_parent != NULL) ) |
|
{ |
{ |
|
char **refs = NULL; |
|
tmpber = *ber; |
|
|
/* Get the referral list */ |
/* Get the referral list */ |
if ( ber_scanf( &tmpber, "{v}", &refs ) == LBER_ERROR ) { |
if ( ber_scanf( &tmpber, "{v}", &refs ) == LBER_ERROR ) { |
rc = LDAP_DECODING_ERROR; |
rc = LDAP_DECODING_ERROR; |
|
|
} else { |
} else { |
/* Note: refs array is freed by ldap_chase_v3referrals */ |
/* Note: refs array is freed by ldap_chase_v3referrals */ |
refer_cnt = ldap_chase_v3referrals( ld, lr, refs, |
refer_cnt = ldap_chase_v3referrals( ld, lr, refs, |
1, &lr->lr_res_error, &hadref ); |
1, &lr->lr_res_error, &hadref ); |
if ( refer_cnt > 0 ) { |
if ( refer_cnt > 0 ) { |
/* sucessfully chased reference */ |
/* successfully chased reference */ |
/* If haven't got end search, set chasing referrals */ |
/* 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; |
lr->lr_status = LDAP_REQST_CHASINGREFS; |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"read1msg: search ref chased, " |
"read1msg: search ref chased, " |
"mark request chasing refs, " |
"mark request chasing refs, " |
"id = %d\n", |
"id = %d\n", |
lr->lr_msgid, 0, 0); |
lr->lr_msgid, 0, 0 ); |
} |
} |
|
|
/* We sucessfully chased the reference */ |
|
v3ref = V3REF_SUCCESS; |
|
} |
} |
} |
} |
} |
} |
} else { |
} |
/* Check for V3 referral */ |
|
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 { |
} else if ( tag != LDAP_RES_SEARCH_ENTRY && tag != LDAP_RES_INTERMEDIATE ) { |
lr->lr_res_error = lr_res_error; |
/* All results that just return a status, i.e. don't return data |
} |
* go through the following code. This code also chases V2 referrals |
} |
* and checks if all referrals have been chased. |
lr_res_error = NULL; |
*/ |
|
char *lr_res_error = NULL; |
|
|
|
tmpber = *ber; /* struct copy */ |
|
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; |
|
} |
|
|
|
/* Do we need to check for referrals? */ |
|
if ( tag != LDAP_RES_BIND && |
|
( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) || |
|
lr->lr_parent != NULL )) |
|
{ |
|
char **refs = NULL; |
|
ber_len_t len; |
|
|
/* Check if V3 referral */ |
/* 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 */ |
if ( ld->ld_version > LDAP_VERSION2 ) { |
v3ref = V3REF_TOAPP; |
|
if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) |
|
|| (lr->lr_parent != NULL) ) |
|
{ |
|
/* Assume referral not chased and return it to app */ |
|
v3ref = V3REF_TOAPP; |
|
|
|
/* Get the referral list */ |
/* Get the referral list */ |
if( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) { |
if ( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) { |
rc = LDAP_DECODING_ERROR; |
rc = LDAP_DECODING_ERROR; |
lr->lr_status = LDAP_REQST_COMPLETED; |
lr->lr_status = LDAP_REQST_COMPLETED; |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"read1msg: referral decode error, mark request completed, ld %p msgid %d\n", |
"read1msg: referral decode error, " |
(void *)ld, lr->lr_msgid, 0); |
"mark request completed, ld %p msgid %d\n", |
|
(void *)ld, lr->lr_msgid, 0 ); |
|
|
} else { |
} else { |
/* Chase the referral |
/* Chase the referral |
* Note: refs arrary is freed by ldap_chase_v3referrals |
* refs array is freed by ldap_chase_v3referrals |
*/ |
*/ |
refer_cnt = ldap_chase_v3referrals( ld, lr, refs, |
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; |
lr->lr_status = LDAP_REQST_COMPLETED; |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"read1msg: referral chased, mark request completed, ld %p msgid %d\n", |
"read1msg: referral %s chased, " |
(void *)ld, lr->lr_msgid, 0); |
"mark request completed, ld %p msgid %d\n", |
if( refer_cnt > 0) { |
refer_cnt > 0 ? "" : "not", |
/* Referral successfully chased */ |
(void *)ld, lr->lr_msgid); |
v3ref = V3REF_SUCCESS; |
if ( refer_cnt < 0 ) { |
|
refer_cnt = 0; |
} |
} |
} |
} |
} |
} |
} |
} else { |
|
switch ( lderr ) { |
if( lr->lr_res_matched != NULL ) { |
case LDAP_SUCCESS: |
LDAP_FREE( lr->lr_res_matched ); |
case LDAP_COMPARE_TRUE: |
lr->lr_res_matched = NULL; |
case LDAP_COMPARE_FALSE: |
} |
break; |
if( lr->lr_res_error != NULL ) { |
|
LDAP_FREE( lr->lr_res_error ); |
|
lr->lr_res_error = NULL; |
|
} |
|
} |
|
} |
|
} |
|
|
|
/* All results that just return a status, i.e. don't return data |
|
* 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 != 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 */ |
default: |
if ( v3ref == V3REF_SUCCESS ) { |
if ( lr->lr_res_error == NULL ) { |
/* V3 search reference or V3 referral |
break; |
* 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 ) { |
/* pedantic, should never happen */ |
case LDAP_SUCCESS: |
if ( lr->lr_res_error[ 0 ] == '\0' ) { |
case LDAP_COMPARE_TRUE: |
LDAP_FREE( lr->lr_res_error ); |
case LDAP_COMPARE_FALSE: |
lr->lr_res_error = NULL; |
break; |
break; |
|
} |
|
|
default: |
/* V2 referrals are in error string */ |
if ( lr->lr_res_error == NULL |
refer_cnt = ldap_chase_referrals( ld, lr, |
|| lr->lr_res_error[ 0 ] == '\0' ) |
&lr->lr_res_error, -1, &hadref ); |
{ |
lr->lr_status = LDAP_REQST_COMPLETED; |
|
Debug( LDAP_DEBUG_TRACE, |
|
"read1msg: V2 referral chased, " |
|
"mark request completed, id = %d\n", |
|
lr->lr_msgid, 0, 0 ); |
break; |
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; |
|
Debug( LDAP_DEBUG_TRACE, |
|
"read1msg: V2 referral chased, " |
|
"mark request completed, id = %d\n", |
|
lr->lr_msgid, 0, 0 ); |
|
break; |
|
} |
} |
|
} |
|
|
/* save errno, message, and matched string */ |
/* save errno, message, and matched string */ |
if ( !hadref || lr->lr_res_error == NULL ) { |
if ( !hadref || lr->lr_res_error == NULL ) { |
lr->lr_res_errno = ( lderr == |
lr->lr_res_errno = |
LDAP_PARTIAL_RESULTS ) ? LDAP_SUCCESS |
lderr == LDAP_PARTIAL_RESULTS |
: lderr; |
? 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; |
|
} |
|
|
|
Debug( LDAP_DEBUG_TRACE, "new result: " |
} else if ( ld->ld_errno != LDAP_SUCCESS ) { |
"res_errno: %d, " |
lr->lr_res_errno = ld->ld_errno; |
"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 */ |
} else { |
if ( lr_res_error ) { |
lr->lr_res_errno = LDAP_PARTIAL_RESULTS; |
LDAP_FREE( lr_res_error ); |
|
} |
} |
} |
} |
|
|
|
/* in any case, don't leave any lr_res_error 'round */ |
|
if ( lr_res_error ) { |
|
LDAP_FREE( lr_res_error ); |
|
} |
|
|
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"read1msg: ld %p %d new referrals\n", |
"read1msg: ld %p %d new referrals\n", |
(void *)ld, refer_cnt, 0 ); |
(void *)ld, refer_cnt, 0 ); |
Line 726 nextresp2:
|
Line 806 nextresp2:
|
ber_free( ber, 1 ); |
ber_free( ber, 1 ); |
ber = NULL; |
ber = NULL; |
if ( refer_cnt < 0 ) { |
if ( refer_cnt < 0 ) { |
|
ldap_return_request( ld, lr, 0 ); |
return( -1 ); /* fatal error */ |
return( -1 ); /* fatal error */ |
} |
} |
lr->lr_res_errno = LDAP_SUCCESS; /* sucessfully chased referral */ |
lr->lr_res_errno = LDAP_SUCCESS; /* sucessfully chased referral */ |
|
if ( lr->lr_res_matched ) { |
|
LDAP_FREE( lr->lr_res_matched ); |
|
lr->lr_res_matched = NULL; |
|
} |
|
|
} else { |
} else { |
if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) { |
if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) { |
/* request without any referrals */ |
/* request without any referrals */ |
simple_request = ( hadref ? 0 : 1 ); |
simple_request = ( hadref ? 0 : 1 ); |
|
|
} else { |
} else { |
/* request with referrals or child request */ |
/* request with referrals or child request */ |
ber_free( ber, 1 ); |
ber_free( ber, 1 ); |
Line 754 nextresp2:
|
Line 841 nextresp2:
|
|
|
/* Check if all requests are finished, lr is now parent */ |
/* Check if all requests are finished, lr is now parent */ |
tmplr = lr; |
tmplr = lr; |
if (tmplr->lr_status == LDAP_REQST_COMPLETED) { |
if ( tmplr->lr_status == LDAP_REQST_COMPLETED ) { |
for ( tmplr=lr->lr_child; |
for ( tmplr = lr->lr_child; |
tmplr != NULL; |
tmplr != NULL; |
tmplr=tmplr->lr_refnext) |
tmplr = tmplr->lr_refnext ) |
{ |
{ |
if( tmplr->lr_status != LDAP_REQST_COMPLETED) break; |
if ( tmplr->lr_status != LDAP_REQST_COMPLETED ) break; |
} |
} |
} |
} |
|
|
/* This is the parent request if the request has referrals */ |
/* This is the parent request if the request has referrals */ |
if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL && |
if ( lr->lr_outrefcnt <= 0 && |
|
lr->lr_parent == NULL && |
tmplr == NULL ) |
tmplr == NULL ) |
{ |
{ |
id = lr->lr_msgid; |
id = lr->lr_msgid; |
tag = lr->lr_res_msgtype; |
tag = lr->lr_res_msgtype; |
Debug( LDAP_DEBUG_ANY, "request done: ld %p msgid %ld\n", |
Debug( LDAP_DEBUG_TRACE, "request done: ld %p msgid %d\n", |
(void *)ld, (long) id, 0 ); |
(void *)ld, id, 0 ); |
Debug( LDAP_DEBUG_TRACE, |
Debug( LDAP_DEBUG_TRACE, |
"res_errno: %d, res_error: <%s>, res_matched: <%s>\n", |
"res_errno: %d, res_error: <%s>, " |
lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "", |
"res_matched: <%s>\n", |
lr->lr_res_matched ? lr->lr_res_matched : "" ); |
lr->lr_res_errno, |
|
lr->lr_res_error ? lr->lr_res_error : "", |
|
lr->lr_res_matched ? lr->lr_res_matched : "" ); |
if ( !simple_request ) { |
if ( !simple_request ) { |
ber_free( ber, 1 ); |
ber_free( ber, 1 ); |
ber = NULL; |
ber = NULL; |
if ( build_result_ber( ld, &ber, lr ) |
if ( build_result_ber( ld, &ber, lr ) |
== LBER_ERROR ) { |
== LBER_ERROR ) |
|
{ |
rc = -1; /* fatal error */ |
rc = -1; /* fatal error */ |
} |
} |
} |
} |
|
|
#ifdef LDAP_R_COMPILE |
if ( lr != &dummy_lr ) { |
ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); |
ldap_return_request( ld, lr, 1 ); |
#endif |
} |
ldap_free_request( ld, lr ); |
lr = NULL; |
#ifdef LDAP_R_COMPILE |
|
ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); |
|
#endif |
|
} |
} |
|
|
if ( lc != NULL ) { |
/* |
#ifdef LDAP_R_COMPILE |
* RF 4511 unsolicited (id == 0) responses |
ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); |
* shouldn't necessarily end the connection |
#endif |
*/ |
ldap_free_connection( ld, lc, 0, 1 ); |
if ( lc != NULL && id != 0 ) { |
#ifdef LDAP_R_COMPILE |
--lc->lconn_refcnt; |
ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); |
lc = NULL; |
#endif |
|
lc = *lcp = NULL; |
|
} |
} |
} |
} |
} |
} |
|
|
|
if ( lr != NULL ) { |
|
if ( lr != &dummy_lr ) { |
|
ldap_return_request( ld, lr, 0 ); |
|
} |
|
lr = NULL; |
|
} |
|
|
if ( ber == NULL ) { |
if ( ber == NULL ) { |
return( rc ); |
return( rc ); |
} |
} |
|
|
|
/* try to handle unsolicited responses as appropriate */ |
|
if ( id == 0 && msgid > LDAP_RES_UNSOLICITED ) { |
|
int is_nod = 0; |
|
|
|
tag = ber_peek_tag( &tmpber, &len ); |
|
|
|
/* we have a res oid */ |
|
if ( tag == LDAP_TAG_EXOP_RES_OID ) { |
|
static struct berval bv_nod = BER_BVC( LDAP_NOTICE_OF_DISCONNECTION ); |
|
struct berval resoid = BER_BVNULL; |
|
|
|
if ( ber_scanf( &tmpber, "m", &resoid ) == LBER_ERROR ) { |
|
ld->ld_errno = LDAP_DECODING_ERROR; |
|
ber_free( ber, 1 ); |
|
return -1; |
|
} |
|
|
|
assert( !BER_BVISEMPTY( &resoid ) ); |
|
|
|
is_nod = ber_bvcmp( &resoid, &bv_nod ) == 0; |
|
|
|
tag = ber_peek_tag( &tmpber, &len ); |
|
} |
|
|
|
#if 0 /* don't need right now */ |
|
/* we have res data */ |
|
if ( tag == LDAP_TAG_EXOP_RES_VALUE ) { |
|
struct berval resdata; |
|
|
|
if ( ber_scanf( &tmpber, "m", &resdata ) == LBER_ERROR ) { |
|
ld->ld_errno = LDAP_DECODING_ERROR; |
|
ber_free( ber, 0 ); |
|
return ld->ld_errno; |
|
} |
|
|
|
/* use it... */ |
|
} |
|
#endif |
|
|
|
/* handle RFC 4511 "Notice of Disconnection" locally */ |
|
|
|
if ( is_nod ) { |
|
if ( tag == LDAP_TAG_EXOP_RES_VALUE ) { |
|
ld->ld_errno = LDAP_DECODING_ERROR; |
|
ber_free( ber, 1 ); |
|
return -1; |
|
} |
|
|
|
/* get rid of the connection... */ |
|
if ( lc != NULL ) { |
|
--lc->lconn_refcnt; |
|
} |
|
|
|
/* need to return -1, because otherwise |
|
* a valid result is expected */ |
|
ld->ld_errno = lderr; |
|
return -1; |
|
} |
|
} |
|
|
/* make a new ldap message */ |
/* make a new ldap message */ |
newmsg = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) ); |
newmsg = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) ); |
if ( newmsg == NULL ) { |
if ( newmsg == NULL ) { |
Line 843 lr->lr_res_matched ? lr->lr_res_matched
|
Line 996 lr->lr_res_matched ? lr->lr_res_matched
|
*/ |
*/ |
ber = ber_dup( ber ); |
ber = ber_dup( ber ); |
ber_scanf( ber, "x" ); |
ber_scanf( ber, "x" ); |
if (ber_peek_tag(ber, &len) != LBER_DEFAULT) { |
if ( ber_peek_tag( ber, &len ) != LBER_DEFAULT ) { |
/* There's more - dup the ber buffer so they can all be |
/* There's more - dup the ber buffer so they can all be |
* individually freed by ldap_msgfree. |
* individually freed by ldap_msgfree. |
*/ |
*/ |
struct berval bv; |
struct berval bv; |
ber_get_option(ber, LBER_OPT_BER_REMAINING_BYTES, &len); |
ber_get_option( ber, LBER_OPT_BER_REMAINING_BYTES, &len ); |
bv.bv_val = LDAP_MALLOC(len); |
bv.bv_val = LDAP_MALLOC( len ); |
if (bv.bv_val) { |
if ( bv.bv_val ) { |
ok=1; |
ok = 1; |
ber_read(ber, bv.bv_val, len); |
ber_read( ber, bv.bv_val, len ); |
bv.bv_len = len; |
bv.bv_len = len; |
ber_init2(ber, &bv, ld->ld_lberoptions ); |
ber_init2( ber, &bv, ld->ld_lberoptions ); |
} |
} |
} |
} |
} else { |
} else { |
Line 876 lr->lr_res_matched ? lr->lr_res_matched
|
Line 1029 lr->lr_res_matched ? lr->lr_res_matched
|
chain_head->lm_chain_tail = newmsg; |
chain_head->lm_chain_tail = newmsg; |
tmp = newmsg; |
tmp = newmsg; |
/* "ok" means there's more to parse */ |
/* "ok" means there's more to parse */ |
if (ok) { |
if ( ok ) { |
if (isv2) goto nextresp2; |
if ( isv2 ) { |
else goto nextresp3; |
goto nextresp2; |
|
|
|
} else { |
|
goto nextresp3; |
|
} |
} else { |
} else { |
/* got to end of datagram without a SearchResult. Free |
/* got to end of datagram without a SearchResult. Free |
* our dup'd ber, but leave any buffer alone. For v2 case, |
* our dup'd ber, but leave any buffer alone. For v2 case, |
* the previous response is still using this buffer. For v3, |
* the previous response is still using this buffer. For v3, |
* the new ber has no buffer to free yet. |
* the new ber has no buffer to free yet. |
*/ |
*/ |
ber_free(ber, 0); |
ber_free( ber, 0 ); |
return -1; |
return -1; |
} |
} |
} else if ( moremsgs ) { |
} else if ( moremsgs ) { |
Line 905 lr->lr_res_matched ? lr->lr_res_matched
|
Line 1062 lr->lr_res_matched ? lr->lr_res_matched
|
/* is this the one we're looking for? */ |
/* is this the one we're looking for? */ |
if ( msgid == LDAP_RES_ANY || id == msgid ) { |
if ( msgid == LDAP_RES_ANY || id == msgid ) { |
if ( all == LDAP_MSG_ONE |
if ( all == LDAP_MSG_ONE |
|| (newmsg->lm_msgtype != LDAP_RES_SEARCH_RESULT |
|| ( newmsg->lm_msgtype != LDAP_RES_SEARCH_RESULT |
&& newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY |
&& newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY |
&& newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE) ) { |
&& newmsg->lm_msgtype != LDAP_RES_INTERMEDIATE |
|
&& newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) ) |
|
{ |
*result = newmsg; |
*result = newmsg; |
ld->ld_errno = LDAP_SUCCESS; |
ld->ld_errno = LDAP_SUCCESS; |
return( tag ); |
return( tag ); |
|
|
} else if ( newmsg->lm_msgtype == LDAP_RES_SEARCH_RESULT) { |
} else if ( newmsg->lm_msgtype == LDAP_RES_SEARCH_RESULT) { |
foundit = 1; /* return the chain later */ |
foundit = 1; /* return the chain later */ |
} |
} |
Line 924 lr->lr_res_matched ? lr->lr_res_matched
|
Line 1084 lr->lr_res_matched ? lr->lr_res_matched
|
|
|
prev = NULL; |
prev = NULL; |
for ( l = ld->ld_responses; l != NULL; l = l->lm_next ) { |
for ( l = ld->ld_responses; l != NULL; l = l->lm_next ) { |
if ( l->lm_msgid == newmsg->lm_msgid ) |
if ( l->lm_msgid == newmsg->lm_msgid ) { |
break; |
break; |
|
} |
prev = l; |
prev = l; |
} |
} |
|
|
Line 941 lr->lr_res_matched ? lr->lr_res_matched
|
Line 1102 lr->lr_res_matched ? lr->lr_res_matched
|
goto exit; |
goto exit; |
} |
} |
|
|
Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %ld type %ld:\n", |
Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %d type %ld:\n", |
(void *)ld, (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype ); |
(void *)ld, newmsg->lm_msgid, (long) newmsg->lm_msgtype ); |
|
|
/* part of a search response - add to end of list of entries */ |
/* part of a search response - add to end of list of entries */ |
l->lm_chain_tail->lm_chain = newmsg; |
l->lm_chain_tail->lm_chain = newmsg; |
Line 950 lr->lr_res_matched ? lr->lr_res_matched
|
Line 1111 lr->lr_res_matched ? lr->lr_res_matched
|
|
|
/* return the whole chain if that's what we were looking for */ |
/* return the whole chain if that's what we were looking for */ |
if ( foundit ) { |
if ( foundit ) { |
if ( prev == NULL ) |
if ( prev == NULL ) { |
ld->ld_responses = l->lm_next; |
ld->ld_responses = l->lm_next; |
else |
} else { |
prev->lm_next = l->lm_next; |
prev->lm_next = l->lm_next; |
|
} |
*result = l; |
*result = l; |
} |
} |
|
|
Line 991 build_result_ber( LDAP *ld, BerElement *
|
Line 1153 build_result_ber( LDAP *ld, BerElement *
|
lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) |
lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) |
{ |
{ |
ld->ld_errno = LDAP_ENCODING_ERROR; |
ld->ld_errno = LDAP_ENCODING_ERROR; |
ber_free(ber, 1); |
ber_free( ber, 1 ); |
return( LBER_ERROR ); |
return( LBER_ERROR ); |
} |
} |
|
|
Line 999 build_result_ber( LDAP *ld, BerElement *
|
Line 1161 build_result_ber( LDAP *ld, BerElement *
|
|
|
if ( ber_skip_tag( ber, &len ) == LBER_ERROR ) { |
if ( ber_skip_tag( ber, &len ) == LBER_ERROR ) { |
ld->ld_errno = LDAP_DECODING_ERROR; |
ld->ld_errno = LDAP_DECODING_ERROR; |
ber_free(ber, 1); |
ber_free( ber, 1 ); |
return( LBER_ERROR ); |
return( LBER_ERROR ); |
} |
} |
|
|
if ( ber_get_enum( ber, &along ) == LBER_ERROR ) { |
if ( ber_get_enum( ber, &along ) == LBER_ERROR ) { |
ld->ld_errno = LDAP_DECODING_ERROR; |
ld->ld_errno = LDAP_DECODING_ERROR; |
ber_free(ber, 1); |
ber_free( ber, 1 ); |
return( LBER_ERROR ); |
return( LBER_ERROR ); |
} |
} |
|
|
Line 1013 build_result_ber( LDAP *ld, BerElement *
|
Line 1175 build_result_ber( LDAP *ld, BerElement *
|
|
|
if ( tag == LBER_ERROR ) { |
if ( tag == LBER_ERROR ) { |
ld->ld_errno = LDAP_DECODING_ERROR; |
ld->ld_errno = LDAP_DECODING_ERROR; |
ber_free(ber, 1); |
ber_free( ber, 1 ); |
return( LBER_ERROR ); |
return( LBER_ERROR ); |
} |
} |
|
|
Line 1022 build_result_ber( LDAP *ld, BerElement *
|
Line 1184 build_result_ber( LDAP *ld, BerElement *
|
} |
} |
|
|
|
|
static void |
|
merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) |
|
{ |
|
/* |
/* |
* Merge error information in "lr" with "parentr" error code and string. |
* 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 ) { |
if ( lr->lr_res_errno == LDAP_PARTIAL_RESULTS ) { |
parentr->lr_res_errno = lr->lr_res_errno; |
parentr->lr_res_errno = lr->lr_res_errno; |
if ( lr->lr_res_error != NULL ) { |
if ( lr->lr_res_error != NULL ) { |
(void)ldap_append_referral( ld, &parentr->lr_res_error, |
(void)ldap_append_referral( ld, &parentr->lr_res_error, |
lr->lr_res_error ); |
lr->lr_res_error ); |
} |
} |
|
|
} else if ( lr->lr_res_errno != LDAP_SUCCESS && |
} else if ( lr->lr_res_errno != LDAP_SUCCESS && |
parentr->lr_res_errno == LDAP_SUCCESS ) |
parentr->lr_res_errno == LDAP_SUCCESS ) |
{ |
{ |
Line 1053 merge_error_info( LDAP *ld, LDAPRequest
|
Line 1216 merge_error_info( LDAP *ld, LDAPRequest
|
} |
} |
|
|
Debug( LDAP_DEBUG_TRACE, "merged parent (id %d) error info: ", |
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", |
Debug( LDAP_DEBUG_TRACE, "result errno %d, error <%s>, matched <%s>\n", |
parentr->lr_res_errno, parentr->lr_res_error ? |
parentr->lr_res_errno, |
parentr->lr_res_error : "", parentr->lr_res_matched ? |
parentr->lr_res_error ? parentr->lr_res_error : "", |
parentr->lr_res_matched : "" ); |
parentr->lr_res_matched ? parentr->lr_res_matched : "" ); |
} |
} |
|
|
|
|
Line 1079 ldap_msgid( LDAPMessage *lm )
|
Line 1242 ldap_msgid( LDAPMessage *lm )
|
} |
} |
|
|
|
|
char * ldap_int_msgtype2str( ber_tag_t tag ) |
const char * |
|
ldap_int_msgtype2str( ber_tag_t tag ) |
{ |
{ |
switch( tag ) { |
switch( tag ) { |
case LDAP_RES_ADD: return "add"; |
case LDAP_RES_ADD: return "add"; |
Line 1112 ldap_msgfree( LDAPMessage *lm )
|
Line 1276 ldap_msgfree( LDAPMessage *lm )
|
LDAP_FREE( (char *) lm ); |
LDAP_FREE( (char *) lm ); |
} |
} |
|
|
return( type ); |
return type; |
} |
} |
|
|
/* |
/* |
Line 1124 int
|
Line 1288 int
|
ldap_msgdelete( LDAP *ld, int msgid ) |
ldap_msgdelete( LDAP *ld, int msgid ) |
{ |
{ |
LDAPMessage *lm, *prev; |
LDAPMessage *lm, *prev; |
int rc = 0; |
int rc = 0; |
|
|
assert( ld != NULL ); |
assert( ld != NULL ); |
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete\n", 0, 0, 0 ); |
Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete ld=%p msgid=%d\n", |
|
(void *)ld, msgid, 0 ); |
|
|
|
LDAP_MUTEX_LOCK( &ld->ld_res_mutex ); |
prev = NULL; |
prev = NULL; |
#ifdef LDAP_R_COMPILE |
|
ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex ); |
|
#endif |
|
for ( lm = ld->ld_responses; lm != NULL; lm = lm->lm_next ) { |
for ( lm = ld->ld_responses; lm != NULL; lm = lm->lm_next ) { |
if ( lm->lm_msgid == msgid ) |
if ( lm->lm_msgid == msgid ) { |
break; |
break; |
|
} |
prev = lm; |
prev = lm; |
} |
} |
|
|
if ( lm == NULL ) { |
if ( lm == NULL ) { |
rc = -1; |
rc = -1; |
|
|
} else { |
} else { |
if ( prev == NULL ) |
if ( prev == NULL ) { |
ld->ld_responses = lm->lm_next; |
ld->ld_responses = lm->lm_next; |
else |
} else { |
prev->lm_next = lm->lm_next; |
prev->lm_next = lm->lm_next; |
|
} |
} |
} |
#ifdef LDAP_R_COMPILE |
LDAP_MUTEX_UNLOCK( &ld->ld_res_mutex ); |
ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex ); |
if ( lm ) { |
#endif |
switch ( ldap_msgfree( lm ) ) { |
if ( lm && ldap_msgfree( lm ) == LDAP_RES_SEARCH_ENTRY ) |
case LDAP_RES_SEARCH_ENTRY: |
rc = -1; |
case LDAP_RES_SEARCH_REFERENCE: |
|
case LDAP_RES_INTERMEDIATE: |
|
rc = -1; |
|
break; |
|
|
return( rc ); |
default: |
|
break; |
|
} |
|
} |
|
|
|
return rc; |
} |
} |
|
|
|
|
/* |
/* |
* return 1 if message msgid is waiting to be abandoned, 0 otherwise |
* ldap_abandoned |
|
* |
|
* 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 |
static int |
ldap_abandoned( LDAP *ld, ber_int_t msgid ) |
ldap_abandoned( LDAP *ld, ber_int_t msgid, int *idxp ) |
{ |
{ |
int i; |
LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); |
|
|
if ( ld->ld_abandoned == NULL ) |
assert( idxp != NULL ); |
return( 0 ); |
assert( msgid >= 0 ); |
|
|
for ( i = 0; ld->ld_abandoned[i] != -1; i++ ) |
return ldap_int_bisect_find( ld->ld_abandoned, ld->ld_nabandoned, msgid, idxp ); |
if ( ld->ld_abandoned[i] == msgid ) |
|
return( 1 ); |
|
|
|
return( 0 ); |
|
} |
} |
|
|
|
/* |
|
* ldap_mark_abandoned |
|
* |
|
* expects ld_res_mutex to be locked |
|
*/ |
static int |
static int |
ldap_mark_abandoned( LDAP *ld, ber_int_t msgid ) |
ldap_mark_abandoned( LDAP *ld, ber_int_t msgid, int idx ) |
{ |
{ |
int i; |
LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); |
|
|
if ( ld->ld_abandoned == NULL ) |
|
return( -1 ); |
|
|
|
for ( i = 0; ld->ld_abandoned[i] != -1; i++ ) |
|
if ( ld->ld_abandoned[i] == msgid ) |
|
break; |
|
|
|
if ( ld->ld_abandoned[i] == -1 ) |
|
return( -1 ); |
|
|
|
for ( ; ld->ld_abandoned[i] != -1; i++ ) { |
/* NOTE: those assertions are repeated in ldap_int_bisect_delete() */ |
ld->ld_abandoned[i] = ld->ld_abandoned[i + 1]; |
assert( idx >= 0 ); |
} |
assert( (unsigned) idx < ld->ld_nabandoned ); |
|
assert( ld->ld_abandoned[ idx ] == msgid ); |
|
|
return( 0 ); |
return ldap_int_bisect_delete( &ld->ld_abandoned, &ld->ld_nabandoned, |
|
msgid, idx ); |
} |
} |