Packet handler functions now have a @typedef@ name.

[mLib] / pkbuf.c

diff --git a/pkbuf.c b/pkbuf.c
index ce39d943aa3b66e91a88f1d847114e2131186cca..dcc4d795afff1cb8f5dcf537d377164b9d9b846a 100644 (file)
--- a/pkbuf.c
+++ b/pkbuf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pkbuf.c,v 1.3 2000/07/16 18:55:45 mdw Exp $
+ * $Id: pkbuf.c,v 1.5 2002/01/13 13:33:51 mdw Exp $
  *
  * Simple packet buffering
  *
@@ -30,6 +30,13 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: pkbuf.c,v $
+ * 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.
+ *
  * Revision 1.3  2000/07/16 18:55:45  mdw
  * Remove some stray debugging code.
  *
@@ -81,6 +88,11 @@ void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
   size_t l;
   size_t keep;
 
+  if (pk->f & PKBUF_CLOSE) {
+    pk->func(0, 0, pk, 0, pk->p);
+    return;
+  }
+
   /* --- Initialize variables as necessary --- */
 
   if (!p) {
@@ -135,6 +147,7 @@ void pkbuf_close(pkbuf *pk)
     x_free(pk->a, pk->buf);
     pk->buf = 0;
   }
+  pk->f |= PKBUF_CLOSE;
   if (pk->f & PKBUF_ENABLE)
     pk->func(0, 0, pk, 0, pk->p);
 }
@@ -223,9 +236,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:    ---
@@ -234,10 +245,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;