X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fresult.c;h=3fdf10d73b5e222e39556f9d6942285e5a816d4a;hb=b898f1271db5021e1873e38e1498a99d9450b646;hp=380d37e21325dbe38f8dca05e4f6980d3f0512fd;hpb=a76b702d4ca1801599c640987839a58913183bc4;p=openldap diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index 380d37e213..3fdf10d73b 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-2010 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,11 +43,11 @@ * 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" @@ -71,7 +71,7 @@ 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, - 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 void merge_error_info LDAP_P(( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr )); static LDAPMessage * chkResponseList LDAP_P(( LDAP *ld, int msgid, int all)); @@ -92,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 ) @@ -105,7 +106,6 @@ ldap_result( struct timeval *timeout, LDAPMessage **result ) { - LDAPMessage *lm = NULL; int rc; assert( ld != NULL ); @@ -113,27 +113,9 @@ ldap_result( Debug( LDAP_DEBUG_TRACE, "ldap_result ld %p msgid %d\n", (void *)ld, msgid, 0 ); -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex ); -#endif - -#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 + LDAP_MUTEX_LOCK( &ld->ld_res_mutex ); + rc = wait4msg( ld, msgid, all, timeout, result ); + LDAP_MUTEX_UNLOCK( &ld->ld_res_mutex ); return rc; } @@ -154,9 +136,7 @@ chkResponseList( * wait until it arrives or timeout occurs. */ -#ifdef LDAP_R_COMPILE - LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); -#endif + LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); Debug( LDAP_DEBUG_TRACE, "ldap_chkResponseList ld %p msgid %d all %d\n", @@ -243,7 +223,7 @@ chkResponseList( "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", + "ldap_chkResponseList returns ld %p msgid %d, type 0x%02lx\n", (void *)ld, lm->lm_msgid, (unsigned long)lm->lm_msgtype ); } #endif @@ -262,17 +242,19 @@ 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 ); assert( result != NULL ); -#ifdef LDAP_R_COMPILE - LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); -#endif + 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 if ( timeout == NULL ) { @@ -284,13 +266,16 @@ wait4msg( } #endif /* LDAP_DEBUG */ - if ( timeout == NULL ) { - tvp = NULL; - } else { + if ( timeout != NULL && timeout->tv_sec != -1 ) { 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; @@ -299,62 +284,47 @@ wait4msg( if ( ldap_debug & LDAP_DEBUG_TRACE ) { Debug( LDAP_DEBUG_TRACE, "wait4msg continue ld %p msgid %d all %d\n", (void *)ld, msgid, all ); -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); -#endif + LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); ldap_dump_connection( ld, ld->ld_conns, 1 ); -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); - ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); -#endif + LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); + LDAP_MUTEX_LOCK( &ld->ld_req_mutex ); ldap_dump_requests_and_responses( ld ); -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); -#endif + LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); } #endif /* LDAP_DEBUG */ - if ( ( *result = chkResponseList( ld, msgid, all ) ) != NULL ) { + if ( ( *result = chkResponseList( ld, msgid, all ) ) != NULL ) { rc = (*result)->lm_msgtype; } else { int lc_ready = 0; -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); -#endif + LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); for ( lc = ld->ld_conns; lc != NULL; lc = 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, 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 + LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); - if ( !lc_ready ) { + if ( !lc_ready ) { + int err; rc = ldap_int_select( ld, tvp ); -#ifdef LDAP_DEBUG if ( rc == -1 ) { + err = sock_errno(); +#ifdef LDAP_DEBUG Debug( LDAP_DEBUG_TRACE, "ldap_int_select returned -1: errno %d\n", - sock_errno(), 0, 0 ); - } + err, 0, 0 ); #endif + } if ( rc == 0 || ( rc == -1 && ( !LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART) - || sock_errno() != EINTR ) ) ) + || err != EINTR ) ) ) { ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN : LDAP_TIMEOUT); @@ -365,70 +335,96 @@ wait4msg( rc = LDAP_MSG_X_KEEP_LOOKING; /* select interrupted: loop */ } else { - rc = LDAP_MSG_X_KEEP_LOOKING; -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); -#endif - if ( ld->ld_requests && - ld->ld_requests->lr_status == LDAP_REQST_WRITING && - ldap_is_write_ready( ld, - ld->ld_requests->lr_conn->lconn_sb ) ) - { - ldap_int_flush_request( ld, ld->ld_requests ); - } -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); - ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); -#endif - for ( lc = ld->ld_conns; - rc == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; ) + lc_ready = 1; + } + } + if ( lc_ready ) { + LDAPConn *lnext; + rc = LDAP_MSG_X_KEEP_LOOKING; + LDAP_MUTEX_LOCK( &ld->ld_req_mutex ); + 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 ); + } + LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); + LDAP_MUTEX_LOCK( &ld->ld_conn_mutex ); + 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 ) ) { - if ( lc->lconn_status == LDAP_CONNST_CONNECTED && - ldap_is_read_ready( ld, lc->lconn_sb ) ) - { -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); -#endif - rc = try_read1msg( ld, msgid, all, &lc, result ); -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); -#endif - if ( lc == NULL ) { - /* if lc gets free()'d, - * there's no guarantee - * lc->lconn_next is still - * sane; better restart - * (ITS#4405) */ - lc = ld->ld_conns; - - /* don't get to next conn! */ - break; - } + /* Don't let it get freed out from under us */ + ++lc->lconn_refcnt; + LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex ); + rc = try_read1msg( ld, msgid, all, lc, result ); + lnext = lc->lconn_next; + + /* Only take locks if we're really freeing */ + if ( lc->lconn_refcnt <= 1 ) { + LDAP_MUTEX_LOCK( &ld->ld_req_mutex ); + ldap_free_connection( ld, lc, 0, 1 ); + LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex ); + } else { + --lc->lconn_refcnt; } - - /* next conn */ - lc = lc->lconn_next; + 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 ) { - 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; } } @@ -441,7 +437,7 @@ try_read1msg( LDAP *ld, ber_int_t msgid, int all, - LDAPConn **lcp, + LDAPConn *lc, LDAPMessage **result ) { BerElement *ber; @@ -451,10 +447,9 @@ try_read1msg( ber_tag_t tag; ber_len_t len; int foundit = 0; - LDAPRequest *lr, *tmplr; - LDAPConn *lc; + LDAPRequest *lr, *tmplr, dummy_lr = { 0 }; BerElement tmpber; - int rc, refer_cnt, hadref, simple_request; + int rc, refer_cnt, hadref, simple_request, err; ber_int_t lderr; #ifdef LDAP_CONNECTIONLESS @@ -462,29 +457,14 @@ 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 ); + assert( lc != NULL ); -#ifdef LDAP_R_COMPILE - LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); -#endif + LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); Debug( LDAP_DEBUG_TRACE, "read1msg: ld %p msgid %d all %d\n", (void *)ld, msgid, all ); - lc = *lcp; - retry: if ( lc->lconn_ber == NULL ) { lc->lconn_ber = ldap_alloc_ber_with_options( ld ); @@ -518,17 +498,16 @@ nextresp3: break; case LBER_DEFAULT: + err = sock_errno(); #ifdef LDAP_DEBUG Debug( LDAP_DEBUG_CONNS, "ber_get_next failed.\n", 0, 0, 0 ); #endif -#ifdef EWOULDBLOCK - if ( sock_errno() == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING; -#endif -#ifdef EAGAIN - if ( sock_errno() == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING; -#endif + if ( err == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING; + if ( err == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING; ld->ld_errno = LDAP_SERVER_DOWN; + --lc->lconn_refcnt; + lc->lconn_status = 0; return -1; default: @@ -543,63 +522,75 @@ nextresp3: 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 ( 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; + 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; - } + 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 ) ); + Debug( LDAP_DEBUG_ANY, + "abandoned/discarded ld %p msgid %d message type %s\n", + (void *)ld, 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 */ } - return( LDAP_MSG_X_KEEP_LOOKING ); /* continue looking */ - } - lr = ldap_find_request_by_msgid( ld, id ); - if ( lr == NULL ) { - const char *msg = "unknown"; + 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; + /* the message type */ + tag = ber_peek_tag( ber, &len ); + switch ( tag ) { + case LBER_ERROR: + break; - default: - msg = ldap_int_msgtype2str( tag ); - 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 ); + 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; + } - 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 */ tag = ber_peek_tag( ber, &len ); if ( tag == LBER_ERROR ) { @@ -609,8 +600,46 @@ nextresp2: } Debug( LDAP_DEBUG_TRACE, - "read1msg: ld %p msgid %ld message type %s\n", - (void *)ld, (long)lr->lr_msgid, ldap_int_msgtype2str( tag ) ); + "read1msg: ld %p msgid %d message type %s\n", + (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; refer_cnt = 0; @@ -619,22 +648,17 @@ 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 ) { + char **refs = NULL; + tmpber = *ber; + /* Get the referral list */ if ( ber_scanf( &tmpber, "{v}", &refs ) == LBER_ERROR ) { rc = LDAP_DECODING_ERROR; @@ -644,7 +668,7 @@ nextresp2: refer_cnt = ldap_chase_v3referrals( ld, lr, refs, 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; @@ -654,43 +678,45 @@ nextresp2: "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; + } 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; - 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 ); + 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; + } 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 */ 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) { rc = LDAP_DECODING_ERROR; @@ -702,125 +728,70 @@ nextresp2: } 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, " + "read1msg: referral %s 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; + 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; - } - } - } - } - - /* 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 { + switch ( lderr ) { + case LDAP_SUCCESS: + case LDAP_COMPARE_TRUE: + case LDAP_COMPARE_FALSE: + break; - } 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; + /* 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 { - lr->lr_res_errno = LDAP_PARTIAL_RESULTS; - } + } else if ( ld->ld_errno != LDAP_SUCCESS ) { + lr->lr_res_errno = ld->ld_errno; - 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 { + 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 ); - } + /* in any case, don't leave any lr_res_error 'round */ + if ( lr_res_error ) { + LDAP_FREE( lr_res_error ); } Debug( LDAP_DEBUG_TRACE, @@ -835,6 +806,10 @@ nextresp2: return( -1 ); /* fatal error */ } 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 { if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) { @@ -878,8 +853,8 @@ nextresp2: { id = lr->lr_msgid; tag = lr->lr_res_msgtype; - Debug( LDAP_DEBUG_ANY, "request done: ld %p msgid %ld\n", - (void *)ld, (long) id, 0 ); + Debug( LDAP_DEBUG_TRACE, "request done: ld %p msgid %d\n", + (void *)ld, id, 0 ); Debug( LDAP_DEBUG_TRACE, "res_errno: %d, res_error: <%s>, " "res_matched: <%s>\n", @@ -896,25 +871,27 @@ nextresp2: } } - ldap_return_request( ld, lr, 1 ); + if ( lr != &dummy_lr ) { + ldap_return_request( ld, lr, 1 ); + } lr = NULL; } - if ( lc != NULL ) { -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex ); -#endif - ldap_free_connection( ld, lc, 0, 1 ); -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex ); -#endif - lc = *lcp = NULL; + /* + * RFC 4511 unsolicited (id == 0) responses + * shouldn't necessarily end the connection + */ + if ( lc != NULL && id != 0 ) { + --lc->lconn_refcnt; + lc = NULL; } } } if ( lr != NULL ) { - ldap_return_request( ld, lr, 0 ); + if ( lr != &dummy_lr ) { + ldap_return_request( ld, lr, 0 ); + } lr = NULL; } @@ -922,6 +899,66 @@ nextresp2: 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 */ newmsg = (LDAPMessage *) LDAP_CALLOC( 1, sizeof(LDAPMessage) ); if ( newmsg == NULL ) { @@ -1022,7 +1059,8 @@ nextresp2: 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_ENTRY + && newmsg->lm_msgtype != LDAP_RES_INTERMEDIATE && newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) ) { *result = newmsg; @@ -1042,8 +1080,9 @@ nextresp2: 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; } @@ -1059,8 +1098,8 @@ nextresp2: goto exit; } - Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %ld type %ld:\n", - (void *)ld, (long) newmsg->lm_msgid, (long) newmsg->lm_msgtype ); + Debug( LDAP_DEBUG_TRACE, "adding response ld %p msgid %d type %ld:\n", + (void *)ld, newmsg->lm_msgid, (long) newmsg->lm_msgtype ); /* part of a search response - add to end of list of entries */ l->lm_chain_tail->lm_chain = newmsg; @@ -1068,10 +1107,11 @@ nextresp2: /* 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; } @@ -1251,9 +1291,7 @@ ldap_msgdelete( LDAP *ld, int msgid ) Debug( LDAP_DEBUG_TRACE, "ldap_msgdelete ld=%p msgid=%d\n", (void *)ld, msgid, 0 ); -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex ); -#endif + LDAP_MUTEX_LOCK( &ld->ld_res_mutex ); prev = NULL; for ( lm = ld->ld_responses; lm != NULL; lm = lm->lm_next ) { if ( lm->lm_msgid == msgid ) { @@ -1272,9 +1310,7 @@ ldap_msgdelete( LDAP *ld, int msgid ) prev->lm_next = lm->lm_next; } } -#ifdef LDAP_R_COMPILE - ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex ); -#endif + LDAP_MUTEX_UNLOCK( &ld->ld_res_mutex ); if ( lm ) { switch ( ldap_msgfree( lm ) ) { case LDAP_RES_SEARCH_ENTRY: @@ -1303,15 +1339,12 @@ ldap_msgdelete( LDAP *ld, int msgid ) static int ldap_abandoned( LDAP *ld, ber_int_t msgid, int *idxp ) { -#ifdef LDAP_R_COMPILE - LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); -#endif + LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); assert( idxp != NULL ); assert( msgid >= 0 ); - assert( ld->ld_nabandoned >= 0 ); - return lutil_bisect_find( ld->ld_abandoned, ld->ld_nabandoned, msgid, idxp ); + return ldap_int_bisect_find( ld->ld_abandoned, ld->ld_nabandoned, msgid, idxp ); } /* @@ -1322,23 +1355,13 @@ ldap_abandoned( LDAP *ld, ber_int_t msgid, int *idxp ) static int ldap_mark_abandoned( LDAP *ld, ber_int_t msgid, int idx ) { - int i; + LDAP_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); -#ifdef LDAP_R_COMPILE - LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex ); -#endif - - /* NOTE: those assertions are repeated in lutil_bisect_delete() */ + /* NOTE: those assertions are repeated in ldap_int_bisect_delete() */ assert( idx >= 0 ); - assert( idx < ld->ld_nabandoned ); + assert( (unsigned) idx < ld->ld_nabandoned ); assert( ld->ld_abandoned[ idx ] == msgid ); -#if 0 - fprintf( stderr, "--> ldap_mark_abandoned %p %p %d %d:\n", (void *)&i, (void *)ld, msgid, idx ); - for ( i = 0; i < ld->ld_nabandoned; i++ ) { - fprintf( stderr, "\t%p %p %d\n", (void *)&i, (void *)ld, ld->ld_abandoned[ i ] ); - } -#endif - - return lutil_bisect_delete( &ld->ld_abandoned, &ld->ld_nabandoned, msgid, idx ); + return ldap_int_bisect_delete( &ld->ld_abandoned, &ld->ld_nabandoned, + msgid, idx ); }