X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fresult.c;h=a282a9bab03a16c760bded5720f0060842ff0a82;hb=1d841e47c877842433dc11aaec9da36191fed960;hp=9045dd32fd09d53b9ce2c05f5dd5b5d0dead8678;hpb=3f9201e95b9966039bda8850fcb5077cc065f85d;p=openldap diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index 9045dd32fd..a282a9bab0 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2006 The OpenLDAP Foundation. + * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,20 +37,17 @@ * can be found in the file "build/LICENSE-2.0.1" in this distribution * of OpenLDAP Software. */ -/* Portions Copyright (C) The Internet Society (2006) - * ASN.1 fragments are from RFC 4511; see RFC for full legal notices. - */ /* * LDAPv3 (RFC 4511) * LDAPResult ::= SEQUENCE { * resultCode ENUMERATED { ... }, * matchedDN LDAPDN, - * diagnosticMessage LDAPString, + * diagnosticMessage LDAPString, * referral [3] Referral OPTIONAL * } * Referral ::= SEQUENCE OF LDAPURL (one or more) - * LDAPURL ::= LDAPString (limited to URL chars) + * LDAPURL ::= LDAPString (limited to URL chars) */ #include "portable.h" @@ -67,9 +64,10 @@ #include "ldap-int.h" #include "ldap_log.h" +#include "lutil.h" -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 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, int idx )); static int wait4msg LDAP_P(( LDAP *ld, ber_int_t msgid, int all, struct timeval *timeout, LDAPMessage **result )); static ber_tag_t try_read1msg LDAP_P(( LDAP *ld, ber_int_t msgid, @@ -94,7 +92,8 @@ static LDAPMessage * chkResponseList LDAP_P(( LDAP *ld, int msgid, int all)); * 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. + * When waiting, any messages that have been abandoned/discarded are + * discarded. * * Example: * ldap_result( s, msgid, all, timeout, result ) @@ -107,8 +106,8 @@ ldap_result( struct timeval *timeout, LDAPMessage **result ) { - LDAPMessage *lm; - int rc; + LDAPMessage *lm = NULL; + int rc; assert( ld != NULL ); assert( result != NULL ); @@ -118,19 +117,26 @@ ldap_result( #ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex ); #endif - lm = chkResponseList(ld, msgid, all); + +#if 0 + /* this is already done inside wait4msg(), right?... */ + lm = chkResponseList( ld, msgid, all ); +#endif if ( lm == NULL ) { 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 ); + + return rc; } static LDAPMessage * @@ -140,6 +146,7 @@ chkResponseList( int all) { LDAPMessage *lm, **lastlm, *nextlm; + int cnt = 0; /* * Look through the list of responses we have received on @@ -158,13 +165,29 @@ chkResponseList( lastlm = &ld->ld_responses; for ( lm = ld->ld_responses; lm != NULL; lm = nextlm ) { + int idx; + nextlm = lm->lm_next; + ++cnt; + + if ( ldap_abandoned( ld, lm->lm_msgid, &idx ) ) { + Debug( LDAP_DEBUG_ANY, + "response list msg abandoned, " + "msgid %d message type %s\n", + 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; - 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 ); + 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 */ *lastlm = nextlm; @@ -177,15 +200,18 @@ chkResponseList( if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) { LDAPMessage *tmp; - if ( all == LDAP_MSG_ONE || all == LDAP_MSG_RECEIVED || - msgid == LDAP_RES_UNSOLICITED ) { + if ( all == LDAP_MSG_ONE || + all == LDAP_MSG_RECEIVED || + msgid == LDAP_RES_UNSOLICITED ) + { 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)) { + if ( tmp->lm_msgtype == LDAP_RES_SEARCH_ENTRY || + tmp->lm_msgtype == LDAP_RES_SEARCH_REFERENCE || + tmp->lm_msgtype == LDAP_RES_INTERMEDIATE ) + { tmp = NULL; } @@ -198,31 +224,32 @@ chkResponseList( lastlm = &lm->lm_next; } - if ( lm != NULL ) { + if ( lm != NULL ) { /* 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; 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 { + } else { *lastlm = lm->lm_next; } - lm->lm_next = NULL; - } + lm->lm_next = NULL; + } #ifdef LDAP_DEBUG - if( lm == NULL) { + if ( lm == NULL) { Debug( LDAP_DEBUG_TRACE, "ldap_chkResponseList returns ld %p NULL\n", (void *)ld, 0, 0); } else { Debug( LDAP_DEBUG_TRACE, - "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lu\n", - (void *)ld, lm->lm_msgid, (unsigned long) lm->lm_msgtype); + "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lx\n", + (void *)ld, lm->lm_msgid, (unsigned long)lm->lm_msgtype ); } #endif - return lm; + + return lm; } static int @@ -236,9 +263,8 @@ wait4msg( int rc; struct timeval tv = { 0 }, tv0 = { 0 }, - *tvp; - time_t start_time = 0; - time_t tmp_time; + start_time_tv = { 0 }, + *tvp = NULL; LDAPConn *lc; assert( ld != NULL ); @@ -248,6 +274,11 @@ wait4msg( LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); #endif + if ( timeout == NULL && ld->ld_options.ldo_tm_api.tv_sec >= 0 ) { + tv = ld->ld_options.ldo_tm_api; + timeout = &tv; + } + #ifdef LDAP_DEBUG if ( timeout == NULL ) { Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n", @@ -258,13 +289,16 @@ wait4msg( } #endif /* LDAP_DEBUG */ - if ( timeout == NULL ) { - tvp = NULL; - } else { + if ( timeout != NULL ) { tv0 = *timeout; tv = *timeout; 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; @@ -288,7 +322,7 @@ wait4msg( } #endif /* LDAP_DEBUG */ - if ( ( *result = chkResponseList( ld, msgid, all ) ) != NULL ) { + if ( ( *result = chkResponseList( ld, msgid, all ) ) != NULL ) { rc = (*result)->lm_msgtype; } else { @@ -299,7 +333,7 @@ wait4msg( #endif for ( lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next ) { if ( ber_sockbuf_ctrl( lc->lconn_sb, - LBER_SB_OPT_DATA_READY, NULL ) ) + LBER_SB_OPT_DATA_READY, NULL ) ) { #ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); @@ -316,19 +350,19 @@ wait4msg( ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); #endif - if ( !lc_ready ) { + 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 ); + sock_errno(), 0, 0 ); } #endif if ( rc == 0 || ( rc == -1 && ( !LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) - || errno != EINTR ) ) ) + || sock_errno() != EINTR ) ) ) { ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : LDAP_TIMEOUT); @@ -337,6 +371,7 @@ wait4msg( if ( rc == -1 ) { rc = LDAP_MSG_X_KEEP_LOOKING; /* select interrupted: loop */ + } else { rc = LDAP_MSG_X_KEEP_LOOKING; #ifdef LDAP_R_COMPILE @@ -354,8 +389,7 @@ wait4msg( ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); #endif for ( lc = ld->ld_conns; - rc == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; - lc = lc->lconn_next ) + rc == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; ) { if ( lc->lconn_status == LDAP_CONNST_CONNECTED && ldap_is_read_ready( ld, lc->lconn_sb ) ) @@ -374,8 +408,14 @@ wait4msg( * sane; better restart * (ITS#4405) */ lc = ld->ld_conns; + + /* don't get to next conn! */ + break; } } + + /* next conn */ + lc = lc->lconn_next; } #ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); @@ -385,18 +425,49 @@ wait4msg( } if ( rc == LDAP_MSG_X_KEEP_LOOKING && tvp != NULL ) { - tmp_time = time( NULL ); - tv0.tv_sec -= ( tmp_time - start_time ); - if ( tv0.tv_sec <= 0 ) { - rc = 0; /* timed out */ + struct timeval curr_time_tv = { 0 }, + delta_time_tv = { 0 }; + +#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; 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_usec = tv0.tv_usec; + + Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld s %ld us to go\n", + (void *)ld, (long) tv.tv_sec, (long) tv.tv_usec ); - Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p %ld secs to go\n", - (void *)ld, (long) tv.tv_sec, 0 ); - start_time = tmp_time; + start_time_tv.tv_sec = curr_time_tv.tv_sec; + start_time_tv.tv_usec = curr_time_tv.tv_usec; } } @@ -415,10 +486,11 @@ try_read1msg( BerElement *ber; LDAPMessage *newmsg, *l, *prev; ber_int_t id; + int idx; ber_tag_t tag; ber_len_t len; int foundit = 0; - LDAPRequest *lr, *tmplr; + LDAPRequest *lr, *tmplr, dummy_lr = { 0 }; LDAPConn *lc; BerElement tmpber; int rc, refer_cnt, hadref, simple_request; @@ -429,16 +501,6 @@ try_read1msg( 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 ); @@ -456,7 +518,7 @@ retry: if ( lc->lconn_ber == NULL ) { lc->lconn_ber = ldap_alloc_ber_with_options( ld ); - if( lc->lconn_ber == NULL ) { + if ( lc->lconn_ber == NULL ) { return -1; } } @@ -465,12 +527,12 @@ retry: assert( LBER_VALID (ber) ); /* get the next message */ - errno = 0; + sock_errset(0); #ifdef LDAP_CONNECTIONLESS if ( LDAP_IS_UDP(ld) ) { struct sockaddr from; ber_int_sb_read( 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: #endif @@ -490,12 +552,20 @@ nextresp3: "ber_get_next failed.\n", 0, 0, 0 ); #endif #ifdef EWOULDBLOCK - if ( errno == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING; + if ( sock_errno() == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING; #endif #ifdef EAGAIN - if ( errno == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING; + if ( sock_errno() == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING; #endif ld->ld_errno = LDAP_SERVER_DOWN; +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); +#endif + ldap_free_connection( ld, lc, 1, 0 ); +#ifdef LDAP_R_COMPILE + ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); +#endif + lc = *lcp = NULL; return -1; default: @@ -510,33 +580,72 @@ nextresp3: return( -1 ); } + /* id == 0 iff unsolicited notification message (RFC 4511) */ + /* if it's been abandoned, toss it */ - if ( ldap_abandoned( ld, id ) ) { - Debug( LDAP_DEBUG_ANY, "abandoned ld %p msgid %ld\n", - (void *)ld, (long) id, 0); + if ( id > 0 ) { + if ( ldap_abandoned( ld, id, &idx ) ) { + /* 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 %ld message type %s\n", + (void *)ld, (long)id, ldap_int_msgtype2str( tag ) ); + retry_ber: - ber_free( ber, 1 ); - if ( ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) { - goto retry; + ber_free( ber, 1 ); + if ( ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_DATA_READY, NULL ) ) { + 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 %ld message type %s (tossing)\n", + (void *)ld, (long)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 - if (LDAP_IS_UDP(ld) && isv2) { - ber_scanf(ber, "x{"); - } + if ( LDAP_IS_UDP(ld) && isv2 ) { + ber_scanf(ber, "x{"); + } nextresp2: #endif + } + /* 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; ber_free( ber, 1 ); return( -1 ); @@ -544,7 +653,45 @@ nextresp2: Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %ld message type %s\n", - (void *)ld, (long) lr->lr_msgid, ldap_int_msgtype2str( tag )); + (void *)ld, (long)lr->lr_msgid, 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; refer_cnt = 0; @@ -553,31 +700,27 @@ nextresp2: lr->lr_res_msgtype = tag; /* - * This code figures out if we are going to chase a - * referral / search reference, or pass it back to the application + * Check for V3 search reference */ - v3ref = V3REF_NOREF; /* Assume not a V3 search reference/referral */ - if( (tag != LDAP_RES_SEARCH_ENTRY) && (ld->ld_version > LDAP_VERSION2) ) { - BerElement tmpber = *ber; /* struct copy */ - char **refs = NULL; - - if( tag == LDAP_RES_SEARCH_REFERENCE ) { + if ( tag == LDAP_RES_SEARCH_REFERENCE ) { + if ( ld->ld_version > LDAP_VERSION2 ) { /* 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) ) + if ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) || + lr->lr_parent != NULL ) { + char **refs = NULL; + tmpber = *ber; + /* 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 ); + 1, &lr->lr_res_error, &hadref ); if ( refer_cnt > 0 ) { - /* sucessfully chased reference */ + /* successfully chased reference */ /* If haven't got end search, set chasing referrals */ if ( lr->lr_status != LDAP_REQST_COMPLETED ) { lr->lr_status = LDAP_REQST_CHASINGREFS; @@ -585,170 +728,123 @@ nextresp2: "read1msg: search ref chased, " "mark request chasing refs, " "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 if ( tag != LDAP_RES_SEARCH_ENTRY && tag != LDAP_RES_INTERMEDIATE ) { + /* 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. + */ + char *lr_res_error = NULL; - } else { - lr->lr_res_error = lr_res_error; - } - } - 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 ( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) || + lr->lr_parent != NULL ) + { + char **refs = NULL; + ber_len_t len; /* 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; - + if ( ld->ld_version > LDAP_VERSION2 ) { /* Get the referral list */ - if( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) { + 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", - (void *)ld, lr->lr_msgid, 0); + "read1msg: referral decode error, " + "mark request completed, ld %p msgid %d\n", + (void *)ld, lr->lr_msgid, 0 ); + } else { /* Chase the referral - * Note: refs arrary is freed by ldap_chase_v3referrals + * refs array 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", - (void *)ld, lr->lr_msgid, 0); - if( refer_cnt > 0) { - /* Referral successfully chased */ - v3ref = V3REF_SUCCESS; + "read1msg: referral %s chased, " + "mark request completed, ld %p msgid %d\n", + refer_cnt > 0 ? "" : "not", + (void *)ld, lr->lr_msgid); + if ( refer_cnt < 0 ) { + refer_cnt = 0; } } } - } - - 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; - } - } - } - } + } else { + switch ( lderr ) { + case LDAP_SUCCESS: + case LDAP_COMPARE_TRUE: + case LDAP_COMPARE_FALSE: + break; - /* 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 */ - 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; - } + default: + if ( lr->lr_res_error == NULL ) { + break; + } - switch ( lderr ) { - case LDAP_SUCCESS: - case LDAP_COMPARE_TRUE: - case LDAP_COMPARE_FALSE: - break; + /* pedantic, should never happen */ + if ( lr->lr_res_error[ 0 ] == '\0' ) { + LDAP_FREE( lr->lr_res_error ); + lr->lr_res_error = NULL; + break; + } - default: - if ( lr->lr_res_error == NULL - || lr->lr_res_error[ 0 ] == '\0' ) - { + /* V2 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; } - - /* 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 */ - if ( !hadref || lr->lr_res_error == NULL ) { - lr->lr_res_errno = ( lderr == - LDAP_PARTIAL_RESULTS ) ? LDAP_SUCCESS - : lderr; - } else if ( ld->ld_errno != LDAP_SUCCESS ) { - lr->lr_res_errno = ld->ld_errno; - } else { - lr->lr_res_errno = LDAP_PARTIAL_RESULTS; - } + /* save errno, message, and matched string */ + if ( !hadref || lr->lr_res_error == NULL ) { + lr->lr_res_errno = + lderr == LDAP_PARTIAL_RESULTS + ? LDAP_SUCCESS : lderr; - Debug( LDAP_DEBUG_TRACE, "new result: " - "res_errno: %d, " - "res_error: <%s>, " - "res_matched: <%s>\n", - lr->lr_res_errno, - lr->lr_res_error ? lr->lr_res_error : "", - lr->lr_res_matched ? lr->lr_res_matched : "" ); - } + } else if ( ld->ld_errno != LDAP_SUCCESS ) { + lr->lr_res_errno = ld->ld_errno; - /* in any case, don't leave any lr_res_error 'round */ - if ( lr_res_error ) { - LDAP_FREE( lr_res_error ); + } else { + lr->lr_res_errno = LDAP_PARTIAL_RESULTS; } } + /* in any case, don't leave any lr_res_error 'round */ + if ( lr_res_error ) { + LDAP_FREE( lr_res_error ); + } + Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p %d new referrals\n", (void *)ld, refer_cnt, 0 ); @@ -757,13 +853,16 @@ nextresp2: ber_free( ber, 1 ); ber = NULL; if ( refer_cnt < 0 ) { + ldap_return_request( ld, lr, 0 ); return( -1 ); /* fatal error */ } lr->lr_res_errno = LDAP_SUCCESS; /* sucessfully chased referral */ + } else { if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) { /* request without any referrals */ simple_request = ( hadref ? 0 : 1 ); + } else { /* request with referrals or child request */ ber_free( ber, 1 ); @@ -786,26 +885,29 @@ nextresp2: /* Check if all requests are finished, lr is now parent */ tmplr = lr; if ( tmplr->lr_status == LDAP_REQST_COMPLETED ) { - for ( tmplr=lr->lr_child; + for ( tmplr = lr->lr_child; tmplr != NULL; - tmplr=tmplr->lr_refnext) + 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 && + 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 done: ld %p msgid %ld\n", + Debug( LDAP_DEBUG_TRACE, "request done: ld %p msgid %ld\n", (void *)ld, (long) id, 0 ); -Debug( LDAP_DEBUG_TRACE, -"res_errno: %d, res_error: <%s>, res_matched: <%s>\n", -lr->lr_res_errno, lr->lr_res_error ? lr->lr_res_error : "", -lr->lr_res_matched ? lr->lr_res_matched : "" ); + 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_free( ber, 1 ); ber = NULL; @@ -816,15 +918,89 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); } } + if ( lr != &dummy_lr ) { + ldap_return_request( ld, lr, 1 ); + } + lr = NULL; + } + + /* + * RF 4511 unsolicited (id == 0) responses + * shouldn't necessarily end the connection + */ + if ( lc != NULL && id != 0 ) { #ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); #endif - ldap_free_request( ld, lr ); + ldap_free_connection( ld, lc, 0, 1 ); #ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); #endif + lc = *lcp = NULL; } + } + } + + if ( lr != NULL ) { + if ( lr != &dummy_lr ) { + ldap_return_request( ld, lr, 0 ); + } + lr = NULL; + } + + if ( ber == NULL ) { + 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 ) { #ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); @@ -835,11 +1011,11 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); #endif lc = *lcp = NULL; } - } - } - if ( ber == NULL ) { - return( rc ); + /* need to return -1, because otherwise + * a valid result is expected */ + return -1; + } } /* make a new ldap message */ @@ -875,18 +1051,18 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); */ ber = ber_dup( ber ); 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 * 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); + 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 ); + ber_init2( ber, &bv, ld->ld_lberoptions ); } } } else { @@ -908,16 +1084,20 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); chain_head->lm_chain_tail = newmsg; tmp = newmsg; /* "ok" means there's more to parse */ - if (ok) { - if (isv2) goto nextresp2; - else goto nextresp3; + 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); + ber_free( ber, 0 ); return -1; } } else if ( moremsgs ) { @@ -937,12 +1117,14 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); /* is this the one we're looking for? */ if ( msgid == LDAP_RES_ANY || id == msgid ) { 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) ) { + || ( 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 ( newmsg->lm_msgtype == LDAP_RES_SEARCH_RESULT) { foundit = 1; /* return the chain later */ } @@ -956,8 +1138,9 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); prev = NULL; for ( l = ld->ld_responses; l != NULL; l = l->lm_next ) { - if ( l->lm_msgid == newmsg->lm_msgid ) + if ( l->lm_msgid == newmsg->lm_msgid ) { break; + } prev = l; } @@ -982,10 +1165,11 @@ lr->lr_res_matched ? lr->lr_res_matched : "" ); /* return the whole chain if that's what we were looking for */ if ( foundit ) { - if ( prev == NULL ) + if ( prev == NULL ) { ld->ld_responses = l->lm_next; - else + } else { prev->lm_next = l->lm_next; + } *result = l; } @@ -1023,7 +1207,7 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) { ld->ld_errno = LDAP_ENCODING_ERROR; - ber_free(ber, 1); + ber_free( ber, 1 ); return( LBER_ERROR ); } @@ -1031,13 +1215,13 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) if ( ber_skip_tag( ber, &len ) == LBER_ERROR ) { ld->ld_errno = LDAP_DECODING_ERROR; - ber_free(ber, 1); + 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); + ber_free( ber, 1 ); return( LBER_ERROR ); } @@ -1045,7 +1229,7 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) if ( tag == LBER_ERROR ) { ld->ld_errno = LDAP_DECODING_ERROR; - ber_free(ber, 1); + ber_free( ber, 1 ); return( LBER_ERROR ); } @@ -1054,18 +1238,19 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr ) } -static void -merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) -{ /* * Merge error information in "lr" with "parentr" error code and string. */ +static void +merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) +{ if ( lr->lr_res_errno == LDAP_PARTIAL_RESULTS ) { parentr->lr_res_errno = lr->lr_res_errno; if ( lr->lr_res_error != NULL ) { (void)ldap_append_referral( ld, &parentr->lr_res_error, - lr->lr_res_error ); + lr->lr_res_error ); } + } else if ( lr->lr_res_errno != LDAP_SUCCESS && parentr->lr_res_errno == LDAP_SUCCESS ) { @@ -1085,11 +1270,11 @@ merge_error_info( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ) } Debug( LDAP_DEBUG_TRACE, "merged parent (id %d) error info: ", - parentr->lr_msgid, 0, 0 ); + parentr->lr_msgid, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "result errno %d, error <%s>, matched <%s>\n", - parentr->lr_res_errno, parentr->lr_res_error ? - parentr->lr_res_error : "", parentr->lr_res_matched ? - parentr->lr_res_matched : "" ); + parentr->lr_res_errno, + parentr->lr_res_error ? parentr->lr_res_error : "", + parentr->lr_res_matched ? parentr->lr_res_matched : "" ); } @@ -1111,7 +1296,8 @@ ldap_msgid( LDAPMessage *lm ) } -char * ldap_int_msgtype2str( ber_tag_t tag ) +const char * +ldap_int_msgtype2str( ber_tag_t tag ) { switch( tag ) { case LDAP_RES_ADD: return "add"; @@ -1144,7 +1330,7 @@ ldap_msgfree( LDAPMessage *lm ) LDAP_FREE( (char *) lm ); } - return( type ); + return type; } /* @@ -1156,94 +1342,93 @@ int ldap_msgdelete( LDAP *ld, int msgid ) { LDAPMessage *lm, *prev; - int rc = 0; + int rc = 0; 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 ); - prev = NULL; #ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex ); #endif + prev = NULL; for ( lm = ld->ld_responses; lm != NULL; lm = lm->lm_next ) { - if ( lm->lm_msgid == msgid ) + if ( lm->lm_msgid == msgid ) { break; + } prev = lm; } if ( lm == NULL ) { rc = -1; + } else { - if ( prev == NULL ) + if ( prev == NULL ) { ld->ld_responses = lm->lm_next; - else + } 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; + if ( lm ) { + switch ( ldap_msgfree( lm ) ) { + case LDAP_RES_SEARCH_ENTRY: + case LDAP_RES_SEARCH_REFERENCE: + case LDAP_RES_INTERMEDIATE: + rc = -1; + break; - return( rc ); + default: + break; + } + } + + return rc; } /* * ldap_abandoned * - * return 1 if message msgid is waiting to be abandoned, 0 otherwise + * return the location of the message id in the array of abandoned + * message ids, or -1 * * expects ld_res_mutex to be locked */ static int -ldap_abandoned( LDAP *ld, ber_int_t msgid ) +ldap_abandoned( LDAP *ld, ber_int_t msgid, int *idxp ) { - int i; - #ifdef LDAP_R_COMPILE LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); #endif - if ( ld->ld_abandoned == NULL ) - return( 0 ); - - for ( i = 0; ld->ld_abandoned[i] != -1; i++ ) - if ( ld->ld_abandoned[i] == msgid ) - return( 1 ); + assert( idxp != NULL ); + assert( msgid >= 0 ); + assert( ld->ld_nabandoned >= 0 ); - return( 0 ); + return ldap_int_bisect_find( ld->ld_abandoned, ld->ld_nabandoned, msgid, idxp ); } - /* * ldap_mark_abandoned * * expects ld_res_mutex to be locked */ static int -ldap_mark_abandoned( LDAP *ld, ber_int_t msgid ) +ldap_mark_abandoned( LDAP *ld, ber_int_t msgid, int idx ) { - int i; - #ifdef LDAP_R_COMPILE LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); #endif - 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++ ) { - ld->ld_abandoned[i] = ld->ld_abandoned[i + 1]; - } + /* NOTE: those assertions are repeated in ldap_int_bisect_delete() */ + assert( idx >= 0 ); + assert( 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 ); }