#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
-#define DEBUG_SERVER_MST GNUNET_EXTRA_LOGGING
+#define DEBUG_SERVER_MST GNUNET_EXTRA_LOGGING
#if HAVE_UNALIGNED_64_ACCESS
#define ALIGN_FACTOR 4
#define ALIGN_FACTOR 8
#endif
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
/**
* Handle to a message stream tokenizer.
unsigned long offset;
int ret;
+ GNUNET_assert (mst->off <= mst->pos);
+ GNUNET_assert (mst->pos <= mst->curr_buf);
#if DEBUG_SERVER_MST
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Server-mst receives %u bytes with %u bytes already in private buffer\n",
- (unsigned int) size, (unsigned int) (mst->pos - mst->off));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Server-mst receives %u bytes with %u bytes already in private buffer\n",
+ (unsigned int) size, (unsigned int) (mst->pos - mst->off));
#endif
ret = GNUNET_OK;
ibuf = (char *) mst->hdr;
while (mst->pos > 0)
{
do_align:
+ GNUNET_assert (mst->pos >= mst->off);
if ((mst->curr_buf - mst->off < sizeof (struct GNUNET_MessageHeader)) ||
(0 != (mst->off % ALIGN_FACTOR)))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
- if (mst->curr_buf - mst->off < want)
+ if ( (mst->curr_buf - mst->off < want) &&
+ (mst->off > 0) )
{
- /* need more space */
+ /* can get more space by moving */
mst->pos -= mst->off;
memmove (ibuf, &ibuf[mst->off], mst->pos);
mst->off = 0;
}
- if (want > mst->curr_buf)
+ if (mst->curr_buf < want)
{
+ /* need to get more space by growing buffer */
+ GNUNET_assert (0 == mst->off);
mst->hdr = GNUNET_realloc (mst->hdr, want);
ibuf = (char *) mst->hdr;
mst->curr_buf = want;
if (mst->pos - mst->off < want)
{
delta = GNUNET_MIN (want - (mst->pos - mst->off), size);
+ GNUNET_assert (mst->pos + delta <= mst->curr_buf);
memcpy (&ibuf[mst->pos], buf, delta);
mst->pos += delta;
buf += delta;
}
if (one_shot == GNUNET_YES)
one_shot = GNUNET_SYSERR;
- mst->cb (mst->cb_cls, client_identity, hdr);
mst->off += want;
+ mst->cb (mst->cb_cls, client_identity, hdr);
if (mst->off == mst->pos)
{
/* reset to beginning of buffer, it's free right now! */
mst->pos = 0;
}
}
+ GNUNET_assert (0 == mst->pos);
while (size > 0)
{
#if DEBUG_SERVER_MST
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Server-mst has %u bytes left in inbound buffer\n",
- (unsigned int) size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Server-mst has %u bytes left in inbound buffer\n",
+ (unsigned int) size);
#endif
if (size < sizeof (struct GNUNET_MessageHeader))
break;
offset = (unsigned long) buf;
- need_align = (0 != offset % ALIGN_FACTOR) ? GNUNET_YES : GNUNET_NO;
+ need_align = (0 != (offset % ALIGN_FACTOR)) ? GNUNET_YES : GNUNET_NO;
if (GNUNET_NO == need_align)
{
/* can try to do zero-copy and process directly from original buffer */
return GNUNET_SYSERR;
}
if (size < want)
- break; /* or not, buffer incomplete, so copy to private buffer... */
+ break; /* or not: buffer incomplete, so copy to private buffer... */
if (one_shot == GNUNET_SYSERR)
{
/* cannot call callback again, but return value saying that
ibuf = (char *) mst->hdr;
mst->curr_buf = size + mst->pos;
}
- GNUNET_assert (mst->pos + size <= mst->curr_buf);
+ GNUNET_assert (size + mst->pos <= mst->curr_buf);
memcpy (&ibuf[mst->pos], buf, size);
mst->pos += size;
}
if (purge)
+ {
mst->off = 0;
+ mst->pos = 0;
+ }
#if DEBUG_SERVER_MST
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Server-mst leaves %u bytes in private buffer\n",
- (unsigned int) (mst->pos - mst->off));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Server-mst leaves %u bytes in private buffer\n",
+ (unsigned int) (mst->pos - mst->off));
#endif
return ret;
}