X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/3fd896a441c904c3f3608dba41d5e1db84fad776..573eadb534c42c4feace5e493cc135dd5e7b00d9:/pkbuf.c

diff --git a/pkbuf.c b/pkbuf.c
index 629f531..5c3d58d 100644
--- a/pkbuf.c
+++ b/pkbuf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pkbuf.c,v 1.4 2001/02/03 16:23:33 mdw Exp $
+ * $Id: pkbuf.c,v 1.6 2003/04/23 12:47:44 mdw Exp $
  *
  * Simple packet buffering
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: pkbuf.c,v $
+ * Revision 1.6  2003/04/23 12:47:44  mdw
+ * Various bugfixes.
+ *
+ * Revision 1.5  2002/01/13 13:33:51  mdw
+ * Packet handler functions now have a @typedef@ name.
+ *
  * Revision 1.4  2001/02/03 16:23:33  mdw
  * Bug fix: handle a disable during a close-induced flush without dumping
  * core.
@@ -83,7 +89,7 @@
 void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
 {
   size_t l;
-  size_t keep;
+  size_t o, keep;
 
   if (pk->f & PKBUF_CLOSE) {
     pk->func(0, 0, pk, 0, pk->p);
@@ -97,22 +103,23 @@ void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
     len = pk->len;
   }
   l = p + len - pk->buf;
-  p = pk->buf;
+  o = 0;
 
   /* --- Now grind through any packets which have accumulated --- */
 
-  while (l > pk->want) {
+  pk->len = l;
+  while (l >= pk->want) {
     size_t sz = pk->want;
 
     /* --- Pass a packet to the user handler --- */
 
     keep = 0;
-    pk->func(p, sz, pk, &keep, pk->p);
+    pk->func(pk->buf + o, sz, pk, &keep, pk->p);
 
     /* --- Adjust all the pointers for the next packet --- */
 
     sz -= keep;
-    p += sz;
+    o += sz;
     l -= sz;
 
     /* --- Abort here if disabled --- */
@@ -123,8 +130,8 @@ void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
 
   /* --- Shunt data around in the buffer --- */
 
-  if (p > pk->buf && l != 0)
-    memmove(pk->buf, p, l);
+  if (o > 0 && l != 0)
+    memmove(pk->buf, pk->buf + o, l);
   pk->len = l;
 }
 
@@ -164,10 +171,8 @@ void pkbuf_close(pkbuf *pk)
 
 size_t pkbuf_free(pkbuf *pk, octet **p)
 {
-  if (!pk->buf) {
-    fprintf(stderr, "*** allocating new buffer\n");
+  if (!pk->buf)
     pk->buf = x_alloc(pk->a, pk->sz);
-  }
   *p = pk->buf + pk->len;
   return (pk->sz - pk->len);
 }
@@ -218,7 +223,7 @@ void pkbuf_want(pkbuf *pk, size_t want)
 {
   pk->want = want;
   if (want > pk->sz) {
-    do pk->sz <<= 1; while (want < pk->sz);
+    do pk->sz <<= 1; while (want > pk->sz);
     if (pk->buf) {
       if (pk->len)
 	pk->buf = x_realloc(pk->a, pk->buf, pk->sz, pk->len);
@@ -233,9 +238,7 @@ void pkbuf_want(pkbuf *pk, size_t want)
 /* --- @pkbuf_init@ --- *
  *
  * Arguments:	@pkbuf *pk@ = pointer to buffer block
- *		@void (*func)(octet *b, size_t sz, pkbuf *pk,@
- *			     @size_t *keep, void *p)@ =
- *			handler function
+ *		@pkbuf *func@ = handler function
  *		@void *p@ = argument pointer for @func@
  *
  * Returns:	---
@@ -244,10 +247,7 @@ void pkbuf_want(pkbuf *pk, size_t want)
  *		the provided function for handling.
  */
 
-void pkbuf_init(pkbuf *pk,
-		void (*func)(octet */*b*/, size_t /*sz*/,
-			     pkbuf */*pk*/, size_t */*keep*/, void */*p*/),
-		void *p)
+void pkbuf_init(pkbuf *pk, pkbuf_func *func, void *p)
 {
   pk->func = func;
   pk->p = p;