X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/436fddaa5c6b52604602d7838a832c5d2dfeef10..1ecb4530757072f552439ee4798929b3a4a6b89d:/pkbuf.h

diff --git a/pkbuf.h b/pkbuf.h
index e6bbec3..59af65f 100644
--- a/pkbuf.h
+++ b/pkbuf.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pkbuf.h,v 1.1 2000/06/17 10:39:19 mdw Exp $
+ * $Id: pkbuf.h,v 1.5 2004/04/08 01:36:13 mdw Exp $
  *
  * Simple packet buffering
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: pkbuf.h,v $
- * Revision 1.1  2000/06/17 10:39:19  mdw
- * Experimental new support for packet buffering.
- *
- */
-
 #ifndef MLIB_PKBUF_H
 #define MLIB_PKBUF_H
 
@@ -56,22 +48,25 @@
 
 /*----- Data structures ---------------------------------------------------*/
 
+struct pkbuf;
+
+typedef void pkbuf_func(octet */*b*/, size_t /*sz*/,
+			struct pkbuf */*pk*/, size_t */*keep*/,
+			void */*p*/);
+
 typedef struct pkbuf {
   size_t sz;				/* Size of current buffer */
   size_t len;				/* Length of data in the buffer */
   size_t want;				/* Want this many bytes for packet */
   unsigned f;				/* Various state flags */
-  void (*func)(octet */*b*/, size_t /*sz*/,
-	       struct pkbuf */*pk*/, size_t */*keep*/,
-	       void */*p*/);		/* Handler function */
+  pkbuf_func *func;			/* Handler function */
   void *p;				/* Argument for handler */
   arena *a;				/* Memory allocation arena */
   octet *buf;				/* Actual buffer space */
 } pkbuf;
 
-enum {
-  PKBUF_ENABLE = 1			/* Buffer is currently enabled */
-};
+#define PKBUF_ENABLE 1u			/* Buffer is currently enabled */
+#define PKBUF_CLOSE 2u			/* Buffer is now closed */
 
 /*----- Functions provided ------------------------------------------------*/
 
@@ -158,9 +153,7 @@ extern 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 *func@ = handler function
  *		@void *p@ = argument pointer for @func@
  *
  * Returns:	---
@@ -169,11 +162,7 @@ extern void pkbuf_want(pkbuf */*pk*/, size_t /*want*/);
  *		the provided function for handling.
  */
 
-extern void pkbuf_init(pkbuf */*pk*/,
-		      void (*/*func*/)(octet */*b*/, size_t /*sz*/,
-				       pkbuf */*pk*/, size_t */*keep*/,
-				       void */*p*/),
-		      void */*p*/);
+extern void pkbuf_init(pkbuf */*pk*/, pkbuf_func */*func*/, void */*p*/);
 
 /* --- @pkbuf_destroy@ --- *
  *