Diff for /libraries/libldap/result.c between versions 1.64.2.7 and 1.64.2.8

version 1.64.2.7, 2002/10/17 15:08:01 version 1.64.2.8, 2002/10/29 01:07:12
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.64.2.6 2002/08/30 01:09:36 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.64.2.7 2002/10/17 15:08:01 kurt Exp $ */
 /*  /*
  * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 416  try_read1msg( Line 416  try_read1msg(
         Debug( LDAP_DEBUG_TRACE, "read1msg: msgid %d, all %d\n", msgid, all, 0 );          Debug( LDAP_DEBUG_TRACE, "read1msg: msgid %d, all %d\n", msgid, all, 0 );
 #endif  #endif
   
   retry:
     if ( lc->lconn_ber == NULL ) {      if ( lc->lconn_ber == NULL ) {
                 lc->lconn_ber = ldap_alloc_ber_with_options(ld);                  lc->lconn_ber = ldap_alloc_ber_with_options(ld);
   
Line 427  try_read1msg( Line 428  try_read1msg(
         ber = lc->lconn_ber;          ber = lc->lconn_ber;
         assert( LBER_VALID (ber) );          assert( LBER_VALID (ber) );
   
   retry2:
         /* get the next message */          /* get the next message */
         errno = 0;          errno = 0;
 #ifdef LDAP_CONNECTIONLESS  #ifdef LDAP_CONNECTIONLESS
Line 475  try_read1msg( Line 477  try_read1msg(
   
         /* if it's been abandoned, toss it */          /* if it's been abandoned, toss it */
         if ( ldap_abandoned( ld, id ) ) {          if ( ldap_abandoned( ld, id ) ) {
                 ber_free( ber, 1 );  
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
                 LDAP_LOG ( OPERATION, DETAIL1, "read1msg: abandoned\n", 0, 0, 0 );                  LDAP_LOG ( OPERATION, DETAIL1, "read1msg: abandoned\n", 0, 0, 0 );
 #else  #else
                 Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0);                  Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0);
 #endif  #endif
   retry_ber:
                   if ( ber_sockbuf_ctrl( sb, LBER_SB_OPT_DATA_READY, NULL ) ) {
                           ber_free_buf( ber );
                           ber_init2( ber, NULL, ld->ld_lberoptions );
                           goto retry2;
                   }
                   ber_free( ber, 1 );
                 return( -2 );   /* continue looking */                  return( -2 );   /* continue looking */
         }          }
   
Line 494  try_read1msg( Line 502  try_read1msg(
                     "no request for response with msgid %ld (tossing)\n",                      "no request for response with msgid %ld (tossing)\n",
                     (long) id, 0, 0 );                      (long) id, 0, 0 );
 #endif  #endif
                 ber_free( ber, 1 );                  goto retry_ber;
                 return( -2 );   /* continue looking */  
         }          }
 #ifdef LDAP_CONNECTIONLESS  #ifdef LDAP_CONNECTIONLESS
         if (LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {          if (LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
Line 843  lr->lr_res_matched ? lr->lr_res_matched Line 850  lr->lr_res_matched ? lr->lr_res_matched
   
                 new->lm_next = ld->ld_responses;                  new->lm_next = ld->ld_responses;
                 ld->ld_responses = new;                  ld->ld_responses = new;
                 return( -2 );   /* continue looking */                  goto leave;
         }          }
   
 #ifdef NEW_LOGGING  #ifdef NEW_LOGGING
Line 886  lr->lr_res_matched ? lr->lr_res_matched Line 893  lr->lr_res_matched ? lr->lr_res_matched
 #endif  /* !LDAP_WORLD_P16 */  #endif  /* !LDAP_WORLD_P16 */
         }          }
   
   leave:
           if ( ber_sockbuf_ctrl( sb, LBER_SB_OPT_DATA_READY, NULL ) ) {
                   goto retry;
           }
         return( -2 );   /* continue looking */          return( -2 );   /* continue looking */
 }  }
   

Removed from v.1.64.2.7  
changed lines
  Added in v.1.64.2.8


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org