- (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote

[openssh.git] / buffer.h

diff --git a/buffer.h b/buffer.h
index 5e9fc278d9f7b09381d222788d1d34347a5a8040..d0f354ee7bf7e685a51f6edf44b60aef603e5837 100644 (file)
--- a/buffer.h
+++ b/buffer.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: buffer.h,v 1.17 2008/05/08 06:59:01 markus Exp $ */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,56 +13,74 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: buffer.h,v 1.8 2001/06/26 06:32:48 itojun Exp $"); */
-
 #ifndef BUFFER_H
 #define BUFFER_H
 
 typedef struct {
-       char   *buf;            /* Buffer for data. */
-       u_int alloc;    /* Number of bytes allocated for data. */
-       u_int offset;   /* Offset of first byte containing data. */
-       u_int end;      /* Offset of last byte containing data. */
+       u_char  *buf;           /* Buffer for data. */
+       u_int    alloc;         /* Number of bytes allocated for data. */
+       u_int    offset;        /* Offset of first byte containing data. */
+       u_int    end;           /* Offset of last byte containing data. */
 }       Buffer;
-/* Initializes the buffer structure. */
-void    buffer_init(Buffer *);
 
-/* Frees any memory used for the buffer. */
-void    buffer_free(Buffer *);
+void    buffer_init(Buffer *);
+void    buffer_clear(Buffer *);
+void    buffer_free(Buffer *);
 
-/* Clears any data from the buffer, making it empty.  This does not actually
-   zero the memory. */
-void    buffer_clear(Buffer *);
+u_int   buffer_len(Buffer *);
+void   *buffer_ptr(Buffer *);
 
-/* Appends data to the buffer, expanding it if necessary. */
-void    buffer_append(Buffer *, const char *, u_int);
+void    buffer_append(Buffer *, const void *, u_int);
+void   *buffer_append_space(Buffer *, u_int);
 
-/*
- * Appends space to the buffer, expanding the buffer if necessary. This does
- * not actually copy the data into the buffer, but instead returns a pointer
- * to the allocated region.
- */
-void    buffer_append_space(Buffer *, char **, u_int);
+int     buffer_check_alloc(Buffer *, u_int);
 
-/* Returns the number of bytes of data in the buffer. */
-u_int buffer_len(Buffer *);
+void    buffer_get(Buffer *, void *, u_int);
 
-/* Gets data from the beginning of the buffer. */
-void    buffer_get(Buffer *, char *, u_int);
+void    buffer_consume(Buffer *, u_int);
+void    buffer_consume_end(Buffer *, u_int);
 
-/* Consumes the given number of bytes from the beginning of the buffer. */
-void    buffer_consume(Buffer *, u_int);
+void     buffer_dump(Buffer *);
 
-/* Consumes the given number of bytes from the end of the buffer. */
-void    buffer_consume_end(Buffer *, u_int);
+int     buffer_get_ret(Buffer *, void *, u_int);
+int     buffer_consume_ret(Buffer *, u_int);
+int     buffer_consume_end_ret(Buffer *, u_int);
 
-/* Returns a pointer to the first used byte in the buffer. */
-char   *buffer_ptr(Buffer *);
+#include <openssl/bn.h>
 
-/*
- * Dumps the contents of the buffer to stderr in hex.  This intended for
- * debugging purposes only.
- */
-void    buffer_dump(Buffer *);
+void    buffer_put_bignum(Buffer *, const BIGNUM *);
+void    buffer_put_bignum2(Buffer *, const BIGNUM *);
+void   buffer_get_bignum(Buffer *, BIGNUM *);
+void   buffer_get_bignum2(Buffer *, BIGNUM *);
+
+u_short        buffer_get_short(Buffer *);
+void   buffer_put_short(Buffer *, u_short);
+
+u_int  buffer_get_int(Buffer *);
+void    buffer_put_int(Buffer *, u_int);
+
+u_int64_t buffer_get_int64(Buffer *);
+void   buffer_put_int64(Buffer *, u_int64_t);
+
+int     buffer_get_char(Buffer *);
+void    buffer_put_char(Buffer *, int);
+
+void   *buffer_get_string(Buffer *, u_int *);
+void   *buffer_get_string_ptr(Buffer *, u_int *);
+void    buffer_put_string(Buffer *, const void *, u_int);
+void   buffer_put_cstring(Buffer *, const char *);
+
+#define buffer_skip_string(b) \
+    do { u_int l = buffer_get_int(b); buffer_consume(b, l); } while (0)
+
+int    buffer_put_bignum_ret(Buffer *, const BIGNUM *);
+int    buffer_get_bignum_ret(Buffer *, BIGNUM *);
+int    buffer_put_bignum2_ret(Buffer *, const BIGNUM *);
+int    buffer_get_bignum2_ret(Buffer *, BIGNUM *);
+int    buffer_get_short_ret(u_short *, Buffer *);
+int    buffer_get_int_ret(u_int *, Buffer *);
+int    buffer_get_int64_ret(u_int64_t *, Buffer *);
+void   *buffer_get_string_ret(Buffer *, u_int *);
+int    buffer_get_char_ret(char *, Buffer *);
 
 #endif                         /* BUFFER_H */