- itojun@cvs.openbsd.org 2002/05/13 02:37:39

[openssh.git] / bufaux.h

diff --git a/bufaux.h b/bufaux.h
index 75b5a5a291510e7bee7b1ba95977db1c1cd53abf..80f35c1ecfa4223d70026ee7889e6893827c0767 100644 (file)
--- a/bufaux.h
+++ b/bufaux.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bufaux.h,v 1.16 2002/03/04 17:27:39 stevesk Exp $     */
+/*     $OpenBSD: bufaux.h,v 1.18 2002/04/20 09:14:58 markus Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -23,7 +23,10 @@ void    buffer_put_bignum2(Buffer *, BIGNUM *);
 void   buffer_get_bignum(Buffer *, BIGNUM *);
 void   buffer_get_bignum2(Buffer *, BIGNUM *);
 
-u_int buffer_get_int(Buffer *);
+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);
 
 #ifdef HAVE_U_INT64_T
@@ -32,12 +35,13 @@ void        buffer_put_int64(Buffer *, u_int64_t);
 #endif
 
 int     buffer_get_char(Buffer *);
-
 void    buffer_put_char(Buffer *, int);
 
 void   *buffer_get_string(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)
+
 #endif                         /* BUFAUX_H */