X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flber.h;h=ed1dcc1bee8ef77ea089769ed151cebfeb9be8a9;hb=d0dd8616f1c68a868afeb8c2c5c09969e366e2c0;hp=8315bacb9dd6b0a4392c2c61691415331e0e753b;hpb=0bb431d3b38f6d7feab4bcd175bac226ef5e02be;p=openldap
diff --git a/include/lber.h b/include/lber.h
index 8315bacb9d..ed1dcc1bee 100644
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,15 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
* All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License. A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -24,12 +27,17 @@
#define _LBER_H
#include
+#include
LDAP_BEGIN_DECL
-/* Overview of LBER tag construction
+/*
+ * ber_tag_t represents the identifier octets at the beginning of BER
+ * elements. OpenLDAP treats them as mere big-endian unsigned integers.
*
- * Bits
+ * Actually the BER identifier octets look like this:
+ *
+ * Bits of 1st octet:
* ______
* 8 7 | CLASS
* 0 0 = UNIVERSAL
@@ -42,16 +50,20 @@ LDAP_BEGIN_DECL
* 1 = CONSTRUCTED
* ___________
* | 5 ... 1 | TAG-NUMBER
+ *
+ * For ASN.1 tag numbers >= 0x1F, TAG-NUMBER above is 0x1F and the next
+ * BER octets contain the actual ASN.1 tag number: Big-endian, base
+ * 128, 8.bit = 1 in all but the last octet, minimum number of octets.
*/
-/* BER classes and mask */
+/* BER classes and mask (in 1st identifier octet) */
#define LBER_CLASS_UNIVERSAL ((ber_tag_t) 0x00U)
#define LBER_CLASS_APPLICATION ((ber_tag_t) 0x40U)
#define LBER_CLASS_CONTEXT ((ber_tag_t) 0x80U)
#define LBER_CLASS_PRIVATE ((ber_tag_t) 0xc0U)
#define LBER_CLASS_MASK ((ber_tag_t) 0xc0U)
-/* BER encoding type and mask */
+/* BER encoding type and mask (in 1st identifier octet) */
#define LBER_PRIMITIVE ((ber_tag_t) 0x00U)
#define LBER_CONSTRUCTED ((ber_tag_t) 0x20U)
#define LBER_ENCODING_MASK ((ber_tag_t) 0x20U)
@@ -60,13 +72,10 @@ LDAP_BEGIN_DECL
#define LBER_MORE_TAG_MASK ((ber_tag_t) 0x80U)
/*
- * Note that LBER_ERROR and LBER_DEFAULT are values that can never appear
- * as valid BER tags, and so it is safe to use them to report errors. In
- * fact, any tag for which the following is true is invalid:
+ * LBER_ERROR and LBER_DEFAULT are values that can never appear
+ * as valid BER tags, so it is safe to use them to report errors.
+ * Valid tags have (tag & (ber_tag_t) 0xFF) != 0xFF.
*/
-#define LBER_INVALID(t) (((t) & (ber_tag_t) 0x080UL) \
- && (((t) & (ber_tag_t) ~ 0x0FF))
-
#define LBER_ERROR ((ber_tag_t) -1)
#define LBER_DEFAULT ((ber_tag_t) -1)
@@ -80,15 +89,8 @@ LDAP_BEGIN_DECL
#define LBER_SEQUENCE ((ber_tag_t) 0x30UL) /* constructed */
#define LBER_SET ((ber_tag_t) 0x31UL) /* constructed */
-typedef int (*BERTranslateProc) LDAP_P((
- char **bufp,
- ber_len_t *buflenp,
- int free_input ));
-
/* LBER BerElement options */
#define LBER_USE_DER 0x01
-#define LBER_USE_INDEFINITE_LEN 0x02
-#define LBER_TRANSLATE_STRINGS 0x04 /* deprecated */
/* get/set options for BerElement */
#define LBER_OPT_BER_OPTIONS 0x01
@@ -96,6 +98,7 @@ typedef int (*BERTranslateProc) LDAP_P((
#define LBER_OPT_BER_REMAINING_BYTES 0x03
#define LBER_OPT_BER_TOTAL_BYTES 0x04
#define LBER_OPT_BER_BYTES_TO_WRITE 0x05
+#define LBER_OPT_BER_MEMCTX 0x06
#define LBER_OPT_DEBUG_LEVEL LBER_OPT_BER_DEBUG
#define LBER_OPT_REMAINING_BYTES LBER_OPT_BER_REMAINING_BYTES
@@ -107,27 +110,50 @@ typedef int (*BERTranslateProc) LDAP_P((
#define LBER_OPT_ERROR_FN 0x8003
#define LBER_OPT_LOG_PRINT_FILE 0x8004
+/* get/set Memory Debug options */
+#define LBER_OPT_MEMORY_INUSE 0x8005 /* for memory debugging */
+#define LBER_OPT_LOG_PROC 0x8006 /* for external logging function */
+
typedef int* (*BER_ERRNO_FN) LDAP_P(( void ));
-typedef void (*BER_LOG_PRINT_FN) LDAP_P(( char *buf ));
+typedef void (*BER_LOG_PRINT_FN) LDAP_P(( LDAP_CONST char *buf ));
-typedef void* (*BER_MEMALLOC_FN) LDAP_P(( ber_len_t size ));
-typedef void* (*BER_MEMCALLOC_FN) LDAP_P(( ber_len_t n, ber_len_t size ));
-typedef void* (*BER_MEMREALLOC_FN) LDAP_P(( void *p, ber_len_t size ));
-typedef void (*BER_MEMFREE_FN) LDAP_P(( void *p ));
+typedef void* (BER_MEMALLOC_FN) LDAP_P(( ber_len_t size, void *ctx ));
+typedef void* (BER_MEMCALLOC_FN) LDAP_P(( ber_len_t n, ber_len_t size, void *ctx ));
+typedef void* (BER_MEMREALLOC_FN) LDAP_P(( void *p, ber_len_t size, void *ctx ));
+typedef void (BER_MEMFREE_FN) LDAP_P(( void *p, void *ctx ));
typedef struct lber_memory_fns {
- BER_MEMALLOC_FN bmf_malloc;
- BER_MEMCALLOC_FN bmf_calloc;
- BER_MEMREALLOC_FN bmf_realloc;
- BER_MEMFREE_FN bmf_free;
+ BER_MEMALLOC_FN *bmf_malloc;
+ BER_MEMCALLOC_FN *bmf_calloc;
+ BER_MEMREALLOC_FN *bmf_realloc;
+ BER_MEMFREE_FN *bmf_free;
} BerMemoryFunctions;
-/* LBER Sockbuf options */
-#define LBER_TO_FILE 0x01 /* to a file referenced by sb_fd */
-#define LBER_TO_FILE_ONLY 0x02 /* only write to file, not network */
-#define LBER_MAX_INCOMING_SIZE 0x04 /* impose limit on incoming stuff */
-#define LBER_NO_READ_AHEAD 0x08 /* read only as much as requested */
+/* LBER Sockbuf_IO options */
+#define LBER_SB_OPT_GET_FD 1
+#define LBER_SB_OPT_SET_FD 2
+#define LBER_SB_OPT_HAS_IO 3
+#define LBER_SB_OPT_SET_NONBLOCK 4
+#define LBER_SB_OPT_GET_SSL 7
+#define LBER_SB_OPT_DATA_READY 8
+#define LBER_SB_OPT_SET_READAHEAD 9
+#define LBER_SB_OPT_DRAIN 10
+#define LBER_SB_OPT_NEEDS_READ 11
+#define LBER_SB_OPT_NEEDS_WRITE 12
+#define LBER_SB_OPT_GET_MAX_INCOMING 13
+#define LBER_SB_OPT_SET_MAX_INCOMING 14
+
+/* Only meaningful ifdef LDAP_PF_LOCAL_SENDMSG */
+#define LBER_SB_OPT_UNGET_BUF 15
+
+/* Largest option used by the library */
+#define LBER_SB_OPT_OPT_MAX 15
+
+/* LBER IO operations stacking levels */
+#define LBER_SBIOD_LEVEL_PROVIDER 10
+#define LBER_SBIOD_LEVEL_TRANSPORT 20
+#define LBER_SBIOD_LEVEL_APPLICATION 30
/* get/set options for Sockbuf */
#define LBER_OPT_SOCKBUF_DESC 0x1000
@@ -135,7 +161,8 @@ typedef struct lber_memory_fns {
#define LBER_OPT_SOCKBUF_DEBUG 0x1002
/* on/off values */
-#define LBER_OPT_ON ((void *) 1)
+LBER_V( char ) ber_pvt_opt_on;
+#define LBER_OPT_ON ((void *) &ber_pvt_opt_on)
#define LBER_OPT_OFF ((void *) 0)
#define LBER_OPT_SUCCESS (0)
@@ -143,7 +170,43 @@ typedef struct lber_memory_fns {
typedef struct berelement BerElement;
typedef struct sockbuf Sockbuf;
-typedef struct seqorset Seqorset;
+
+typedef struct sockbuf_io Sockbuf_IO;
+
+/* Structure for LBER IO operarion descriptor */
+typedef struct sockbuf_io_desc {
+ int sbiod_level;
+ Sockbuf *sbiod_sb;
+ Sockbuf_IO *sbiod_io;
+ void *sbiod_pvt;
+ struct sockbuf_io_desc *sbiod_next;
+} Sockbuf_IO_Desc;
+
+/* Structure for LBER IO operation functions */
+struct sockbuf_io {
+ int (*sbi_setup)( Sockbuf_IO_Desc *sbiod, void *arg );
+ int (*sbi_remove)( Sockbuf_IO_Desc *sbiod );
+ int (*sbi_ctrl)( Sockbuf_IO_Desc *sbiod, int opt, void *arg);
+
+ ber_slen_t (*sbi_read)( Sockbuf_IO_Desc *sbiod, void *buf,
+ ber_len_t len );
+ ber_slen_t (*sbi_write)( Sockbuf_IO_Desc *sbiod, void *buf,
+ ber_len_t len );
+
+ int (*sbi_close)( Sockbuf_IO_Desc *sbiod );
+};
+
+/* Helper macros for LBER IO functions */
+#define LBER_SBIOD_READ_NEXT( sbiod, buf, len ) \
+ ( (sbiod)->sbiod_next->sbiod_io->sbi_read( (sbiod)->sbiod_next, \
+ buf, len ) )
+#define LBER_SBIOD_WRITE_NEXT( sbiod, buf, len ) \
+ ( (sbiod)->sbiod_next->sbiod_io->sbi_write( (sbiod)->sbiod_next, \
+ buf, len ) )
+#define LBER_SBIOD_CTRL_NEXT( sbiod, opt, arg ) \
+ ( (sbiod)->sbiod_next ? \
+ ( (sbiod)->sbiod_next->sbiod_io->sbi_ctrl( \
+ (sbiod)->sbiod_next, opt, arg ) ) : 0 )
/* structure for returning a sequence of octet strings + length */
typedef struct berval {
@@ -151,28 +214,25 @@ typedef struct berval {
char *bv_val;
} BerValue;
+typedef BerValue *BerVarray; /* To distinguish from a single bv */
+
/* this should be moved to lber-int.h */
/*
* in bprint.c:
*/
-LIBLBER_F( void )
-ber_print_error LDAP_P((
+LBER_F( void )
+ber_error_print LDAP_P((
LDAP_CONST char *data ));
-LIBLBER_F( void )
+LBER_F( void )
ber_bprint LDAP_P((
LDAP_CONST char *data, ber_len_t len ));
-LIBLBER_F( void )
+LBER_F( void )
ber_dump LDAP_P((
BerElement *ber, int inout ));
-LIBLBER_F( void )
-ber_sos_dump LDAP_P((
- Seqorset *sos ));
-
-
/*
* in decode.c:
*/
@@ -181,155 +241,187 @@ typedef int (*BERDecodeCallback) LDAP_P((
void *data,
int mode ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_get_tag LDAP_P((
BerElement *ber ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_skip_tag LDAP_P((
BerElement *ber,
ber_len_t *len ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_peek_tag LDAP_P((
BerElement *ber,
ber_len_t *len ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
+ber_skip_element LDAP_P((
+ BerElement *ber,
+ struct berval *bv ));
+
+LBER_F( ber_tag_t )
+ber_peek_element LDAP_P((
+ LDAP_CONST BerElement *ber,
+ struct berval *bv ));
+
+LBER_F( ber_tag_t )
ber_get_int LDAP_P((
BerElement *ber,
ber_int_t *num ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
+ber_get_enum LDAP_P((
+ BerElement *ber,
+ ber_int_t *num ));
+
+LBER_F( ber_tag_t )
ber_get_stringb LDAP_P((
BerElement *ber,
char *buf,
ber_len_t *len ));
-LIBLBER_F( ber_tag_t )
+#define LBER_BV_ALLOC 0x01 /* allocate/copy result, otherwise in-place */
+#define LBER_BV_NOTERM 0x02 /* omit NUL-terminator if parsing in-place */
+#define LBER_BV_STRING 0x04 /* fail if berval contains embedded \0 */
+/* LBER_BV_STRING currently accepts a terminating \0 in the berval, because
+ * Active Directory sends that in at least the diagonsticMessage field.
+ */
+
+LBER_F( ber_tag_t )
+ber_get_stringbv LDAP_P((
+ BerElement *ber,
+ struct berval *bv,
+ int options ));
+
+LBER_F( ber_tag_t )
ber_get_stringa LDAP_P((
BerElement *ber,
char **buf ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_get_stringal LDAP_P((
BerElement *ber,
struct berval **bv ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_get_bitstringa LDAP_P((
BerElement *ber,
char **buf,
ber_len_t *len ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_get_null LDAP_P((
BerElement *ber ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_get_boolean LDAP_P((
BerElement *ber,
ber_int_t *boolval ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_first_element LDAP_P((
BerElement *ber,
ber_len_t *len,
char **last ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_next_element LDAP_P((
BerElement *ber,
ber_len_t *len,
LDAP_CONST char *last ));
-LIBLBER_F( ber_tag_t )
-ber_scanf LDAP_P((
+LBER_F( ber_tag_t )
+ber_scanf LDAP_P((
BerElement *ber,
LDAP_CONST char *fmt,
... ));
-LIBLBER_F( void )
-ber_set_string_translators LDAP_P((
- BerElement *ber,
- BERTranslateProc encode_proc,
- BERTranslateProc decode_proc ));
+LBER_F( int )
+ber_decode_oid LDAP_P((
+ struct berval *in,
+ struct berval *out ));
/*
* in encode.c
*/
+LBER_F( int )
+ber_encode_oid LDAP_P((
+ struct berval *in,
+ struct berval *out ));
+
typedef int (*BEREncodeCallback) LDAP_P((
BerElement *ber,
void *data ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_enum LDAP_P((
BerElement *ber,
ber_int_t num,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_int LDAP_P((
BerElement *ber,
ber_int_t num,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_ostring LDAP_P((
BerElement *ber,
LDAP_CONST char *str,
ber_len_t len,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_berval LDAP_P((
BerElement *ber,
- LDAP_CONST struct berval *bv,
+ struct berval *bv,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_string LDAP_P((
BerElement *ber,
LDAP_CONST char *str,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_bitstring LDAP_P((
BerElement *ber,
LDAP_CONST char *str,
ber_len_t bitlen,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_null LDAP_P((
BerElement *ber,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_boolean LDAP_P((
BerElement *ber,
ber_int_t boolval,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_start_seq LDAP_P((
BerElement *ber,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_start_set LDAP_P((
BerElement *ber,
ber_tag_t tag ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_seq LDAP_P((
BerElement *ber ));
-LIBLBER_F( int )
+LBER_F( int )
ber_put_set LDAP_P((
BerElement *ber ));
-LIBLBER_F( int )
+LBER_F( int )
ber_printf LDAP_P((
BerElement *ber,
LDAP_CONST char *fmt,
@@ -340,80 +432,114 @@ ber_printf LDAP_P((
* in io.c:
*/
-LIBLBER_F( ber_slen_t )
+LBER_F( ber_slen_t )
+ber_skip_data LDAP_P((
+ BerElement *ber,
+ ber_len_t len ));
+
+LBER_F( ber_slen_t )
ber_read LDAP_P((
BerElement *ber,
char *buf,
ber_len_t len ));
-LIBLBER_F( ber_slen_t )
+LBER_F( ber_slen_t )
ber_write LDAP_P((
BerElement *ber,
LDAP_CONST char *buf,
ber_len_t len,
- int nosos ));
+ int zero )); /* nonzero is unsupported from OpenLDAP 2.4.18 */
-LIBLBER_F( void )
+LBER_F( void )
ber_free LDAP_P((
BerElement *ber,
int freebuf ));
-LIBLBER_F( int )
-ber_flush LDAP_P((
+LBER_F( void )
+ber_free_buf LDAP_P(( BerElement *ber ));
+
+LBER_F( int )
+ber_flush2 LDAP_P((
Sockbuf *sb,
BerElement *ber,
int freeit ));
+#define LBER_FLUSH_FREE_NEVER (0x0) /* traditional behavior */
+#define LBER_FLUSH_FREE_ON_SUCCESS (0x1) /* traditional behavior */
+#define LBER_FLUSH_FREE_ON_ERROR (0x2)
+#define LBER_FLUSH_FREE_ALWAYS (LBER_FLUSH_FREE_ON_SUCCESS|LBER_FLUSH_FREE_ON_ERROR)
+
+LBER_F( int )
+ber_flush LDAP_P((
+ Sockbuf *sb,
+ BerElement *ber,
+ int freeit )); /* DEPRECATED */
-LIBLBER_F( BerElement * )
+LBER_F( BerElement * )
ber_alloc LDAP_P(( void )); /* DEPRECATED */
-LIBLBER_F( BerElement * )
+LBER_F( BerElement * )
der_alloc LDAP_P(( void )); /* DEPRECATED */
-LIBLBER_F( BerElement * )
+LBER_F( BerElement * )
ber_alloc_t LDAP_P((
int beroptions ));
-LIBLBER_F( BerElement * )
+LBER_F( BerElement * )
ber_dup LDAP_P((
BerElement *ber ));
-LIBLBER_F( ber_tag_t )
+LBER_F( ber_tag_t )
ber_get_next LDAP_P((
Sockbuf *sb,
ber_len_t *len,
BerElement *ber ));
-LIBLBER_F( void )
-ber_init_w_nullc LDAP_P((
+LBER_F( void )
+ber_init2 LDAP_P((
BerElement *ber,
+ struct berval *bv,
int options ));
-LIBLBER_F( void )
+LBER_F( void )
+ber_init_w_nullc LDAP_P(( /* DEPRECATED */
+ BerElement *ber,
+ int options ));
+
+LBER_F( void )
ber_reset LDAP_P((
BerElement *ber,
int was_writing ));
-LIBLBER_F( BerElement * )
+LBER_F( BerElement * )
ber_init LDAP_P((
struct berval *bv ));
-LIBLBER_F( int )
+LBER_F( int )
ber_flatten LDAP_P((
BerElement *ber,
struct berval **bvPtr ));
+LBER_F( int )
+ber_flatten2 LDAP_P((
+ BerElement *ber,
+ struct berval *bv,
+ int alloc ));
+
+LBER_F( int )
+ber_remaining LDAP_P((
+ BerElement *ber ));
+
/*
* LBER ber accessor functions
*/
-LIBLBER_F( int )
+LBER_F( int )
ber_get_option LDAP_P((
void *item,
int option,
void *outvalue));
-LIBLBER_F( int )
+LBER_F( int )
ber_set_option LDAP_P((
void *item,
int option,
@@ -423,75 +549,127 @@ ber_set_option LDAP_P((
* LBER sockbuf.c
*/
-LIBLBER_F( Sockbuf * )
-ber_sockbuf_alloc( void );
+LBER_F( Sockbuf * )
+ber_sockbuf_alloc LDAP_P((
+ void ));
+
+LBER_F( void )
+ber_sockbuf_free LDAP_P((
+ Sockbuf *sb ));
-LIBLBER_F( Sockbuf * )
-ber_sockbuf_alloc_fd(
- ber_socket_t fd );
+LBER_F( int )
+ber_sockbuf_add_io LDAP_P((
+ Sockbuf *sb,
+ Sockbuf_IO *sbio,
+ int layer,
+ void *arg ));
+
+LBER_F( int )
+ber_sockbuf_remove_io LDAP_P((
+ Sockbuf *sb,
+ Sockbuf_IO *sbio,
+ int layer ));
+
+LBER_F( int )
+ber_sockbuf_ctrl LDAP_P((
+ Sockbuf *sb,
+ int opt,
+ void *arg ));
-LIBLBER_F( void )
-ber_sockbuf_free(
- Sockbuf *sb );
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_tcp;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_readahead;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_fd;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_debug;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_udp;
/*
* LBER memory.c
*/
-LIBLBER_F( void * )
+LBER_F( void * )
ber_memalloc LDAP_P((
ber_len_t s ));
-LIBLBER_F( void * )
+LBER_F( void * )
ber_memrealloc LDAP_P((
void* p,
ber_len_t s ));
-LIBLBER_F( void * )
+LBER_F( void * )
ber_memcalloc LDAP_P((
ber_len_t n,
ber_len_t s ));
-LIBLBER_F( void )
+LBER_F( void )
ber_memfree LDAP_P((
void* p ));
-LIBLBER_F( void )
+LBER_F( void )
ber_memvfree LDAP_P((
void** vector ));
-LIBLBER_F( void )
+LBER_F( void )
ber_bvfree LDAP_P((
struct berval *bv ));
-LIBLBER_F( void )
+LBER_F( void )
ber_bvecfree LDAP_P((
struct berval **bv ));
-LIBLBER_F( int )
+LBER_F( int )
ber_bvecadd LDAP_P((
struct berval ***bvec,
struct berval *bv ));
-LIBLBER_F( struct berval * )
+LBER_F( struct berval * )
+ber_dupbv LDAP_P((
+ struct berval *dst, struct berval *src ));
+
+LBER_F( struct berval * )
ber_bvdup LDAP_P((
- LDAP_CONST struct berval *bv ));
+ struct berval *src ));
-LIBLBER_F( struct berval * )
-ber_bvstr LDAP_P((
- LDAP_CONST char * ));
+LBER_F( struct berval * )
+ber_mem2bv LDAP_P((
+ LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
-LIBLBER_F( struct berval * )
-ber_bvstrdup LDAP_P((
- LDAP_CONST char * ));
+LBER_F( struct berval * )
+ber_str2bv LDAP_P((
+ LDAP_CONST char *, ber_len_t len, int duplicate, struct berval *bv));
-LIBLBER_F( char * )
+#define ber_bvstr(a) ((ber_str2bv)((a), 0, 0, NULL))
+#define ber_bvstrdup(a) ((ber_str2bv)((a), 0, 1, NULL))
+
+LBER_F( char * )
ber_strdup LDAP_P((
LDAP_CONST char * ));
+LBER_F( ber_len_t )
+ber_strnlen LDAP_P((
+ LDAP_CONST char *s, ber_len_t len ));
+
+LBER_F( char * )
+ber_strndup LDAP_P((
+ LDAP_CONST char *s, ber_len_t l ));
+
+LBER_F( struct berval * )
+ber_bvreplace LDAP_P((
+ struct berval *dst, LDAP_CONST struct berval *src ));
+
+LBER_F( void )
+ber_bvarray_free LDAP_P(( BerVarray p ));
+
+LBER_F( int )
+ber_bvarray_add LDAP_P(( BerVarray *p, BerValue *bv ));
+
+#define ber_bvcmp(v1,v2) \
+ ((v1)->bv_len < (v2)->bv_len \
+ ? -1 : ((v1)->bv_len > (v2)->bv_len \
+ ? 1 : memcmp((v1)->bv_val, (v2)->bv_val, (v1)->bv_len) ))
+
/*
* error.c
*/
-LIBLBER_F( int * ) ber_errno_addr LDAP_P((void));
+LBER_F( int * ) ber_errno_addr LDAP_P((void));
#define ber_errno (*(ber_errno_addr)())
#define LBER_ERROR_NONE 0