/* -*-c-*-
*
- * $Id: pkbuf.c,v 1.4 2001/02/03 16:23:33 mdw Exp $
+ * $Id: pkbuf.c,v 1.7 2004/04/08 01:36:13 mdw Exp $
*
* Simple packet buffering
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: pkbuf.c,v $
- * 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.
- *
- * Revision 1.2 2000/07/16 12:29:16 mdw
- * Change to arena `realloc' interface, to fix a design bug.
- *
- * Revision 1.1 2000/06/17 10:39:19 mdw
- * Experimental new support for packet buffering.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <stdio.h>
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);
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 --- */
/* --- 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;
}
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);
}
{
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);
/* --- @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: ---
* 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;