Regen

[openldap] / libraries / liblber / lber-int.h

diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h
index 136ea0c024e30df54b60978073325492cf770fa4..39d86a9e32c8b5f91c60a0848727f140709594bc 100644 (file)
--- a/libraries/liblber/lber-int.h
+++ b/libraries/liblber/lber-int.h
@@ -24,20 +24,34 @@
 
 LDAP_BEGIN_DECL
 
-LIBLBER_F (BER_ERRNO_FN) ber_int_errno_fn;
+LBER_F (BER_ERRNO_FN) ber_int_errno_fn;
 
 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
+
 #define LBER_UNINITIALIZED             0x0
 #define LBER_INITIALIZED               0x1
 #define LBER_VALID_BERELEMENT  0x2
 #define LBER_VALID_SOCKBUF             0x3
 
-LIBLBER_F (struct lber_options) ber_int_options;
+LBER_F (struct lber_options) ber_int_options;
 #define ber_int_debug ber_int_options.lbo_debug
 
 struct berelement {
@@ -60,8 +74,9 @@ struct berelement {
 };
 #define BER_VALID(ber) ((ber)->ber_valid==LBER_VALID_BERELEMENT)
 
-#define ber_pvt_ber_bytes(ber)         ((ber)->ber_ptr - (ber)->ber_buf)
 #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 {
        struct lber_options sb_opts;
@@ -70,8 +85,9 @@ struct sockbuf {
 #define        sb_options              sb_opts.lbo_options
 #define        sb_debug                sb_opts.lbo_debug
        ber_socket_t            sb_fd;
-       int             sb_trans_needs_read:1;
-       int             sb_trans_needs_write:1;
+       unsigned int            sb_trans_needs_read:1;
+       unsigned int            sb_trans_needs_write:1;
+       ber_len_t                       sb_max_incoming;
 };
 
 #define SOCKBUF_VALID( sb )    ( (sb)->sb_valid == LBER_VALID_SOCKBUF )
@@ -100,21 +116,30 @@ int ber_realloc LDAP_P((
  */
 #define ber_log_printf ber_pvt_log_printf
 
-LIBLBER_F( int )
+#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,
        const char *data,
        ber_len_t len ));
 
-LIBLBER_F( int )
+LBER_F( int )
 ber_log_dump LDAP_P((
        int errlvl,
        int loglvl,
        BerElement *ber,
        int inout ));
 
-LIBLBER_F( int )
+LBER_F( int )
 ber_log_sos_dump LDAP_P((
        int errlvl,
        int loglvl,
@@ -123,7 +148,7 @@ ber_log_sos_dump LDAP_P((
 
 /* memory.c */
        /* simple macros to realloc for now */
-LIBLBER_F (BerMemoryFunctions *)       ber_int_memory_fns;
+LBER_F (BerMemoryFunctions *)  ber_int_memory_fns;
 
 #ifdef CSRIMALLOC
 #define LBER_INT_MALLOC                malloc
@@ -158,19 +183,19 @@ LIBLBER_F (BerMemoryFunctions *)  ber_int_memory_fns;
 
 /* sockbuf.c */
 
-LIBLBER_F(     int )
+LBER_F(        int )
 ber_int_sb_init LDAP_P(( Sockbuf *sb ));
 
-LIBLBER_F( int )
+LBER_F( int )
 ber_int_sb_close LDAP_P(( Sockbuf *sb ));
 
-LIBLBER_F(     int )
+LBER_F(        int )
 ber_int_sb_destroy LDAP_P(( Sockbuf *sb ));
 
-LIBLBER_F( ber_slen_t )
+LBER_F( ber_slen_t )
 ber_int_sb_read LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len ));
 
-LIBLBER_F( ber_slen_t )
+LBER_F( ber_slen_t )
 ber_int_sb_write LDAP_P(( Sockbuf *sb, void *buf, ber_len_t len ));
 
 LDAP_END_DECL