X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fresult.c;h=172ab6311efeaf0f81b96e0c096f900c3d19cebd;hb=2dfd312fa12a765a5ad311f6c9bf8dce76a63155;hp=3da2edba645dde9fe4d10ef54f46256713515183;hpb=6ee995f52870a5a479344f22f7d3aceca0c6a12f;p=openldap diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index 3da2edba64..172ab6311e 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -1,18 +1,63 @@ -/* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* result.c - wait for an ldap result */ +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2005 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., + * to preexisting works for which notices appear elsewhere in this file. + * + * Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved. * - * result.c - wait for an ldap result + * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND TREATIES. + * USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT TO VERSION + * 2.0.1 OF THE OPENLDAP PUBLIC LICENSE, A COPY OF WHICH IS AVAILABLE AT + * HTTP://WWW.OPENLDAP.ORG/LICENSE.HTML OR IN THE FILE "LICENSE" IN THE + * TOP-LEVEL DIRECTORY OF THE DISTRIBUTION. ANY USE OR EXPLOITATION OF THIS + * WORK OTHER THAN AS AUTHORIZED IN VERSION 2.0.1 OF THE OPENLDAP PUBLIC + * LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT THE + * PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. + *--- + * Modification to OpenLDAP source by Novell, Inc. + * April 2000 sfs Add code to process V3 referrals and search results + *--- + * 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. + */ +/* Portions Copyright (C) The Internet Society (1997) + * ASN.1 fragments are from RFC 2251; see RFC for full legal notices. + */ + +/* + * LDAPv3 (RFC2251) + * LDAPResult ::= SEQUENCE { + * resultCode ENUMERATED { ... }, + * matchedDN LDAPDN, + * errorMessage LDAPString, + * referral Referral OPTIONAL + * } + * Referral ::= SEQUENCE OF LDAPURL (one or more) + * LDAPURL ::= LDAPString (limited to URL chars) */ #include "portable.h" #include -#include + +#include #include #include @@ -21,68 +66,100 @@ #include #include "ldap-int.h" +#include "ldap_log.h" - -static int ldap_abandoned LDAP_P(( LDAP *ld, int msgid )); -static int ldap_mark_abandoned LDAP_P(( LDAP *ld, int msgid )); -static int wait4msg LDAP_P(( LDAP *ld, int msgid, int all, struct timeval *timeout, +static int ldap_abandoned LDAP_P(( LDAP *ld, ber_int_t msgid )); +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 )); -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS -static int try_read1msg LDAP_P(( LDAP *ld, int msgid, int all, Sockbuf *sb, LDAPConn *lc, - LDAPMessage **result )); -static unsigned long build_result_ber LDAP_P(( LDAP *ld, BerElement *ber, LDAPRequest *lr )); +static ber_tag_t try_read1msg LDAP_P(( LDAP *ld, ber_int_t msgid, + int all, Sockbuf *sb, 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 )); -#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ -static int try_read1msg LDAP_P(( LDAP *ld, int msgid, int all, Sockbuf *sb, - LDAPMessage **result )); -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ -#if defined( LDAP_CONNECTIONLESS ) || !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) -static int ldap_select1 LDAP_P(( LDAP *ld, struct timeval *timeout )); -#endif +static LDAPMessage * chkResponseList LDAP_P(( LDAP *ld, int msgid, int all)); /* * ldap_result - wait for an ldap result response to a message from the - * ldap server. If msgid is -1, any message will be accepted, otherwise - * ldap_result will wait for a response with msgid. If all is 0 the - * first message with id msgid will be accepted, otherwise, ldap_result - * will wait for all responses with id msgid and then return a pointer to - * the entire list of messages. This is only useful for search responses, - * which can be of two message types (zero or more entries, followed by an - * ldap result). The type of the first message received is returned. + * ldap server. If msgid is LDAP_RES_ANY (-1), any message will be + * accepted. If msgid is LDAP_RES_UNSOLICITED (0), any unsolicited + * message is accepted. Otherwise ldap_result will wait for a response + * with msgid. If all is LDAP_MSG_ONE (0) the first message with id + * msgid will be accepted, otherwise, ldap_result will wait for all + * responses with id msgid and then return a pointer to the entire list + * of messages. In general, this is only useful for search responses, + * which can be of three message types (zero or more entries, zero or + * search references, followed by an ldap result). An extension to + * LDAPv3 allows partial extended responses to be returned in response + * to any request. The type of the first message received is returned. * When waiting, any messages that have been abandoned are discarded. * * Example: * ldap_result( s, msgid, all, timeout, result ) */ int -ldap_result( LDAP *ld, int msgid, int all, struct timeval *timeout, +ldap_result( + LDAP *ld, + int msgid, + int all, + struct timeval *timeout, LDAPMessage **result ) { - LDAPMessage *lm, *lastlm, *nextlm; + LDAPMessage *lm; + int rc; - /* - * First, look through the list of responses we have received on + assert( ld != NULL ); + assert( result != NULL ); + + Debug( LDAP_DEBUG_TRACE, "ldap_result ld %p msgid %d\n", ld, msgid, 0 ); + +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex ); +#endif + lm = chkResponseList(ld, msgid, all); + + if ( lm == NULL ) { + 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 * +chkResponseList( + LDAP *ld, + int msgid, + int all) +{ + LDAPMessage *lm, **lastlm, *nextlm; + /* + * 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. */ - Debug( LDAP_DEBUG_TRACE, "ldap_result\n", 0, 0, 0 ); - - *result = NULLMSG; - lastlm = NULLMSG; - for ( lm = ld->ld_responses; lm != NULLMSG; lm = nextlm ) { + Debug( LDAP_DEBUG_TRACE, + "ldap_chkResponseList ld %p msgid %d all %d\n", + ld, msgid, all ); + lastlm = &ld->ld_responses; + for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) { nextlm = lm->lm_next; if ( ldap_abandoned( ld, lm->lm_msgid ) ) { + Debug( LDAP_DEBUG_TRACE, + "ldap_chkResponseList msg abandoned, msgid %d\n", + msgid, 0, 0 ); ldap_mark_abandoned( ld, lm->lm_msgid ); - if ( lastlm == NULLMSG ) { - ld->ld_responses = lm->lm_next; - } else { - lastlm->lm_next = nextlm; - } + /* Remove this entry from list */ + *lastlm = nextlm; ldap_msgfree( lm ); @@ -92,71 +169,87 @@ ldap_result( LDAP *ld, int msgid, int all, struct timeval *timeout, if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) { LDAPMessage *tmp; - if ( all == 0 - || (lm->lm_msgtype != LDAP_RES_SEARCH_RESULT - && lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE /* LDAPv3 */ - && lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY) ) + if ( all == LDAP_MSG_ONE || all == LDAP_MSG_RECEIVED || + msgid == LDAP_RES_UNSOLICITED ) { break; + } - for ( tmp = lm; tmp != NULLMSG; tmp = tmp->lm_chain ) { - if ( tmp->lm_msgtype == LDAP_RES_SEARCH_RESULT ) - 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 == NULLMSG ) { - return( wait4msg( ld, msgid, all, timeout, - result ) ); + if ( tmp == NULL ) { + lm = NULL; } break; } - lastlm = lm; - } - if ( lm == NULLMSG ) { - return( wait4msg( ld, msgid, all, timeout, result ) ); + lastlm = &lm->lm_next; } - if ( lastlm == NULLMSG ) { - ld->ld_responses = (all == 0 && lm->lm_chain != NULLMSG - ? lm->lm_chain : lm->lm_next); + if ( lm != NULL ) { + /* Found an entry, remove it from the list */ + 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) { + Debug( LDAP_DEBUG_TRACE, + "ldap_chkResponseList returns ld %p NULL\n", ld, 0, 0); } else { - lastlm->lm_next = (all == 0 && lm->lm_chain != NULLMSG - ? lm->lm_chain : lm->lm_next); + Debug( LDAP_DEBUG_TRACE, + "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lu\n", + ld, lm->lm_msgid, (unsigned long) lm->lm_msgtype); } - if ( all == 0 ) - lm->lm_chain = NULLMSG; - lm->lm_next = NULLMSG; - - *result = lm; - ld->ld_errno = LDAP_SUCCESS; - return( lm->lm_msgtype ); +#endif + return lm; } static int -wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, +wait4msg( + LDAP *ld, + ber_int_t msgid, + int all, + struct timeval *timeout, LDAPMessage **result ) { int rc; - struct timeval tv, *tvp; + struct timeval tv = { 0 }, + tv0 = { 0 }, + *tvp; time_t start_time = 0; time_t tmp_time; -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS LDAPConn *lc, *nextlc; -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ + + assert( ld != NULL ); + assert( result != NULL ); #ifdef LDAP_DEBUG if ( timeout == NULL ) { - Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout)\n", - 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n", + ld, msgid, 0 ); } else { - Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec)\n", - (long) timeout->tv_sec, (long) timeout->tv_usec, 0 ); + Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (timeout %ld usec)\n", + ld, msgid, (long)timeout->tv_sec * 1000000 + timeout->tv_usec ); } #endif /* LDAP_DEBUG */ if ( timeout == NULL ) { tvp = NULL; } else { + tv0 = *timeout; tv = *timeout; tvp = &tv; start_time = time( NULL ); @@ -164,92 +257,118 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, rc = -2; while ( rc == -2 ) { -#ifndef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS - /* hack attack */ - if ( ! ber_pvt_sb_data_ready(&ld->ld_sb) ) { - rc = ldap_select1( ld, tvp ); - - if ( rc == 0 || ( rc == -1 && ( - ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) - == LDAP_OPT_OFF ) - || errno != EINTR ))) { - ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : - LDAP_TIMEOUT); - return( rc ); - } - - } - if ( rc == -1 ) { - rc = -2; /* select interrupted: loop */ - } else { - rc = try_read1msg( ld, msgid, all, &ld->ld_sb, result ); - } -#else /* !LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ #ifdef LDAP_DEBUG if ( ldap_debug & LDAP_DEBUG_TRACE ) { + Debug( LDAP_DEBUG_TRACE, "wait4msg continue ld %p msgid %d all %d\n", + ld, msgid, all ); ldap_dump_connection( ld, ld->ld_conns, 1 ); ldap_dump_requests_and_responses( ld ); } #endif /* LDAP_DEBUG */ - for ( lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next ) { - if ( ber_pvt_sb_data_ready(lc->lconn_sb) ) { - rc = try_read1msg( ld, msgid, all, lc->lconn_sb, - lc, result ); - break; - } - } - if ( lc == NULL ) { - rc = do_ldap_select( ld, tvp ); + if ( (*result = chkResponseList(ld, msgid, all)) != NULL ) { + rc = (*result)->lm_msgtype; + } else { + int lc_ready = 0; -#ifdef LDAP_DEBUG - if ( rc == -1 ) { - Debug( LDAP_DEBUG_TRACE, - "do_ldap_select returned -1: errno %d\n", - errno, 0, 0 ); +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); +#endif + for ( lc = ld->ld_conns; lc != NULL; lc = nextlc ) { + nextlc = lc->lconn_next; + if ( ber_sockbuf_ctrl( lc->lconn_sb, + LBER_SB_OPT_DATA_READY, NULL ) ) { +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); +#endif + rc = try_read1msg( ld, msgid, all, lc->lconn_sb, + &lc, result ); +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); +#endif + lc_ready = 1; + break; + } } +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); #endif - if ( rc == 0 || ( rc == -1 && ( - ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) - == LDAP_OPT_OFF ) - || errno != EINTR ))) - { - ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : - LDAP_TIMEOUT); - return( rc ); - } + 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", + errno, 0, 0 ); + } +#endif - 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 ); + 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; +#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 == -2 && lc != NULL; + lc = nextlc ) + { + nextlc = lc->lconn_next; + if ( lc->lconn_status == LDAP_CONNST_CONNECTED && + ldap_is_read_ready( ld, lc->lconn_sb )) + { +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); +#endif + rc = try_read1msg( ld, msgid, all, + lc->lconn_sb, &lc, result ); + if ( lc == NULL ) lc = nextlc; +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); +#endif + } + } +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); +#endif } } } -#endif /* !LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ if ( rc == -2 && 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; - Debug( LDAP_DEBUG_TRACE, "wait4msg: %ld secs to go\n", - (long) tv.tv_sec, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld secs to go\n", + ld, (long) tv.tv_sec, 0 ); start_time = tmp_time; } } @@ -258,37 +377,81 @@ wait4msg( LDAP *ld, int msgid, int all, struct timeval *timeout, } -static int -try_read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb, -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS - LDAPConn *lc, -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ - LDAPMessage **result ) +static ber_tag_t +try_read1msg( + LDAP *ld, + ber_int_t msgid, + int all, + Sockbuf *sb, + LDAPConn **lcp, + LDAPMessage **result ) { BerElement *ber; - LDAPMessage *new, *l, *prev, *tmp; - long id; - unsigned long tag, len; + LDAPMessage *newmsg, *l, *prev; + ber_int_t id; + ber_tag_t tag; + ber_len_t len; int foundit = 0; -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS - LDAPRequest *lr; + LDAPRequest *lr, *tmplr; + LDAPConn *lc; BerElement tmpber; int rc, refer_cnt, hadref, simple_request; - unsigned long lderr; - - ber = &lc->lconn_ber; -#else - ber = &ld->ld_ber; -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ - - Debug( LDAP_DEBUG_TRACE, "read1msg\n", 0, 0, 0 ); -#if 0 - ber_init_w_nullc( &ber, 0 ); - ldap_set_ber_options( ld, &ber ); + 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 + */ + enum { + V3REF_NOREF = 0, + V3REF_SUCCESS = 1, + V3REF_TOAPP = -1 + } v3ref; + + assert( ld != NULL ); + assert( lcp != NULL ); + assert( *lcp != NULL ); + + Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n", 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 */ - if ( (tag = ber_get_next( sb, &len, ber )) - != LDAP_TAG_MESSAGE ) { + errno = 0; +#ifdef LDAP_CONNECTIONLESS + if ( LDAP_IS_UDP(ld) ) { + struct sockaddr from; + ber_int_sb_read(sb, &from, sizeof(struct sockaddr)); + if (ld->ld_options.ldo_version == LDAP_VERSION2) isv2=1; + } +nextresp3: +#endif + tag = ber_get_next( sb, &len, ber ); + if ( tag == LDAP_TAG_MESSAGE ) { + /* + * We read a complete message. + * The connection should no longer need this ber. + */ + lc->lconn_ber = NULL; + } + if ( tag != LDAP_TAG_MESSAGE ) { if ( tag == LBER_DEFAULT) { #ifdef LDAP_DEBUG Debug( LDAP_DEBUG_CONNS, @@ -309,57 +472,219 @@ try_read1msg( LDAP *ld, int msgid, int all, Sockbuf *sb, /* message id */ if ( ber_get_int( ber, &id ) == LBER_ERROR ) { + ber_free( ber, 1 ); ld->ld_errno = LDAP_DECODING_ERROR; return( -1 ); } /* if it's been abandoned, toss it */ - if ( ldap_abandoned( ld, (int)id ) ) { - ber_clear( ber, 1 ); /* gack! */ + if ( ldap_abandoned( ld, id ) ) { + Debug( LDAP_DEBUG_ANY, "abandoned ld %p msgid %ld\n", + ld, (long) id, 0); +retry_ber: + ber_free( ber, 1 ); + if ( ber_sockbuf_ctrl( sb, LBER_SB_OPT_DATA_READY, NULL ) ) { + goto retry; + } return( -2 ); /* continue looking */ } -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS - if (( lr = ldap_find_request_by_msgid( ld, id )) == NULL ) { + lr = ldap_find_request_by_msgid( ld, id ); + if ( lr == NULL ) { Debug( LDAP_DEBUG_ANY, - "no request for response with msgid %ld (tossing)\n", - id, 0, 0 ); - ber_clear( ber, 1 ); /* gack! */ - return( -2 ); /* continue looking */ + "no request for response on ld %p msgid %ld (tossing)\n", + ld, (long) id, 0 ); + goto retry_ber; } - Debug( LDAP_DEBUG_TRACE, "ldap_read: %s msgid %ld, original id %d\n", - ( tag == LDAP_RES_SEARCH_ENTRY ) ? "entry" : - ( tag == LDAP_RES_SEARCH_REFERENCE ) ? "reference" : "result", - id, lr->lr_origid ); - id = lr->lr_origid; -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ - +#ifdef LDAP_CONNECTIONLESS + if (LDAP_IS_UDP(ld) && isv2) { + ber_scanf(ber, "x{"); + } +nextresp2: +#endif /* the message type */ if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) { ld->ld_errno = LDAP_DECODING_ERROR; + ber_free( ber, 1 ); return( -1 ); } -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS + Debug( LDAP_DEBUG_TRACE, + "read1msg: ld %p msgid %ld message type %s\n", + ld, (long) lr->lr_msgid, ldap_int_msgtype2str( tag )); + + id = lr->lr_origid; refer_cnt = 0; hadref = simple_request = 0; rc = -2; /* default is to keep looking (no response found) */ lr->lr_res_msgtype = tag; - if ( tag != LDAP_RES_SEARCH_ENTRY ) { + /* + * This code figures out if we are going to chase a + * 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_ENTRY) && (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 */ + /* 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 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 haven't got end search, set chasing referrals */ + if( lr->lr_status != LDAP_REQST_COMPLETED) { + lr->lr_status = LDAP_REQST_CHASINGREFS; + Debug( LDAP_DEBUG_TRACE, + "read1msg: search ref chased, " + "mark request chasing refs, " + "id = %d\n", + 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 { + lr->lr_res_error = lr_res_error; + } + } + + /* Check if V3 referral */ + if ( ber_peek_tag( &tmpber, &len ) == LDAP_TAG_REFERRAL ) { + /* We have a V3 referral, assume we cannot chase it */ + 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 */ + if( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) { + rc = LDAP_DECODING_ERROR; + lr->lr_status = LDAP_REQST_COMPLETED; + Debug( LDAP_DEBUG_TRACE, + "read1msg: referral decode error, mark request completed, ld %p msgid %d\n", + ld, lr->lr_msgid, 0); + } else { + /* Chase the referral + * Note: refs arrary is freed by ldap_chase_v3referrals + */ + refer_cnt = ldap_chase_v3referrals( ld, lr, refs, + 0, &lr->lr_res_error, &hadref ); + lr->lr_status = LDAP_REQST_COMPLETED; + Debug( LDAP_DEBUG_TRACE, + "read1msg: referral chased, mark request completed, ld %p msgid %d\n", + ld, lr->lr_msgid, 0); + if( refer_cnt > 0) { + /* Referral successfully chased */ + v3ref = V3REF_SUCCESS; + } + } + } + } + + if( lr->lr_res_matched != NULL ) { + 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; + } + } + } + } + + /* 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) - != LDAP_OPT_OFF ) ) ) + LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ) ) { + char *lr_res_error = NULL; + tmpber = *ber; /* struct copy */ - 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, &hadref ); + &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 */ @@ -380,23 +705,28 @@ Debug( LDAP_DEBUG_TRACE, } Debug( LDAP_DEBUG_TRACE, - "read1msg: %d new referrals\n", refer_cnt, 0, 0 ); + "read1msg: ld %p %d new referrals\n", ld, refer_cnt, 0 ); if ( refer_cnt != 0 ) { /* chasing referrals */ - ber_clear( ber, 1 ); /* gack! */ + ber_free( ber, 1 ); + ber = NULL; if ( refer_cnt < 0 ) { return( -1 ); /* fatal error */ } - lr->lr_status = LDAP_REQST_CHASINGREFS; + 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_clear( ber, 1 ); /* gack! */ + ber_free( ber, 1 ); + ber = NULL; } + lr->lr_status = LDAP_REQST_COMPLETED; /* declare this request done */ + Debug( LDAP_DEBUG_TRACE, + "read1msg: mark request completed, ld %p msgid %d\n", ld, lr->lr_msgid, 0); while ( lr->lr_parent != NULL ) { merge_error_info( ld, lr->lr_parent, lr ); @@ -406,64 +736,166 @@ Debug( LDAP_DEBUG_TRACE, } } - if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) { + /* 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; + } + } + + /* This is the parent request if the request has referrals */ + if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL && + tmplr == NULL ) + { id = lr->lr_msgid; tag = lr->lr_res_msgtype; - Debug( LDAP_DEBUG_ANY, "request %ld done\n", - id, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "request done: ld %p msgid %ld\n", + ld, (long) id, 0 ); Debug( LDAP_DEBUG_TRACE, "res_errno: %d, res_error: <%s>, res_matched: <%s>\n", lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "", lr->lr_res_matched ? lr->lr_res_matched : "" ); if ( !simple_request ) { - ber_clear( ber, 1 ); /* gack! */ - if ( build_result_ber( ld, ber, lr ) + ber_free( ber, 1 ); + ber = NULL; + if ( build_result_ber( ld, &ber, lr ) == LBER_ERROR ) { - ld->ld_errno = LDAP_NO_MEMORY; rc = -1; /* fatal error */ } } +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); +#endif ldap_free_request( ld, lr ); +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); +#endif } 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 + *lcp = NULL; } } } - if ( ber->ber_buf == NULL ) { + if ( ber == NULL ) { return( rc ); } -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ /* make a new ldap message */ - if ( (new = (LDAPMessage *) 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_dup( ber ); - ber_clear( ber, 0 ); /* don't kill buffer */ + 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(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 == 0 - || (new->lm_msgtype != LDAP_RES_SEARCH_RESULT - && new->lm_msgtype != LDAP_RES_SEARCH_ENTRY) ) { - *result = new; + if ( all == LDAP_MSG_ONE + || (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 */ } } @@ -474,88 +906,103 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); * search response. */ - prev = NULLMSG; - for ( l = ld->ld_responses; l != NULLMSG; l = l->lm_next ) { - if ( l->lm_msgid == new->lm_msgid ) + prev = NULL; + for ( l = ld->ld_responses; l != NULL; l = l->lm_next ) { + if ( l->lm_msgid == newmsg->lm_msgid ) break; prev = l; } /* not part of an existing search response */ - if ( l == NULLMSG ) { + 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; } - Debug( LDAP_DEBUG_TRACE, "adding response id %d type %d:\n", - new->lm_msgid, new->lm_msgtype, 0 ); + Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %ld type %ld:\n", + ld, (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype ); /* part of a search response - add to end of list of entries */ - for ( tmp = l; tmp->lm_chain != NULLMSG && - tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY; - 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 ) { - if ( prev == NULLMSG ) + if ( prev == NULL ) ld->ld_responses = l->lm_next; 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 */ } - + if ( ber_sockbuf_ctrl( sb, LBER_SB_OPT_DATA_READY, NULL ) ) { + goto retry; + } return( -2 ); /* continue looking */ } -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS -static unsigned long -build_result_ber( LDAP *ld, BerElement *ber, LDAPRequest *lr ) +static ber_tag_t +build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) { - unsigned long len; - long along; + ber_len_t len; + ber_tag_t tag; + ber_int_t along; + BerElement *ber; + + *bp = NULL; + ber = ldap_alloc_ber_with_options( ld ); + + if( ber == NULL ) { + ld->ld_errno = LDAP_NO_MEMORY; + return LBER_ERROR; + } - ber_init_w_nullc( ber, 0 ); - ldap_set_ber_options( ld, ber ); if ( ber_printf( ber, "{it{ess}}", lr->lr_msgid, - (long)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 ); } ber_reset( ber, 1 ); + if ( ber_skip_tag( ber, &len ) == LBER_ERROR ) { + ld->ld_errno = LDAP_DECODING_ERROR; + ber_free(ber, 1); + return( LBER_ERROR ); + } + + if ( ber_get_enum( ber, &along ) == LBER_ERROR ) { + ld->ld_errno = LDAP_DECODING_ERROR; + ber_free(ber, 1); return( LBER_ERROR ); } - if ( ber_get_int( ber, &along ) == LBER_ERROR ) { + tag = ber_peek_tag( ber, &len ); + + if ( tag == LBER_ERROR ) { + ld->ld_errno = LDAP_DECODING_ERROR; + ber_free(ber, 1); return( LBER_ERROR ); } - return( ber_peek_tag( ber, &len )); + *bp = ber; + return tag; } @@ -572,16 +1019,17 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) 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 ) { - free( parentr->lr_res_error ); + 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 ) { - free( parentr->lr_res_matched ); + LDAP_FREE( parentr->lr_res_matched ); } parentr->lr_res_matched = lr->lr_res_matched; lr->lr_res_matched = NULL; @@ -595,55 +1043,44 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) parentr->lr_res_error : "", parentr->lr_res_matched ? parentr->lr_res_matched : "" ); } -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ - - - -#if defined( LDAP_CONNECTIONLESS ) || !defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) - -static int -ldap_select1( LDAP *ld, struct timeval *timeout ) -{ - fd_set readfds; - static int tblsize; - - if ( tblsize == 0 ) { -#ifdef HAVE_SYSCONF - tblsize = sysconf( _SC_OPEN_MAX ); -#elif HAVE_GETDTABLESIZE - tblsize = getdtablesize(); -#else - tblsize = FD_SETSIZE; -#endif -#ifdef FD_SETSIZE - if ( tblsize > FD_SETSIZE ) { - tblsize = FD_SETSIZE; - } -#endif /* FD_SETSIZE */ - } - - FD_ZERO( &readfds ); - FD_SET( ber_pvt_sb_get_desc(&ld->ld_sb), &readfds ); - - return( select( tblsize, &readfds, 0, 0, timeout ) ); -} -#endif /* !LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ int ldap_msgtype( LDAPMessage *lm ) { - return( lm ? lm->lm_msgtype : -1 ); + assert( lm != NULL ); + return ( lm != NULL ) ? (int)lm->lm_msgtype : -1; } + int ldap_msgid( LDAPMessage *lm ) { - return( lm ? lm->lm_msgid : -1 ); + assert( lm != NULL ); + + return ( lm != NULL ) ? lm->lm_msgid : -1; } +char * ldap_int_msgtype2str( ber_tag_t tag ) +{ + switch( tag ) { + case LDAP_RES_ADD: return "add"; + case LDAP_RES_BIND: return "bind"; + case LDAP_RES_COMPARE: return "compare"; + case LDAP_RES_DELETE: return "delete"; + case LDAP_RES_EXTENDED: return "extended-result"; + 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"; + case LDAP_RES_SEARCH_REFERENCE: return "search-reference"; + case LDAP_RES_SEARCH_RESULT: return "search-result"; + } + return "unknown"; +} + int ldap_msgfree( LDAPMessage *lm ) { @@ -652,11 +1089,11 @@ ldap_msgfree( LDAPMessage *lm ) Debug( LDAP_DEBUG_TRACE, "ldap_msgfree\n", 0, 0, 0 ); - for ( ; lm != NULLMSG; lm = next ) { + for ( ; lm != NULL; lm = next ) { next = lm->lm_chain; type = lm->lm_msgtype; ber_free( lm->lm_ber, 1 ); - free( (char *) lm ); + LDAP_FREE( (char *) lm ); } return( type ); @@ -671,28 +1108,37 @@ int ldap_msgdelete( LDAP *ld, int msgid ) { LDAPMessage *lm, *prev; + int rc = 0; + + assert( ld != NULL ); Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete\n", 0, 0, 0 ); - prev = NULLMSG; - for ( lm = ld->ld_responses; lm != NULLMSG; lm = lm->lm_next ) { + 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 ) { if ( lm->lm_msgid == msgid ) break; prev = lm; } - if ( lm == NULLMSG ) - return( -1 ); - - if ( prev == NULLMSG ) - ld->ld_responses = lm->lm_next; - else - prev->lm_next = lm->lm_next; - - if ( ldap_msgfree( lm ) == LDAP_RES_SEARCH_ENTRY ) - return( -1 ); + if ( lm == NULL ) { + rc = -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 ); } @@ -700,7 +1146,7 @@ ldap_msgdelete( LDAP *ld, int msgid ) * return 1 if message msgid is waiting to be abandoned, 0 otherwise */ static int -ldap_abandoned( LDAP *ld, int msgid ) +ldap_abandoned( LDAP *ld, ber_int_t msgid ) { int i; @@ -716,7 +1162,7 @@ ldap_abandoned( LDAP *ld, int msgid ) static int -ldap_mark_abandoned( LDAP *ld, int msgid ) +ldap_mark_abandoned( LDAP *ld, ber_int_t msgid ) { int i; @@ -736,32 +1182,3 @@ ldap_mark_abandoned( LDAP *ld, int msgid ) return( 0 ); } - - -#ifdef LDAP_CONNECTIONLESS -int -cldap_getmsg( LDAP *ld, struct timeval *timeout, BerElement *ber ) -{ - int rc; - unsigned long tag, len; - - if ( ! ber_pvt_sb_data_ready(&ld->ld_sb) ) { - rc = ldap_select1( ld, timeout ); - if ( rc == -1 || rc == 0 ) { - ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : - LDAP_TIMEOUT); - return( rc ); - } - } - - /* get the next message */ - if ( (tag = ber_get_next( &ld->ld_sb, &len, ber )) - != LDAP_TAG_MESSAGE ) { - ld->ld_errno = (tag == LBER_DEFAULT ? LDAP_SERVER_DOWN : - LDAP_LOCAL_ERROR); - return( -1 ); - } - - return( tag ); -} -#endif /* LDAP_CONNECTIONLESS */