X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/aa3378df3cc7da00b8f93569d0c88f0c626ddb18..0496cf34275521e6c19eb08150594422716792c0:/buffer.c

diff --git a/buffer.c b/buffer.c
index 2164dcb1..40572e5a 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,28 +1,26 @@
 /*
- * 
- * buffer.c
- * 
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
- * Created: Sat Mar 18 04:15:33 1995 ylo
- * 
  * Functions for manipulating fifo buffers (that can grow if needed).
- * 
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
-#include "ssh.h"
+#include "log.h"
 
 /* Initializes the buffer structure. */
 
-void 
+void
 buffer_init(Buffer *buffer)
 {
 	buffer->alloc = 4096;
@@ -33,7 +31,7 @@ buffer_init(Buffer *buffer)
 
 /* Frees any memory used for the buffer. */
 
-void 
+void
 buffer_free(Buffer *buffer)
 {
 	memset(buffer->buf, 0, buffer->alloc);
@@ -45,7 +43,7 @@ buffer_free(Buffer *buffer)
  * zero the memory.
  */
 
-void 
+void
 buffer_clear(Buffer *buffer)
 {
 	buffer->offset = 0;
@@ -54,12 +52,12 @@ buffer_clear(Buffer *buffer)
 
 /* Appends data to the buffer, expanding it if necessary. */
 
-void 
-buffer_append(Buffer *buffer, const char *data, unsigned int len)
+void
+buffer_append(Buffer *buffer, const void *data, u_int len)
 {
-	char *cp;
-	buffer_append_space(buffer, &cp, len);
-	memcpy(cp, data, len);
+	void *p;
+	p = buffer_append_space(buffer, len);
+	memcpy(p, data, len);
 }
 
 /*
@@ -68,9 +66,11 @@ buffer_append(Buffer *buffer, const char *data, unsigned int len)
  * to the allocated region.
  */
 
-void 
-buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
+void *
+buffer_append_space(Buffer *buffer, u_int len)
 {
+	void *p;
+
 	/* If the buffer is empty, start using it from the beginning. */
 	if (buffer->offset == buffer->end) {
 		buffer->offset = 0;
@@ -79,9 +79,9 @@ buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
 restart:
 	/* If there is enough space to store all data, store it now. */
 	if (buffer->end + len < buffer->alloc) {
-		*datap = buffer->buf + buffer->end;
+		p = buffer->buf + buffer->end;
 		buffer->end += len;
-		return;
+		return p;
 	}
 	/*
 	 * If the buffer is quite empty, but all data is at the end, move the
@@ -98,11 +98,12 @@ restart:
 	buffer->alloc += len + 32768;
 	buffer->buf = xrealloc(buffer->buf, buffer->alloc);
 	goto restart;
+	/* NOTREACHED */
 }
 
 /* Returns the number of bytes of data in the buffer. */
 
-unsigned int 
+u_int
 buffer_len(Buffer *buffer)
 {
 	return buffer->end - buffer->offset;
@@ -110,38 +111,39 @@ buffer_len(Buffer *buffer)
 
 /* Gets data from the beginning of the buffer. */
 
-void 
-buffer_get(Buffer *buffer, char *buf, unsigned int len)
+void
+buffer_get(Buffer *buffer, void *buf, u_int len)
 {
 	if (len > buffer->end - buffer->offset)
-		fatal("buffer_get trying to get more bytes than in buffer");
+		fatal("buffer_get: trying to get more bytes %d than in buffer %d",
+		    len, buffer->end - buffer->offset);
 	memcpy(buf, buffer->buf + buffer->offset, len);
 	buffer->offset += len;
 }
 
 /* Consumes the given number of bytes from the beginning of the buffer. */
 
-void 
-buffer_consume(Buffer *buffer, unsigned int bytes)
+void
+buffer_consume(Buffer *buffer, u_int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
-		fatal("buffer_get trying to get more bytes than in buffer");
+		fatal("buffer_consume: trying to get more bytes than in buffer");
 	buffer->offset += bytes;
 }
 
 /* Consumes the given number of bytes from the end of the buffer. */
 
-void 
-buffer_consume_end(Buffer *buffer, unsigned int bytes)
+void
+buffer_consume_end(Buffer *buffer, u_int bytes)
 {
 	if (bytes > buffer->end - buffer->offset)
-		fatal("buffer_get trying to get more bytes than in buffer");
+		fatal("buffer_consume_end: trying to get more bytes than in buffer");
 	buffer->end -= bytes;
 }
 
 /* Returns a pointer to the first used byte in the buffer. */
 
-char *
+void *
 buffer_ptr(Buffer *buffer)
 {
 	return buffer->buf + buffer->offset;
@@ -149,13 +151,18 @@ buffer_ptr(Buffer *buffer)
 
 /* Dumps the contents of the buffer to stderr. */
 
-void 
+void
 buffer_dump(Buffer *buffer)
 {
 	int i;
-	unsigned char *ucp = (unsigned char *) buffer->buf;
-
-	for (i = buffer->offset; i < buffer->end; i++)
-		fprintf(stderr, " %02x", ucp[i]);
-	fprintf(stderr, "\n");
+	u_char *ucp = buffer->buf;
+
+	for (i = buffer->offset; i < buffer->end; i++) {
+		fprintf(stderr, "%02x", ucp[i]);
+		if ((i-buffer->offset)%16==15)
+			fprintf(stderr, "\r\n");
+		else if ((i-buffer->offset)%2==1)
+			fprintf(stderr, " ");
+	}
+	fprintf(stderr, "\r\n");
 }