2011-12-21 09:55:05 +00:00
|
|
|
/*
|
|
|
|
Serval Distributed Numbering Architecture (DNA)
|
|
|
|
Copyright (C) 2010 Paul Gardner-Stephen
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU General Public License
|
|
|
|
as published by the Free Software Foundation; either version 2
|
|
|
|
of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
*/
|
|
|
|
|
2013-11-25 06:13:32 +00:00
|
|
|
#include <assert.h>
|
2012-02-23 02:15:42 +00:00
|
|
|
#include "serval.h"
|
2012-12-11 05:29:46 +00:00
|
|
|
#include "conf.h"
|
|
|
|
#include "mem.h"
|
2016-09-20 04:03:19 +00:00
|
|
|
#include "str.h"
|
2012-08-22 00:51:38 +00:00
|
|
|
#include "overlay_buffer.h"
|
2017-11-24 00:03:39 +00:00
|
|
|
#include "debug.h"
|
2011-08-08 06:41:05 +00:00
|
|
|
|
2012-08-22 00:51:38 +00:00
|
|
|
/*
|
|
|
|
When writing to a buffer, sizeLimit may place an upper bound on the amount of space to use
|
|
|
|
|
|
|
|
When reading from a buffer, sizeLimit should first be set to the length of any existing data.
|
|
|
|
|
|
|
|
In either case, functions that don't take an offset use and advance the position.
|
|
|
|
*/
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
struct overlay_buffer *_ob_new(struct __sourceloc __whence)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
struct overlay_buffer *ret = emalloc_zero(sizeof(struct overlay_buffer));
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_new() return %p", ret);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (ret == NULL)
|
|
|
|
return NULL;
|
2011-08-08 06:41:05 +00:00
|
|
|
ob_unlimitsize(ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-07-18 05:00:16 +00:00
|
|
|
// index an existing static buffer.
|
|
|
|
// and allow other callers to use the ob_ convenience methods for reading and writing up to size bytes.
|
2013-12-10 06:33:30 +00:00
|
|
|
struct overlay_buffer *_ob_static(struct __sourceloc __whence, unsigned char *bytes, size_t size)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
|
|
|
struct overlay_buffer *ret = emalloc_zero(sizeof(struct overlay_buffer));
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_static(bytes=%p, size=%zu) return %p", bytes, size, ret);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (ret == NULL)
|
|
|
|
return NULL;
|
2012-07-18 05:00:16 +00:00
|
|
|
ret->bytes = bytes;
|
2012-08-22 00:51:38 +00:00
|
|
|
ret->allocSize = size;
|
2012-11-27 04:02:10 +00:00
|
|
|
ret->allocated = NULL;
|
2012-08-22 00:51:38 +00:00
|
|
|
ob_unlimitsize(ret);
|
2012-07-18 05:00:16 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-08-22 00:51:38 +00:00
|
|
|
// create a new overlay buffer from an existing piece of another buffer.
|
|
|
|
// Both buffers will point to the same memory region.
|
|
|
|
// It is up to the caller to ensure this buffer is not used after the parent buffer is freed.
|
2013-12-10 06:33:30 +00:00
|
|
|
struct overlay_buffer *_ob_slice(struct __sourceloc __whence, struct overlay_buffer *b, size_t offset, size_t length)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
2013-12-10 06:33:30 +00:00
|
|
|
if (offset + length > b->allocSize) {
|
2012-10-15 05:06:36 +00:00
|
|
|
WHY("Buffer isn't long enough to slice");
|
2013-11-25 06:13:32 +00:00
|
|
|
return NULL;
|
2012-10-15 05:06:36 +00:00
|
|
|
}
|
2013-11-25 06:13:32 +00:00
|
|
|
struct overlay_buffer *ret = emalloc_zero(sizeof(struct overlay_buffer));
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_slice(b=%p, offset=%zu, length=%zu) return %p", b, offset, length, ret);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (ret == NULL)
|
2012-08-27 00:34:59 +00:00
|
|
|
return NULL;
|
2013-12-10 06:33:30 +00:00
|
|
|
ret->bytes = b->bytes + offset;
|
2012-08-22 00:51:38 +00:00
|
|
|
ret->allocSize = length;
|
2012-11-27 04:02:10 +00:00
|
|
|
ret->allocated = NULL;
|
2012-08-22 00:51:38 +00:00
|
|
|
ob_unlimitsize(ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
struct overlay_buffer *_ob_dup(struct __sourceloc __whence, struct overlay_buffer *b)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
|
|
|
struct overlay_buffer *ret = emalloc_zero(sizeof(struct overlay_buffer));
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_dup(b=%p) return %p", b, ret);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (ret == NULL)
|
|
|
|
return NULL;
|
2012-08-22 00:51:38 +00:00
|
|
|
ret->sizeLimit = b->sizeLimit;
|
|
|
|
ret->position = b->position;
|
|
|
|
ret->checkpointLength = b->checkpointLength;
|
2012-08-27 00:34:59 +00:00
|
|
|
if (b->bytes && b->allocSize){
|
|
|
|
// duplicate any bytes that might be relevant
|
2013-12-10 06:33:30 +00:00
|
|
|
size_t byteCount = b->position;
|
|
|
|
if (b->sizeLimit != SIZE_MAX) {
|
|
|
|
assert(b->position <= b->sizeLimit);
|
|
|
|
byteCount = b->sizeLimit;
|
|
|
|
}
|
2012-08-22 00:51:38 +00:00
|
|
|
if (byteCount > b->allocSize)
|
|
|
|
byteCount = b->allocSize;
|
2013-11-25 06:13:32 +00:00
|
|
|
if (byteCount)
|
|
|
|
ob_append_bytes(ret, b->bytes, byteCount);
|
2012-08-22 00:51:38 +00:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_free(struct __sourceloc __whence, struct overlay_buffer *b)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_free(b=%p)", b);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (b->allocated)
|
|
|
|
free(b->allocated);
|
2011-08-08 06:41:05 +00:00
|
|
|
free(b);
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
int _ob_checkpoint(struct __sourceloc __whence, struct overlay_buffer *b)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
|
|
|
b->checkpointLength = b->position;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_checkpoint(b=%p) checkpointLength=%zu", b, b->checkpointLength);
|
2011-08-08 06:41:05 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
int _ob_rewind(struct __sourceloc __whence, struct overlay_buffer *b)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
|
|
|
b->position = b->checkpointLength;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_rewind(b=%p) position=%zu", b, b->position);
|
2011-08-08 06:41:05 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
void _ob_limitsize(struct __sourceloc __whence, struct overlay_buffer *b, size_t bytes)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
2013-12-10 06:33:30 +00:00
|
|
|
assert(bytes != SIZE_MAX);
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b->position <= bytes);
|
|
|
|
assert(b->checkpointLength <= bytes);
|
|
|
|
if (b->bytes && b->allocated == NULL)
|
|
|
|
assert(bytes <= b->allocSize);
|
2013-11-22 14:29:11 +00:00
|
|
|
b->sizeLimit = bytes;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_limitsize(b=%p, bytes=%zu) sizeLimit=%zu", b, bytes, b->sizeLimit);
|
2011-08-08 06:41:05 +00:00
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_unlimitsize(struct __sourceloc __whence, struct overlay_buffer *b)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
2013-12-10 06:33:30 +00:00
|
|
|
b->sizeLimit = SIZE_MAX;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_unlimitsize(b=%p) sizeLimit=%zu", b, b->sizeLimit);
|
2011-08-08 06:41:05 +00:00
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_flip(struct __sourceloc __whence, struct overlay_buffer *b)
|
2013-09-11 07:45:43 +00:00
|
|
|
{
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_flip(b=%p) checkpointLength=0 position=0", b);
|
2013-11-25 06:13:32 +00:00
|
|
|
b->checkpointLength = 0;
|
|
|
|
ob_limitsize(b, b->position);
|
|
|
|
b->position = 0;
|
2013-09-11 07:45:43 +00:00
|
|
|
}
|
|
|
|
|
2014-02-03 03:54:41 +00:00
|
|
|
void _ob_clear(struct __sourceloc __whence, struct overlay_buffer *b)
|
|
|
|
{
|
2016-04-20 06:03:37 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_clear(b=%p) checkpointLength=0 position=0", b);
|
2014-02-03 03:54:41 +00:00
|
|
|
b->checkpointLength = 0;
|
|
|
|
b->position = 0;
|
|
|
|
ob_unlimitsize(b);
|
|
|
|
}
|
|
|
|
|
2013-11-25 06:13:32 +00:00
|
|
|
/* Return 1 if space is available, 0 if not.
|
|
|
|
*/
|
2013-11-22 14:29:11 +00:00
|
|
|
ssize_t _ob_makespace(struct __sourceloc __whence, struct overlay_buffer *b, size_t bytes)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_makespace(b=%p, bytes=%zd) b->bytes=%p b->position=%zu b->allocSize=%zu",
|
|
|
|
b, bytes, b->bytes, b->position, b->allocSize);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (b->position)
|
|
|
|
assert(b->bytes != NULL);
|
2013-12-10 06:33:30 +00:00
|
|
|
if (b->position + bytes > b->sizeLimit) {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_makespace(): asked for space to %zu, beyond size limit of %zu", b->position + bytes, b->sizeLimit);
|
2013-11-25 06:13:32 +00:00
|
|
|
return 0;
|
2013-11-22 14:29:11 +00:00
|
|
|
}
|
2013-02-22 05:57:37 +00:00
|
|
|
if (b->position + bytes <= b->allocSize)
|
2013-11-25 06:13:32 +00:00
|
|
|
return 1;
|
|
|
|
// Don't realloc a static buffer.
|
2013-11-22 14:29:11 +00:00
|
|
|
if (b->bytes && b->allocated == NULL) {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_makespace(): asked for space to %zu, beyond static buffer size of %zu", b->position + bytes, b->allocSize);
|
2012-08-22 00:51:38 +00:00
|
|
|
return 0;
|
2013-11-22 14:29:11 +00:00
|
|
|
}
|
2013-12-10 06:33:30 +00:00
|
|
|
size_t newSize = b->position + bytes;
|
2012-08-22 00:51:38 +00:00
|
|
|
if (newSize<64) newSize=64;
|
|
|
|
if (newSize&63) newSize+=64-(newSize&63);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (newSize>1024 && (newSize&1023))
|
|
|
|
newSize+=1024-(newSize&1023);
|
|
|
|
if (newSize>65536 && (newSize&65535))
|
|
|
|
newSize+=65536-(newSize&65535);
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "realloc(b->bytes=%p, newSize=%zu)", b->bytes, newSize);
|
2013-11-25 06:13:32 +00:00
|
|
|
unsigned char *new = emalloc(newSize);
|
|
|
|
if (!new)
|
|
|
|
return 0;
|
2016-01-25 06:32:21 +00:00
|
|
|
if (b->position)
|
|
|
|
bcopy(b->bytes,new,b->position);
|
2013-11-25 06:13:32 +00:00
|
|
|
if (b->allocated) {
|
|
|
|
assert(b->allocated == b->bytes);
|
|
|
|
free(b->allocated);
|
|
|
|
}
|
2012-08-22 00:51:38 +00:00
|
|
|
b->bytes=new;
|
2012-11-27 04:02:10 +00:00
|
|
|
b->allocated=new;
|
2012-08-22 00:51:38 +00:00
|
|
|
b->allocSize=newSize;
|
2013-11-25 06:13:32 +00:00
|
|
|
return 1;
|
2011-08-08 06:41:05 +00:00
|
|
|
}
|
|
|
|
|
2012-07-18 05:00:16 +00:00
|
|
|
/*
|
|
|
|
Functions that append data and increase the size of the buffer if possible / required
|
|
|
|
*/
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_append_byte(struct __sourceloc __whence, struct overlay_buffer *b, unsigned char byte)
|
2011-09-03 21:06:39 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
const int bytes = 1;
|
2013-11-22 14:29:11 +00:00
|
|
|
if (ob_makespace(b, bytes)) {
|
2013-11-25 06:13:32 +00:00
|
|
|
b->bytes[b->position] = byte;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_byte(b=%p, byte=0x%02x) %p[%zd]=%02x position=%zu", b, byte, b->bytes, b->position, byte, b->position + bytes);
|
2013-11-22 14:29:11 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_byte(b=%p, byte=0x%02x) OVERRUN position=%zu", b, byte, b->position + bytes);
|
2013-11-22 14:29:11 +00:00
|
|
|
}
|
2013-11-25 06:13:32 +00:00
|
|
|
b->position += bytes;
|
2011-09-03 21:06:39 +00:00
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
unsigned char *_ob_append_space(struct __sourceloc __whence, struct overlay_buffer *b, size_t count)
|
2012-04-13 16:44:41 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(count > 0);
|
|
|
|
unsigned char *r = ob_makespace(b, count) ? &b->bytes[b->position] : NULL;
|
|
|
|
b->position += count;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_space(b=%p, count=%zu) position=%zu return %p", b, count, b->position, r);
|
2012-04-13 16:44:41 +00:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
void _ob_append_bytes(struct __sourceloc __whence, struct overlay_buffer *b, const unsigned char *bytes, size_t count)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(count > 0);
|
|
|
|
unsigned char *r = ob_makespace(b, count) ? &b->bytes[b->position] : NULL;
|
2013-11-22 14:29:11 +00:00
|
|
|
if (r) {
|
2013-11-25 06:13:32 +00:00
|
|
|
bcopy(bytes, r, count);
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_bytes(b=%p, bytes=%p, count=%zu) position=%zu return %p", b, bytes, count, b->position + count, r);
|
2013-11-22 14:29:11 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_bytes(b=%p, bytes=%p, count=%zu) OVERRUN position=%zu return NULL", b, bytes, count, b->position + count);
|
2013-11-22 14:29:11 +00:00
|
|
|
}
|
Rewrite logging system
Rename the logging primitive functions and utility functions, prefixing
all with 'serval_log', eg: logMessage() -> serval_logf() etc.
Add an XPRINTF xhexdump() function and use it to implement the
serval_log_hexdump() utility, renamed from dump(). Add macros
WHY_dump(), WARN_dump(), HINT_dump() and DEBUG_dump(), and use them
everywhere.
Remove the 'log.console.dump_config' and 'log.file.dump_config'
configuration options; configuration is now dumped in every log prolog.
The logging system now constructs the log prolog by invoking the new
'log_prolog' trigger, so that it no longer depends on the version string
and configuration system. Any system that wants to present a message in
the log prolog can define its own trigger, which calls standard log
primitives to print the message.
Split the logging system into a front-end (log.c) that provides the
logging primitives and is independent of the configuration system, and a
set of back-end "outputters" (log_output_console.c, log_output_file.c,
log_output_android.c) that may depend on the configuration system and
are decoupled from the front-end using the 'logoutput' link section.
These log outputters are explicitly linked into executables by the
Makefile rules, but could also be linked in using USE_FEATURE(). The
USE_FEATURE() calls have _not_ been added to servald_features.c, so that
different daemon executables can be built with the same feature set but
different log outputs.
2017-11-29 13:34:54 +00:00
|
|
|
DEBUG_dump(overlaybuffer, "ob_append_bytes", bytes, count);
|
2013-11-25 06:13:32 +00:00
|
|
|
b->position += count;
|
2011-08-08 06:41:05 +00:00
|
|
|
}
|
|
|
|
|
2014-02-03 03:54:41 +00:00
|
|
|
void _ob_append_str(struct __sourceloc whence, struct overlay_buffer *b, const char *str)
|
|
|
|
{
|
|
|
|
_ob_append_bytes(whence, b, (const uint8_t*)str, strlen(str)+1);
|
|
|
|
}
|
|
|
|
|
2016-06-28 03:39:02 +00:00
|
|
|
void _ob_append_strn(struct __sourceloc whence, struct overlay_buffer *b, const char *str, size_t max_len)
|
|
|
|
{
|
|
|
|
_ob_append_bytes(whence, b, (const uint8_t*)str, strnlen(str, max_len));
|
|
|
|
_ob_append_byte(whence, b, 0);
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_append_ui16(struct __sourceloc __whence, struct overlay_buffer *b, uint16_t v)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
const int bytes = 2;
|
|
|
|
if (ob_makespace(b, bytes)) {
|
|
|
|
b->bytes[b->position] = (v >> 8) & 0xFF;
|
|
|
|
b->bytes[b->position+1] = v & 0xFF;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui16(b=%p, v=%u) %p[%zd]=%s position=%zu", b, v, b->bytes, b->position, alloca_tohex(&b->bytes[b->position], bytes), b->position + bytes);
|
2013-11-22 14:29:11 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui16(b=%p, v=%u) OVERRUN position=%zu", b, v, b->position + bytes);
|
2013-11-25 06:13:32 +00:00
|
|
|
}
|
|
|
|
b->position += bytes;
|
2011-08-08 06:41:05 +00:00
|
|
|
}
|
|
|
|
|
2014-02-03 03:54:41 +00:00
|
|
|
void _ob_append_ui16_rv(struct __sourceloc __whence, struct overlay_buffer *b, uint16_t v)
|
|
|
|
{
|
|
|
|
const int bytes = 2;
|
|
|
|
if (ob_makespace(b, bytes)) {
|
|
|
|
b->bytes[b->position] = v & 0xFF;
|
|
|
|
b->bytes[b->position+1] = (v >> 8) & 0xFF;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui16(b=%p, v=%u) %p[%zd]=%s position=%zu", b, v, b->bytes, b->position, alloca_tohex(&b->bytes[b->position], bytes), b->position + bytes);
|
2014-02-03 03:54:41 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui16(b=%p, v=%u) OVERRUN position=%zu", b, v, b->position + bytes);
|
2014-02-03 03:54:41 +00:00
|
|
|
}
|
|
|
|
b->position += bytes;
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_append_ui32(struct __sourceloc __whence, struct overlay_buffer *b, uint32_t v)
|
2011-08-08 06:41:05 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
const int bytes = 4;
|
|
|
|
if (ob_makespace(b, bytes)) {
|
|
|
|
b->bytes[b->position] = (v >> 24) & 0xFF;
|
|
|
|
b->bytes[b->position+1] = (v >> 16) & 0xFF;
|
|
|
|
b->bytes[b->position+2] = (v >> 8) & 0xFF;
|
|
|
|
b->bytes[b->position+3] = v & 0xFF;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui32(b=%p, v=%"PRIu32") %p[%zd]=%s position=%zu",
|
|
|
|
b, v, b->bytes, b->position, alloca_tohex(&b->bytes[b->position], bytes), b->position + bytes);
|
2013-11-22 14:29:11 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui32(b=%p, v=%"PRIu32") OVERRUN position=%zu", b, v, b->position + bytes);
|
2013-11-25 06:13:32 +00:00
|
|
|
}
|
|
|
|
b->position += bytes;
|
2011-08-08 06:41:05 +00:00
|
|
|
}
|
2011-08-17 01:22:17 +00:00
|
|
|
|
2014-02-03 03:54:41 +00:00
|
|
|
void _ob_append_ui32_rv(struct __sourceloc __whence, struct overlay_buffer *b, uint32_t v)
|
|
|
|
{
|
|
|
|
const int bytes = 4;
|
|
|
|
if (ob_makespace(b, bytes)) {
|
|
|
|
b->bytes[b->position] = v & 0xFF;
|
|
|
|
b->bytes[b->position+1] = (v >> 8) & 0xFF;
|
|
|
|
b->bytes[b->position+2] = (v >> 16) & 0xFF;
|
|
|
|
b->bytes[b->position+3] = (v >> 24) & 0xFF;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui32(b=%p, v=%"PRIu32") %p[%zd]=%s position=%zu",
|
|
|
|
b, v, b->bytes, b->position, alloca_tohex(&b->bytes[b->position], bytes), b->position + bytes);
|
2014-02-03 03:54:41 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui32(b=%p, v=%"PRIu32") OVERRUN position=%zu", b, v, b->position + bytes);
|
2014-02-03 03:54:41 +00:00
|
|
|
}
|
|
|
|
b->position += bytes;
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_append_ui64(struct __sourceloc __whence, struct overlay_buffer *b, uint64_t v)
|
2013-06-18 03:57:26 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
const int bytes = 8;
|
|
|
|
if (ob_makespace(b, bytes)) {
|
|
|
|
b->bytes[b->position] = (v >> 56) & 0xFF;
|
|
|
|
b->bytes[b->position+1] = (v >> 48) & 0xFF;
|
|
|
|
b->bytes[b->position+2] = (v >> 40) & 0xFF;
|
|
|
|
b->bytes[b->position+3] = (v >> 32) & 0xFF;
|
|
|
|
b->bytes[b->position+4] = (v >> 24) & 0xFF;
|
|
|
|
b->bytes[b->position+5] = (v >> 16) & 0xFF;
|
|
|
|
b->bytes[b->position+6] = (v >> 8) & 0xFF;
|
|
|
|
b->bytes[b->position+7] = v & 0xFF;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui64(b=%p, v=%"PRIu64") %p[%zd]=%s position=%zu",
|
|
|
|
b, v, b->bytes, b->position, alloca_tohex(&b->bytes[b->position], bytes), b->position + bytes);
|
2013-11-22 14:29:11 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui64(b=%p, v=%"PRIu64") OVERRUN position=%zu", b, v, b->position + bytes);
|
2013-11-25 06:13:32 +00:00
|
|
|
}
|
|
|
|
b->position += bytes;
|
2013-06-18 03:57:26 +00:00
|
|
|
}
|
|
|
|
|
2014-02-03 03:54:41 +00:00
|
|
|
void _ob_append_ui64_rv(struct __sourceloc __whence, struct overlay_buffer *b, uint64_t v)
|
|
|
|
{
|
|
|
|
const int bytes = 8;
|
|
|
|
if (ob_makespace(b, bytes)) {
|
|
|
|
b->bytes[b->position] = v & 0xFF;
|
|
|
|
b->bytes[b->position+1] = (v >> 8) & 0xFF;
|
|
|
|
b->bytes[b->position+2] = (v >> 16) & 0xFF;
|
|
|
|
b->bytes[b->position+3] = (v >> 24) & 0xFF;
|
|
|
|
b->bytes[b->position+4] = (v >> 32) & 0xFF;
|
|
|
|
b->bytes[b->position+5] = (v >> 40) & 0xFF;
|
|
|
|
b->bytes[b->position+6] = (v >> 48) & 0xFF;
|
|
|
|
b->bytes[b->position+7] = (v >> 56) & 0xFF;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui64(b=%p, v=%"PRIu64") %p[%zd]=%s position=%zu",
|
|
|
|
b, v, b->bytes, b->position, alloca_tohex(&b->bytes[b->position], bytes), b->position + bytes);
|
2014-02-03 03:54:41 +00:00
|
|
|
} else {
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_append_ui64(b=%p, v=%"PRIu64") OVERRUN position=%zu", b, v, b->position + bytes);
|
2014-02-03 03:54:41 +00:00
|
|
|
}
|
|
|
|
b->position += bytes;
|
|
|
|
}
|
|
|
|
|
2013-07-23 04:51:46 +00:00
|
|
|
int measure_packed_uint(uint64_t v){
|
2013-07-31 01:03:46 +00:00
|
|
|
int ret=0;
|
|
|
|
do{
|
2013-07-23 04:51:46 +00:00
|
|
|
v>>=7;
|
|
|
|
ret++;
|
2013-07-31 01:03:46 +00:00
|
|
|
}while(v);
|
2013-07-23 04:51:46 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int pack_uint(unsigned char *buffer, uint64_t v){
|
|
|
|
int ret=0;
|
|
|
|
do{
|
|
|
|
*buffer++=(v&0x7f) | (v>0x7f?0x80:0);
|
|
|
|
v>>=7;
|
|
|
|
ret++;
|
|
|
|
}while(v);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int unpack_uint(unsigned char *buffer, int buff_size, uint64_t *v){
|
|
|
|
int i=0;
|
|
|
|
*v=0;
|
|
|
|
while(1){
|
|
|
|
if (i>=buff_size)
|
|
|
|
return -1;
|
|
|
|
char byte = buffer[i];
|
|
|
|
*v |= (byte&0x7f)<<(i*7);
|
|
|
|
i++;
|
|
|
|
if (!(byte&0x80))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_append_packed_ui32(struct __sourceloc __whence, struct overlay_buffer *b, uint32_t v)
|
2012-11-28 03:01:33 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
do {
|
|
|
|
ob_append_byte(b, (v&0x7f) | (v>0x7f?0x80:0));
|
|
|
|
v = v >> 7;
|
|
|
|
} while (v != 0);
|
2012-11-28 03:01:33 +00:00
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
void _ob_append_packed_ui64(struct __sourceloc __whence, struct overlay_buffer *b, uint64_t v)
|
2013-06-18 03:57:26 +00:00
|
|
|
{
|
2013-11-25 06:13:32 +00:00
|
|
|
do {
|
|
|
|
ob_append_byte(b, (v&0x7f) | (v>0x7f?0x80:0));
|
|
|
|
v = v >> 7;
|
|
|
|
} while (v != 0);
|
2013-06-18 03:57:26 +00:00
|
|
|
}
|
|
|
|
|
2012-07-18 05:00:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Functions that read / write data within the existing length limit
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2012-08-22 00:51:38 +00:00
|
|
|
// make sure a range of bytes is valid for reading
|
2013-12-10 06:33:30 +00:00
|
|
|
static int test_offset(struct overlay_buffer *b, size_t length)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
assert(length != 0);
|
|
|
|
size_t off = b->position + length;
|
|
|
|
return off <= b->sizeLimit && off <= b->allocSize;
|
2012-07-18 05:00:16 +00:00
|
|
|
}
|
2011-08-17 01:22:17 +00:00
|
|
|
|
2013-11-28 07:14:37 +00:00
|
|
|
// next byte without advancing
|
|
|
|
int ob_peek(struct overlay_buffer *b)
|
2012-07-18 05:00:16 +00:00
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 1))
|
2012-08-22 00:51:38 +00:00
|
|
|
return -1;
|
2013-11-28 07:14:37 +00:00
|
|
|
return b->bytes[b->position];
|
|
|
|
}
|
|
|
|
|
|
|
|
void ob_skip(struct overlay_buffer *b, unsigned n)
|
|
|
|
{
|
|
|
|
b->position += n;
|
2012-08-22 00:51:38 +00:00
|
|
|
}
|
|
|
|
|
2014-01-23 06:01:56 +00:00
|
|
|
// return a null terminated string pointer and advance past the string
|
|
|
|
const char *ob_get_str_ptr(struct overlay_buffer *b)
|
|
|
|
{
|
|
|
|
const char *ret = (const char*)(b->bytes + b->position);
|
2018-03-09 06:24:02 +00:00
|
|
|
off_t ofs = 0;
|
|
|
|
while (test_offset(b, ofs + 1)) {
|
2014-01-23 06:01:56 +00:00
|
|
|
if (ret[ofs]=='\0'){
|
|
|
|
b->position+=ofs+1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
ofs++;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
int ob_get_bytes(struct overlay_buffer *b, unsigned char *buff, size_t len)
|
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, len))
|
2012-08-22 00:51:38 +00:00
|
|
|
return -1;
|
|
|
|
bcopy(b->bytes + b->position, buff, len);
|
|
|
|
b->position+=len;
|
2012-07-18 05:00:16 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
unsigned char * ob_get_bytes_ptr(struct overlay_buffer *b, size_t len)
|
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, len))
|
2012-08-22 00:51:38 +00:00
|
|
|
return NULL;
|
|
|
|
unsigned char *ret = b->bytes + b->position;
|
|
|
|
b->position+=len;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t ob_get_ui32(struct overlay_buffer *b)
|
2012-07-18 05:00:16 +00:00
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 4))
|
2012-08-22 00:51:38 +00:00
|
|
|
return 0xFFFFFFFF; // ... unsigned
|
2016-01-25 06:32:21 +00:00
|
|
|
uint32_t ret = (unsigned)b->bytes[b->position] << 24
|
2012-08-22 00:51:38 +00:00
|
|
|
| b->bytes[b->position +1] << 16
|
|
|
|
| b->bytes[b->position +2] << 8
|
|
|
|
| b->bytes[b->position +3];
|
|
|
|
b->position+=4;
|
|
|
|
return ret;
|
2012-07-18 05:00:16 +00:00
|
|
|
}
|
|
|
|
|
2014-01-23 06:01:56 +00:00
|
|
|
uint32_t ob_get_ui32_rv(struct overlay_buffer *b)
|
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 4))
|
2014-01-23 06:01:56 +00:00
|
|
|
return 0xFFFFFFFF; // ... unsigned
|
|
|
|
uint32_t ret = b->bytes[b->position]
|
|
|
|
| b->bytes[b->position +1] << 8
|
|
|
|
| b->bytes[b->position +2] << 16
|
2016-01-25 06:32:21 +00:00
|
|
|
| (unsigned)b->bytes[b->position +3] << 24;
|
2014-01-23 06:01:56 +00:00
|
|
|
b->position+=4;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-06-18 03:57:26 +00:00
|
|
|
uint64_t ob_get_ui64(struct overlay_buffer *b)
|
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 8))
|
2013-06-18 03:57:26 +00:00
|
|
|
return 0xFFFFFFFF; // ... unsigned
|
|
|
|
uint64_t ret = (uint64_t)b->bytes[b->position] << 56
|
|
|
|
| (uint64_t)b->bytes[b->position +1] << 48
|
|
|
|
| (uint64_t)b->bytes[b->position +2] << 40
|
|
|
|
| (uint64_t)b->bytes[b->position +3] << 36
|
|
|
|
| b->bytes[b->position +4] << 24
|
|
|
|
| b->bytes[b->position +5] << 16
|
|
|
|
| b->bytes[b->position +6] << 8
|
|
|
|
| b->bytes[b->position +7];
|
|
|
|
b->position+=8;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-01-23 06:01:56 +00:00
|
|
|
uint64_t ob_get_ui64_rv(struct overlay_buffer *b)
|
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 8))
|
2014-01-23 06:01:56 +00:00
|
|
|
return 0xFFFFFFFF; // ... unsigned
|
|
|
|
uint64_t ret = (uint64_t)b->bytes[b->position]
|
|
|
|
| (uint64_t)b->bytes[b->position +1] << 8
|
|
|
|
| (uint64_t)b->bytes[b->position +2] << 16
|
|
|
|
| (uint64_t)b->bytes[b->position +3] << 24
|
|
|
|
| (uint64_t)b->bytes[b->position +4] << 32
|
|
|
|
| (uint64_t)b->bytes[b->position +5] << 40
|
|
|
|
| (uint64_t)b->bytes[b->position +6] << 48
|
|
|
|
| (uint64_t)b->bytes[b->position +7] << 56;
|
|
|
|
b->position+=8;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-08-22 00:51:38 +00:00
|
|
|
uint16_t ob_get_ui16(struct overlay_buffer *b)
|
2012-07-18 05:00:16 +00:00
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 2))
|
2012-08-22 00:51:38 +00:00
|
|
|
return 0xFFFF; // ... unsigned
|
|
|
|
uint16_t ret = b->bytes[b->position] << 8
|
|
|
|
| b->bytes[b->position +1];
|
|
|
|
b->position+=2;
|
|
|
|
return ret;
|
|
|
|
}
|
2012-07-18 05:00:16 +00:00
|
|
|
|
2014-01-23 06:01:56 +00:00
|
|
|
uint16_t ob_get_ui16_rv(struct overlay_buffer *b)
|
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 2))
|
2014-01-23 06:01:56 +00:00
|
|
|
return 0xFFFF; // ... unsigned
|
|
|
|
uint16_t ret = b->bytes[b->position]
|
|
|
|
| b->bytes[b->position +1] << 8;
|
|
|
|
b->position+=2;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-11-28 03:01:33 +00:00
|
|
|
uint32_t ob_get_packed_ui32(struct overlay_buffer *b)
|
|
|
|
{
|
|
|
|
uint32_t ret=0;
|
|
|
|
int shift=0;
|
|
|
|
int byte;
|
|
|
|
do{
|
|
|
|
byte = ob_get(b);
|
|
|
|
if (byte<0)
|
|
|
|
return WHY("Failed to unpack integer");
|
|
|
|
ret |= (byte&0x7f)<<shift;
|
|
|
|
shift+=7;
|
|
|
|
}while(byte & 0x80);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-06-18 03:57:26 +00:00
|
|
|
uint64_t ob_get_packed_ui64(struct overlay_buffer *b)
|
|
|
|
{
|
|
|
|
uint64_t ret=0;
|
|
|
|
int shift=0;
|
|
|
|
int byte;
|
|
|
|
do{
|
|
|
|
byte = ob_get(b);
|
|
|
|
if (byte<0)
|
|
|
|
return WHY("Failed to unpack integer");
|
|
|
|
ret |= (byte&0x7f)<<shift;
|
|
|
|
shift+=7;
|
|
|
|
}while(byte & 0x80);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
int ob_get(struct overlay_buffer *b)
|
|
|
|
{
|
2018-03-09 06:24:02 +00:00
|
|
|
if (!test_offset(b, 1))
|
2012-08-22 00:51:38 +00:00
|
|
|
return -1;
|
|
|
|
return b->bytes[b->position++];
|
2011-08-17 01:22:17 +00:00
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
void _ob_set_ui16(struct __sourceloc __whence, struct overlay_buffer *b, size_t offset, uint16_t v)
|
2011-08-17 01:22:17 +00:00
|
|
|
{
|
2013-11-22 14:29:11 +00:00
|
|
|
const int bytes = 2;
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
2013-12-10 06:33:30 +00:00
|
|
|
assert(offset + bytes <= b->sizeLimit);
|
2013-11-22 14:29:11 +00:00
|
|
|
assert(offset + bytes <= b->allocSize);
|
2012-11-23 03:04:01 +00:00
|
|
|
b->bytes[offset] = (v >> 8) & 0xFF;
|
|
|
|
b->bytes[offset+1] = v & 0xFF;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_set_ui16(b=%p, offset=%zd, v=%u) %p[%zd]=%s", b, offset, v, b->bytes, offset, alloca_tohex(&b->bytes[offset], bytes));
|
2011-08-17 01:22:17 +00:00
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
void _ob_set(struct __sourceloc __whence, struct overlay_buffer *b, size_t offset, unsigned char byte)
|
2013-04-29 00:36:22 +00:00
|
|
|
{
|
2013-11-22 14:29:11 +00:00
|
|
|
const int bytes = 1;
|
2013-11-25 06:13:32 +00:00
|
|
|
assert(b != NULL);
|
2013-12-10 06:33:30 +00:00
|
|
|
assert(offset + bytes <= b->sizeLimit);
|
2013-11-22 14:29:11 +00:00
|
|
|
assert(offset + bytes <= b->allocSize);
|
2013-11-25 06:13:32 +00:00
|
|
|
b->bytes[offset] = byte;
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_set(b=%p, offset=%zd, byte=0x%02x) %p[%zd]=%s", b, offset, byte, b->bytes, offset, alloca_tohex(&b->bytes[offset], bytes));
|
2013-04-29 00:36:22 +00:00
|
|
|
}
|
|
|
|
|
2011-09-05 02:49:53 +00:00
|
|
|
|
2012-11-27 04:02:10 +00:00
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
size_t ob_position(struct overlay_buffer *b)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
2012-11-27 04:02:10 +00:00
|
|
|
return b->position;
|
|
|
|
}
|
2013-11-25 06:13:32 +00:00
|
|
|
|
2016-06-28 03:39:02 +00:00
|
|
|
size_t ob_mark(struct overlay_buffer *b)
|
|
|
|
{
|
|
|
|
return b->checkpointLength;
|
|
|
|
}
|
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
size_t ob_limit(struct overlay_buffer *b)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
2012-11-27 04:02:10 +00:00
|
|
|
return b->sizeLimit;
|
|
|
|
}
|
2013-11-25 06:13:32 +00:00
|
|
|
|
2013-12-10 06:33:30 +00:00
|
|
|
size_t ob_remaining(struct overlay_buffer *b)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
2013-12-10 06:33:30 +00:00
|
|
|
assert(b->sizeLimit != SIZE_MAX);
|
|
|
|
assert(b->position <= b->sizeLimit);
|
|
|
|
return (size_t)(b->sizeLimit - b->position);
|
2012-11-27 04:02:10 +00:00
|
|
|
}
|
2013-11-25 06:13:32 +00:00
|
|
|
|
2013-11-22 14:29:11 +00:00
|
|
|
int _ob_overrun(struct __sourceloc __whence, struct overlay_buffer *b)
|
2013-11-25 06:13:32 +00:00
|
|
|
{
|
2013-12-10 06:33:30 +00:00
|
|
|
int ret = b->position > (b->sizeLimit != SIZE_MAX && b->sizeLimit < b->allocSize ? b->sizeLimit : b->allocSize);
|
2015-07-06 08:19:49 +00:00
|
|
|
DEBUGF(overlaybuffer, "ob_overrun(b=%p) return %d", b, ret);
|
2013-11-22 14:29:11 +00:00
|
|
|
return ret;
|
2013-11-25 06:13:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
unsigned char *ob_ptr(struct overlay_buffer *b)
|
|
|
|
{
|
2012-11-27 04:02:10 +00:00
|
|
|
return b->bytes;
|
|
|
|
}
|
|
|
|
|
2014-01-23 06:01:56 +00:00
|
|
|
unsigned char *ob_current_ptr(struct overlay_buffer *b)
|
|
|
|
{
|
|
|
|
return &b->bytes[b->position];
|
|
|
|
}
|
|
|
|
|
2011-09-05 02:49:53 +00:00
|
|
|
int asprintable(int c)
|
|
|
|
{
|
|
|
|
if (c<' ') return '.';
|
|
|
|
if (c>0x7e) return '.';
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
2013-08-30 05:40:54 +00:00
|
|
|
int ob_dump(struct overlay_buffer *b, char *desc)
|
2011-09-05 02:49:53 +00:00
|
|
|
{
|
2015-07-06 08:19:49 +00:00
|
|
|
_DEBUGF("overlay_buffer '%s' at %p (%p) : checkpoint=%zu, position=%zu, limit=%zu, size=%zu",
|
|
|
|
desc, b, b->bytes, b->checkpointLength, b->position, b->sizeLimit, b->allocSize);
|
2013-12-10 06:33:30 +00:00
|
|
|
if (b->bytes) {
|
|
|
|
if (b->sizeLimit != SIZE_MAX && b->sizeLimit > 0) {
|
|
|
|
assert(b->position <= b->sizeLimit);
|
Rewrite logging system
Rename the logging primitive functions and utility functions, prefixing
all with 'serval_log', eg: logMessage() -> serval_logf() etc.
Add an XPRINTF xhexdump() function and use it to implement the
serval_log_hexdump() utility, renamed from dump(). Add macros
WHY_dump(), WARN_dump(), HINT_dump() and DEBUG_dump(), and use them
everywhere.
Remove the 'log.console.dump_config' and 'log.file.dump_config'
configuration options; configuration is now dumped in every log prolog.
The logging system now constructs the log prolog by invoking the new
'log_prolog' trigger, so that it no longer depends on the version string
and configuration system. Any system that wants to present a message in
the log prolog can define its own trigger, which calls standard log
primitives to print the message.
Split the logging system into a front-end (log.c) that provides the
logging primitives and is independent of the configuration system, and a
set of back-end "outputters" (log_output_console.c, log_output_file.c,
log_output_android.c) that may depend on the configuration system and
are decoupled from the front-end using the 'logoutput' link section.
These log outputters are explicitly linked into executables by the
Makefile rules, but could also be linked in using USE_FEATURE(). The
USE_FEATURE() calls have _not_ been added to servald_features.c, so that
different daemon executables can be built with the same feature set but
different log outputs.
2017-11-29 13:34:54 +00:00
|
|
|
_DEBUG_dump(desc, b->bytes, b->sizeLimit);
|
2013-12-10 06:33:30 +00:00
|
|
|
} else if (b->position > 0)
|
Rewrite logging system
Rename the logging primitive functions and utility functions, prefixing
all with 'serval_log', eg: logMessage() -> serval_logf() etc.
Add an XPRINTF xhexdump() function and use it to implement the
serval_log_hexdump() utility, renamed from dump(). Add macros
WHY_dump(), WARN_dump(), HINT_dump() and DEBUG_dump(), and use them
everywhere.
Remove the 'log.console.dump_config' and 'log.file.dump_config'
configuration options; configuration is now dumped in every log prolog.
The logging system now constructs the log prolog by invoking the new
'log_prolog' trigger, so that it no longer depends on the version string
and configuration system. Any system that wants to present a message in
the log prolog can define its own trigger, which calls standard log
primitives to print the message.
Split the logging system into a front-end (log.c) that provides the
logging primitives and is independent of the configuration system, and a
set of back-end "outputters" (log_output_console.c, log_output_file.c,
log_output_android.c) that may depend on the configuration system and
are decoupled from the front-end using the 'logoutput' link section.
These log outputters are explicitly linked into executables by the
Makefile rules, but could also be linked in using USE_FEATURE(). The
USE_FEATURE() calls have _not_ been added to servald_features.c, so that
different daemon executables can be built with the same feature set but
different log outputs.
2017-11-29 13:34:54 +00:00
|
|
|
_DEBUG_dump(desc, b->bytes, b->position);
|
2013-12-10 06:33:30 +00:00
|
|
|
}
|
2011-09-05 02:49:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|