chiark
/
gitweb
/
~mdw
/
mLib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add base32 encoding and decoding.
[mLib]
/
pkbuf.c
diff --git
a/pkbuf.c
b/pkbuf.c
index 73e2ca520783e6b2818d6b6a547ad85d5c69148a..a35c6125f57158bbd861d713f1f97b23265b120b 100644
(file)
--- a/
pkbuf.c
+++ b/
pkbuf.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: pkbuf.c,v 1.
1 2000/06/17 10:39:19
mdw Exp $
+ * $Id: pkbuf.c,v 1.
7 2004/04/08 01:36:13
mdw Exp $
*
* Simple packet buffering
*
*
* Simple packet buffering
*
@@
-27,14
+27,6
@@
* MA 02111-1307, USA.
*/
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: pkbuf.c,v $
- * Revision 1.1 2000/06/17 10:39:19 mdw
- * Experimental new support for packet buffering.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <stdio.h>
/*----- Header files ------------------------------------------------------*/
#include <stdio.h>
@@
-73,7
+65,12
@@
void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
{
size_t l;
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);
+ return;
+ }
/* --- Initialize variables as necessary --- */
/* --- Initialize variables as necessary --- */
@@
-82,22
+79,23
@@
void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
len = pk->len;
}
l = p + len - pk->buf;
len = pk->len;
}
l = p + len - pk->buf;
-
p = pk->buf
;
+
o = 0
;
/* --- Now grind through any packets which have accumulated --- */
/* --- 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;
size_t sz = pk->want;
/* --- Pass a packet to the user handler --- */
keep = 0;
- pk->func(p, sz, pk, &keep, pk->p);
+ pk->func(p
k->buf + o
, sz, pk, &keep, pk->p);
/* --- Adjust all the pointers for the next packet --- */
sz -= keep;
/* --- Adjust all the pointers for the next packet --- */
sz -= keep;
-
p
+= sz;
+
o
+= sz;
l -= sz;
/* --- Abort here if disabled --- */
l -= sz;
/* --- Abort here if disabled --- */
@@
-108,8
+106,8
@@
void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
/* --- Shunt data around in the buffer --- */
/* --- 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, p
k->buf + o
, l);
pk->len = l;
}
pk->len = l;
}
@@
-126,10
+124,10
@@
void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
void pkbuf_close(pkbuf *pk)
{
if (pk->buf) {
void pkbuf_close(pkbuf *pk)
{
if (pk->buf) {
- fprintf(stderr, "*** destroying buffer, closing down\n");
x_free(pk->a, pk->buf);
pk->buf = 0;
}
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);
}
if (pk->f & PKBUF_ENABLE)
pk->func(0, 0, pk, 0, pk->p);
}
@@
-149,10
+147,8
@@
void pkbuf_close(pkbuf *pk)
size_t pkbuf_free(pkbuf *pk, octet **p)
{
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);
pk->buf = x_alloc(pk->a, pk->sz);
- }
*p = pk->buf + pk->len;
return (pk->sz - pk->len);
}
*p = pk->buf + pk->len;
return (pk->sz - pk->len);
}
@@
-203,10
+199,10
@@
void pkbuf_want(pkbuf *pk, size_t want)
{
pk->want = want;
if (want > pk->sz) {
{
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)
if (pk->buf) {
if (pk->len)
- pk->buf = x_realloc(pk->a, pk->buf, pk->sz);
+ pk->buf = x_realloc(pk->a, pk->buf, pk->sz
, pk->len
);
else {
x_free(pk->a, pk->buf);
pk->buf = 0;
else {
x_free(pk->a, pk->buf);
pk->buf = 0;
@@
-218,9
+214,7
@@
void pkbuf_want(pkbuf *pk, size_t want)
/* --- @pkbuf_init@ --- *
*
* Arguments: @pkbuf *pk@ = pointer to buffer block
/* --- @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: ---
* @void *p@ = argument pointer for @func@
*
* Returns: ---
@@
-229,10
+223,7
@@
void pkbuf_want(pkbuf *pk, size_t want)
* the provided function for handling.
*/
* 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;
{
pk->func = func;
pk->p = p;