--- libraries/liblber/lber-int.h 2006/01/03 22:12:07 1.68 +++ libraries/liblber/lber-int.h 2008/02/11 23:26:41 1.68.2.3 @@ -1,7 +1,7 @@ -/* $OpenLDAP: pkg/ldap/libraries/liblber/lber-int.h,v 1.67 2005/11/12 17:26:17 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/libraries/liblber/lber-int.h,v 1.68.2.2 2007/08/31 23:13:54 quanah Exp $ */ /* 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 @@ -47,6 +47,11 @@ LBER_V (BER_ERRNO_FN) ber_int_errno_fn; #ifdef LDAP_MEMORY_DEBUG LBER_V (long) ber_int_meminuse; #endif +#if defined(LDAP_MEMORY_DEBUG) && ((LDAP_MEMORY_DEBUG +0) & 2) +# define LDAP_MEMORY_DEBUG_ASSERT assert +#else +# define LDAP_MEMORY_DEBUG_ASSERT(expr) ((void) 0) +#endif struct lber_options { short lbo_valid; @@ -99,9 +104,13 @@ struct sockbuf { #define sb_options sb_opts.lbo_options #define sb_debug sb_opts.lbo_debug ber_socket_t sb_fd; + ber_len_t sb_max_incoming; unsigned int sb_trans_needs_read:1; unsigned int sb_trans_needs_write:1; - ber_len_t sb_max_incoming; +#ifdef LDAP_PF_LOCAL_SENDMSG + char sb_ungetlen; + char sb_ungetbuf[8]; +#endif }; #define SOCKBUF_VALID( sb ) ( (sb)->sb_valid == LBER_VALID_SOCKBUF ) @@ -117,6 +126,14 @@ struct seqorset { /* + * decode.c, encode.c + */ + +/* Simplest OID max-DER-component to implement in both decode and encode */ +#define LBER_OID_COMPONENT_MAX ((unsigned long)-1 - 128) + + +/* * io.c */ LBER_F( int )