X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Flber-int.h;h=1d6ad83ba3a2bb841539d4910cd1f5c9b08a2ecb;hb=9cfcdc432bd89fe243adb29a91ce1d8fddad459d;hp=81def4b97455d8efc3db2e87ca244a71af1f49f2;hpb=a3ac3be6a7b0dd405c940ea62f7aa6af6dbe6caf;p=openldap diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h index 81def4b974..1d6ad83ba3 100644 --- a/libraries/liblber/lber-int.h +++ b/libraries/liblber/lber-int.h @@ -1,4 +1,9 @@ +/* $OpenLDAP$ */ /* + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ +/* Portions * Copyright (c) 1990 Regents of the University of Michigan. * All rights reserved. * @@ -15,23 +20,63 @@ #include "lber.h" #include "ldap_log.h" +#include "lber_pvt.h" +#include "ldap_queue.h" LDAP_BEGIN_DECL -#define LBER_ITEM_BERELEMENT 1 -#define LBER_ITEM_SOCKBUF 2 +typedef void (*BER_LOG_FN)(FILE *file, + const char *subsys, int level, const char *fmt, ... ); -extern int lber_int_debug; +LBER_V (BER_ERRNO_FN) ber_int_errno_fn; -struct berelement { - short ber_item_type; /* always LBER_ITEM_BERELEMENT */ - short ber_options; - int ber_debug; +struct lber_options { + short lbo_valid; + unsigned short lbo_options; + int lbo_debug; + long lbo_meminuse; +}; + +#ifdef NEW_LOGGING +/* +# ifdef LDAP_DEBUG +# ifdef LDAP_LOG +# undef LDAP_LOG +# endif +# define LDAP_LOG(a) ber_pvt_log_output a + */ +# define BER_DUMP(a) ber_output_dump a +/* +# else +# define LDAP_LOG(a) +# define BER_DUMP(a) +# endif + */ +#endif + +LBER_F( int ) ber_pvt_log_output( + const char *subsystem, + int level, + const char *fmt, ... ); - int ber_usertag; +#define LBER_UNINITIALIZED 0x0 +#define LBER_INITIALIZED 0x1 +#define LBER_VALID_BERELEMENT 0x2 +#define LBER_VALID_SOCKBUF 0x3 - unsigned long ber_tag; - unsigned long ber_len; +LBER_V (struct lber_options) ber_int_options; +#define ber_int_debug ber_int_options.lbo_debug + +struct berelement { + struct lber_options ber_opts; +#define ber_valid ber_opts.lbo_valid +#define ber_options ber_opts.lbo_options +#define ber_debug ber_opts.lbo_debug + + /* Do not change the order of these 3 fields! see ber_get_next */ + ber_tag_t ber_tag; + ber_len_t ber_len; + ber_tag_t ber_usertag; char *ber_buf; char *ber_ptr; @@ -39,69 +84,124 @@ struct berelement { struct seqorset *ber_sos; char *ber_rwptr; - BERTranslateProc ber_encode_translate_proc; - BERTranslateProc ber_decode_translate_proc; }; -#define NULLBER ((BerElement *) 0) +#define LBER_VALID(ber) ((ber)->ber_valid==LBER_VALID_BERELEMENT) + +#define ber_pvt_ber_remaining(ber) ((ber)->ber_end - (ber)->ber_ptr) +#define ber_pvt_ber_total(ber) ((ber)->ber_end - (ber)->ber_buf) +#define ber_pvt_ber_write(ber) ((ber)->ber_ptr - (ber)->ber_buf) struct sockbuf { - short sb_item_type; /* always LBER_ITEM_SOCKBUF */ - short sb_options; /* to support copying ber elements */ - int sb_debug; - - int sb_fd; -#ifndef MACOS - int sb_sd; -#else /* MACOS */ - void *sb_sd; -#endif /* MACOS */ - - long sb_max_incoming; - - BerElement sb_ber; - - int sb_naddr; /* > 0 implies using CLDAP (UDP) */ - void *sb_useaddr; /* pointer to sockaddr to use next */ - void *sb_fromaddr; /* pointer to message source sockaddr */ - void **sb_addrs; /* actually an array of pointers to - sockaddrs */ + struct lber_options sb_opts; + Sockbuf_IO_Desc *sb_iod; /* I/O functions */ +#define sb_valid sb_opts.lbo_valid +#define sb_options sb_opts.lbo_options +#define sb_debug sb_opts.lbo_debug + ber_socket_t sb_fd; + unsigned int sb_trans_needs_read:1; + unsigned int sb_trans_needs_write:1; + ber_len_t sb_max_incoming; }; -#define READBUFSIZ 8192 + +#define SOCKBUF_VALID( sb ) ( (sb)->sb_valid == LBER_VALID_SOCKBUF ) struct seqorset { BerElement *sos_ber; - unsigned long sos_clen; - unsigned long sos_tag; + ber_len_t sos_clen; + ber_tag_t sos_tag; char *sos_first; char *sos_ptr; struct seqorset *sos_next; }; -#define NULLSEQORSET ((Seqorset *) 0) + + +/* + * io.c + */ +LBER_F( int ) +ber_realloc LDAP_P(( + BerElement *ber, + ber_len_t len )); /* * bprint.c */ -LDAP_F int lber_log_printf LDAP_P(( - int errlvl, - int loglvl, - char *fmt, - ... )); +#define ber_log_printf ber_pvt_log_printf -LDAP_F int lber_log_bprint LDAP_P(( +#ifdef NEW_LOGGING +LBER_F( int ) +ber_output_dump LDAP_P(( + const char *subsys, + int level, + BerElement *ber, + int inout )); +#endif + +LBER_F( int ) +ber_log_bprint LDAP_P(( int errlvl, int loglvl, - char *data, - int len )); + const char *data, + ber_len_t len )); -LDAP_F int lber_log_dump LDAP_P(( +LBER_F( int ) +ber_log_dump LDAP_P(( int errlvl, int loglvl, BerElement *ber, int inout )); -LDAP_F int lber_log_sos_dump LDAP_P(( +LBER_F( int ) +ber_log_sos_dump LDAP_P(( int errlvl, int loglvl, Seqorset *sos )); +LBER_V (BER_LOG_FN) ber_int_log_proc; +LBER_V (FILE *) ber_pvt_err_file; + +/* memory.c */ + /* simple macros to realloc for now */ +LBER_V (BerMemoryFunctions *) ber_int_memory_fns; +LBER_F (char *) ber_strndup( LDAP_CONST char *, ber_len_t ); +LBER_F (char *) ber_strndup__( LDAP_CONST char *, size_t ); + +#ifdef CSRIMALLOC +#define LBER_MALLOC malloc +#define LBER_CALLOC calloc +#define LBER_REALLOC realloc +#define LBER_FREE free +#define LBER_VFREE ber_memvfree +#define LBER_STRDUP strdup +#define LBER_STRNDUP ber_strndup__ + +#else +#define LBER_MALLOC(s) ber_memalloc((s)) +#define LBER_CALLOC(n,s) ber_memcalloc((n),(s)) +#define LBER_REALLOC(p,s) ber_memrealloc((p),(s)) +#define LBER_FREE(p) ber_memfree((p)) +#define LBER_VFREE(v) ber_memvfree((void**)(v)) +#define LBER_STRDUP(s) ber_strdup((s)) +#define LBER_STRNDUP(s,l) ber_strndup((s),(l)) +#endif + +/* sockbuf.c */ + +LBER_F( int ) +ber_int_sb_init LDAP_P(( Sockbuf *sb )); + +LBER_F( int ) +ber_int_sb_close LDAP_P(( Sockbuf *sb )); + +LBER_F( int ) +ber_int_sb_destroy LDAP_P(( Sockbuf *sb )); + +LBER_F( ber_slen_t ) +ber_int_sb_read LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len )); + +LBER_F( ber_slen_t ) +ber_int_sb_write LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len )); + +LDAP_END_DECL + #endif /* _LBER_INT_H */