chiark
/
gitweb
/
~mdw
/
mLib
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7292c4c
)
Various bugfixes.
author
mdw
<mdw>
Wed, 23 Apr 2003 12:47:44 +0000
(12:47 +0000)
committer
mdw
<mdw>
Wed, 23 Apr 2003 12:47:44 +0000
(12:47 +0000)
pkbuf.c
patch
|
blob
|
blame
|
history
diff --git
a/pkbuf.c
b/pkbuf.c
index dcc4d795afff1cb8f5dcf537d377164b9d9b846a..5c3d58d116a4300d7471bd9781c0d0fe3c308824 100644
(file)
--- a/
pkbuf.c
+++ b/
pkbuf.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: pkbuf.c,v 1.
5 2002/01/13 13:33:51
mdw Exp $
+ * $Id: pkbuf.c,v 1.
6 2003/04/23 12:47:44
mdw Exp $
*
* Simple packet buffering
*
*
* Simple packet buffering
*
@@
-30,6
+30,9
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: pkbuf.c,v $
/*----- 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.5 2002/01/13 13:33:51 mdw
* Packet handler functions now have a @typedef@ name.
*
@@
-86,7
+89,7
@@
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);
if (pk->f & PKBUF_CLOSE) {
pk->func(0, 0, pk, 0, pk->p);
@@
-100,22
+103,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 --- */
@@
-126,8
+130,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;
}
@@
-167,10
+171,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);
}
@@
-221,7
+223,7
@@
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)
pk->buf = x_realloc(pk->a, pk->buf, pk->sz, pk->len);
if (pk->buf) {
if (pk->len)
pk->buf = x_realloc(pk->a, pk->buf, pk->sz, pk->len);