X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Flber.h;h=ea24431fcc1e2933462b0c11b3324bc1f9d7c05f;hb=c04f3e7706b740b9dc6a411ee3e9a882757dfbcd;hp=e05901d7e6a9f74208813b9d03860e0f7c157622;hpb=d37f3e6ee2e39c44dfb19b47174ecf182d233b1e;p=openldap diff --git a/include/lber.h b/include/lber.h index e05901d7e6..ea24431fcc 100644 --- a/include/lber.h +++ b/include/lber.h @@ -1,12 +1,13 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA + * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA * 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 at + * http://www.OpenLDAP.org/license.html or in file LICENSE in the + * top-level directory of the distribution. */ /* Portions * Copyright (c) 1990 Regents of the University of Michigan. @@ -23,9 +24,6 @@ #ifndef _LBER_H #define _LBER_H -#include -#include - #include LDAP_BEGIN_DECL @@ -85,7 +83,6 @@ LDAP_BEGIN_DECL /* LBER BerElement options */ #define LBER_USE_DER 0x01 -#define LBER_USE_INDEFINITE_LEN 0x02 /* get/set options for BerElement */ #define LBER_OPT_BER_OPTIONS 0x01 @@ -108,8 +105,6 @@ LDAP_BEGIN_DECL #define LBER_OPT_MEMORY_INUSE 0x8005 /* for memory debugging */ #define LBER_OPT_LOG_PROC 0x8006 /* for external logging function */ -typedef void (*BER_LOG_FN) LDAP_P((FILE *file, char *subsys, int level, const char *fmt, va_list vl)); - typedef int* (*BER_ERRNO_FN) LDAP_P(( void )); typedef void (*BER_LOG_PRINT_FN) LDAP_P(( LDAP_CONST char *buf )); @@ -126,7 +121,7 @@ typedef struct lber_memory_fns { BER_MEMFREE_FN bmf_free; } BerMemoryFunctions; -/* LBER Sockbuf_IO options */ +/* 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 @@ -137,8 +132,10 @@ typedef struct lber_memory_fns { #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 /* Largest option used by the library */ -#define LBER_SB_OPT_OPT_MAX 12 +#define LBER_SB_OPT_OPT_MAX 14 /* LBER IO operations stacking levels */ #define LBER_SBIOD_LEVEL_PROVIDER 10 @@ -157,6 +154,7 @@ typedef struct lber_memory_fns { #define LBER_OPT_SUCCESS (0) #define LBER_OPT_ERROR (-1) +#define LBER_ELEMENT_SIZEOF (256) /* must be >= sizeof(BerElement) */ typedef struct berelement BerElement; typedef struct sockbuf Sockbuf; typedef struct seqorset Seqorset; @@ -177,12 +175,12 @@ 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 ); }; @@ -204,6 +202,8 @@ typedef struct berval { char *bv_val; } BerValue; +typedef BerValue *BerVarray; /* To distinguish from a single bv */ + /* this should be moved to lber-int.h */ /* @@ -225,10 +225,6 @@ LBER_F( void ) ber_sos_dump LDAP_P(( Seqorset *sos )); -LBER_F( int ) -ber_pvt_log_output LDAP_P(( - char *subsystem, int level, const char *fmt, ... )); - /* * in decode.c: */ @@ -267,6 +263,12 @@ ber_get_stringb LDAP_P(( char *buf, ber_len_t *len )); +LBER_F( ber_tag_t ) +ber_get_stringbv LDAP_P(( + BerElement *ber, + struct berval *bv, + int alloc )); + LBER_F( ber_tag_t ) ber_get_stringa LDAP_P(( BerElement *ber, @@ -305,7 +307,7 @@ ber_next_element LDAP_P(( LDAP_CONST char *last )); LBER_F( ber_tag_t ) -ber_scanf LDAP_P(( +ber_scanf LDAP_P(( BerElement *ber, LDAP_CONST char *fmt, ... )); @@ -339,7 +341,7 @@ ber_put_ostring LDAP_P(( LBER_F( int ) ber_put_berval LDAP_P(( BerElement *ber, - LDAP_CONST struct berval *bv, + struct berval *bv, ber_tag_t tag )); LBER_F( int ) @@ -413,6 +415,9 @@ ber_free LDAP_P(( BerElement *ber, int freebuf )); +LBER_F( void ) +ber_free_buf LDAP_P(( BerElement *ber )); + LBER_F( int ) ber_flush LDAP_P(( Sockbuf *sb, @@ -439,6 +444,12 @@ ber_get_next LDAP_P(( ber_len_t *len, BerElement *ber )); +LBER_F( void ) +ber_init2 LDAP_P(( + BerElement *ber, + struct berval *bv, + int options )); + LBER_F( void ) ber_init_w_nullc LDAP_P(( /* DEPRECATED */ BerElement *ber, @@ -458,6 +469,12 @@ ber_flatten LDAP_P(( BerElement *ber, struct berval **bvPtr )); +LBER_F( int ) +ber_flatten2 LDAP_P(( + BerElement *ber, + struct berval *bv, + int alloc )); + /* * LBER ber accessor functions */ @@ -505,10 +522,13 @@ ber_sockbuf_ctrl LDAP_P(( int opt, void *arg )); -LBER_F( Sockbuf_IO ) ber_sockbuf_io_tcp; -LBER_F( Sockbuf_IO ) ber_sockbuf_io_readahead; -LBER_F( Sockbuf_IO ) ber_sockbuf_io_fd; -LBER_F( Sockbuf_IO ) ber_sockbuf_io_debug; +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; +#ifdef LDAP_CONNECTIONLESS +LBER_V( Sockbuf_IO ) ber_sockbuf_io_udp; +#endif /* * LBER memory.c @@ -548,22 +568,40 @@ ber_bvecadd LDAP_P(( struct berval ***bvec, struct berval *bv )); +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 )); LBER_F( struct berval * ) -ber_bvstr LDAP_P(( - LDAP_CONST char * )); +ber_str2bv LDAP_P(( + LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv)); LBER_F( struct berval * ) -ber_bvstrdup LDAP_P(( - LDAP_CONST char * )); +ber_mem2bv LDAP_P(( + LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv)); + +#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( 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 */