X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcbuffmt.c;h=559e7309d9cf700ce2cc9259dbe173ea7a4e60b4;hp=65dd76b42c6ac102e7988b72851f6eecafbb8430;hb=38b10925eeea619c2b6fa646892df4416e6dd08f;hpb=c257b555225193e54d85daf541d29578b3c93882 diff --git a/lib/silcutil/silcbuffmt.c b/lib/silcutil/silcbuffmt.c index 65dd76b4..559e7309 100644 --- a/lib/silcutil/silcbuffmt.c +++ b/lib/silcutil/silcbuffmt.c @@ -4,12 +4,11 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2002 Pekka Riikonen + Copyright (C) 1997 - 2008 Pekka Riikonen 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. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,168 +18,430 @@ */ /* $Id$ */ -#include "silcincludes.h" - -/* Macros to check whether there is enough free space to add the - required amount of data. For unformatting this means that there must - be the data that is to be extracted. */ -#define FORMAT_HAS_SPACE(__x__, __req__) \ - do { \ - if (__req__ > (__x__)->len) \ - goto fail; \ - } while(0) -#define UNFORMAT_HAS_SPACE(__x__, __req__) \ - do { \ - if (__req__ > (__x__)->len) \ - goto fail; \ - if ((__req__ + 1) <= 0) \ - goto fail; \ - } while(0) - -/* Formats the arguments sent and puts them into the buffer sent as - argument. The buffer must be initialized beforehand and it must have - enough free space to include the formatted data. If this function - fails caller should not trust the buffer anymore and should free it. - This function is used, for example, to create packets to send over - network. */ +#include "silc.h" -int silc_buffer_format(SilcBuffer dst, ...) -{ - va_list ap; - int ret; +/************************** Types and definitions ***************************/ - va_start(ap, dst); - ret = silc_buffer_format_vp(dst, ap); - va_end(ap); +/* Check that buffer has enough room to format data in it, if not + allocate more. */ +#define FORMAT_HAS_SPACE(s, b, req) \ +do { \ + if (silc_unlikely(!silc_buffer_senlarge(s, b, req))) \ + goto fail; \ + flen += req; \ +} while(0) - return ret; -} +/* Check that buffer has enough room to format data in it, if not + allocate more. This will append, thus not replacing any existing data. */ +#define FORMAT_HAS_SPACE_APPEND(s, b, req) \ +do { \ + if (silc_buffer_len(b) < req) \ + if (silc_unlikely(!silc_buffer_sappend(s, b, req - silc_buffer_len(b)))) \ + goto fail; \ + flen += req; \ +} while(0) -int silc_buffer_format_vp(SilcBuffer dst, va_list ap) +/* Check that there is data to be unformatted */ +#define UNFORMAT_HAS_SPACE(b, req) \ +do { \ + if (silc_unlikely(req > silc_buffer_len(b))) { \ + silc_set_errno(SILC_ERR_OVERFLOW); \ + goto fail; \ + } \ + if (silc_unlikely((req + 1) <= 0)) { \ + silc_set_errno(SILC_ERR_UNDERFLOW); \ + goto fail; \ + } \ +} while(0) + + +/******************************* Formatting *********************************/ + +int silc_buffer_sformat_vp_i(SilcStack stack, SilcBuffer dst, va_list ap, + SilcBool process) { - SilcBufferParamType fmt; - unsigned char *start_ptr = dst->data; - int len; + SilcParam fmt; + int flen = 0; + SilcBool advance = FALSE; /* Parse the arguments by formatting type. */ while (1) { - fmt = va_arg(ap, SilcBufferParamType); + fmt = va_arg(ap, SilcParam); - switch(fmt) { - case SILC_BUFFER_PARAM_SI8_CHAR: + SILC_LOG_DEBUG(("Buffer format type %d", fmt)); + + switch (fmt) { + case SILC_PARAM_FUNC: { - char x = (char)va_arg(ap, int); - FORMAT_HAS_SPACE(dst, 1); - silc_buffer_put(dst, &x, 1); - silc_buffer_pull(dst, 1); + SilcBufferFormatFunc func; + void *val; + void *context; + int tmp_len; + + func = va_arg(ap, SilcBufferFormatFunc); + val = va_arg(ap, void *); + context = va_arg(ap, void *); + + if (!process) + break; + + tmp_len = func(stack, dst, val, context); + if (tmp_len < 0) + goto fail; + if (tmp_len) { + silc_buffer_pull(dst, tmp_len); + flen += tmp_len; + } break; } - case SILC_BUFFER_PARAM_UI8_CHAR: + + case SILC_PARAM_REGEX: { - unsigned char x = (unsigned char)va_arg(ap, int); - FORMAT_HAS_SPACE(dst, 1); - silc_buffer_put(dst, &x, 1); - silc_buffer_pull(dst, 1); + const char *regex = va_arg(ap, char *); + SilcBufferRegexFlags rflags = va_arg(ap, SilcUInt32); + SilcBufferStruct match, saved; + SilcBool match_all = (rflags & SILC_STR_REGEX_ALL) != 0; + SilcBool match_nl = (rflags & SILC_STR_REGEX_NL) != 0; + SilcBool ret; + SilcUInt32 inclusive_pos = 0; + int matched = 0, ret_len; + va_list cp; + + if (!process) + break; + + if (!regex) + goto fail; + + memset(&saved, 0, sizeof(saved)); + + if (match_nl) { + start_nl_match: + /* Match for '\n' in the buffer. If not found, treat as line + without '\n' (buffer has only one line, or this is last line). */ + saved = *dst; + if (silc_regex_buffer(dst, "\n", &match, NULL)) + dst->tail = match.tail; + } + + start_match: + /* Match */ + ret = silc_regex_buffer(dst, regex, &match, NULL); + ret ^= (rflags & SILC_STR_REGEX_NOT) != 0; + if (!ret) { + if (!matched && rflags & SILC_STR_REGEX_MISMATCH) { + silc_set_errno(SILC_ERR_NOT_FOUND); + goto fail; + } + goto end_match; + } + matched++; + + if (rflags & SILC_STR_REGEX_NOT) + match = *dst; + + if (!(rflags & SILC_STR_REGEX_NO_ADVANCE)) { + /* Advance buffer after match */ + flen += (match.data - dst->data); + if (!silc_buffer_pull(dst, (match.data - dst->data))) + goto fail; + } + + if (rflags & SILC_STR_REGEX_INCLUSIVE) { + inclusive_pos = dst->tail - match.tail; + dst->tail = match.tail; + } + + /* Recursively format */ + silc_va_copy(cp, ap); + ret_len = silc_buffer_sformat_vp_i(stack, dst, cp, TRUE); + va_end(cp); + if (ret_len < 0) + goto fail; + + if (rflags & SILC_STR_REGEX_INCLUSIVE) + if (!silc_buffer_pull_tail(dst, inclusive_pos)) + goto fail; + + /* Advance buffer after formatting */ + flen += ret_len; + if (!silc_buffer_pull(dst, ret_len)) + goto fail; + + if (match_all && (!match_nl || silc_buffer_len(dst) > 1)) + goto start_match; + + end_match: + if (match_nl) { + /* Go to next line, it is at the end of the data area. Adjust + the tail area of the target buffer to show rest of the buffer. */ + flen += (dst->tail - dst->data); + if (!silc_buffer_pull(dst, (dst->tail - dst->data))) + goto fail; + if (!silc_buffer_pull_tail(dst, (saved.tail - dst->tail))) + goto fail; + + if (silc_buffer_len(dst) > 0) + goto start_nl_match; + } + + /* Skip to the next SILC_PARAM_END */ + silc_buffer_sformat_vp_i(NULL, NULL, ap, FALSE); break; } - case SILC_BUFFER_PARAM_SI16_SHORT: + + case SILC_PARAM_UI8_STRING: + case SILC_PARAM_UI16_STRING: + case SILC_PARAM_UI32_STRING: + case SILC_PARAM_UI8_STRING | SILC_PARAM_ALLOC: + case SILC_PARAM_UI16_STRING | SILC_PARAM_ALLOC: + case SILC_PARAM_UI32_STRING | SILC_PARAM_ALLOC: { - unsigned char xf[2]; - SilcInt16 x = (SilcInt16)va_arg(ap, int); - FORMAT_HAS_SPACE(dst, 2); - SILC_PUT16_MSB(x, xf); - silc_buffer_put(dst, xf, 2); - silc_buffer_pull(dst, 2); + char *x = va_arg(ap, char *); + SilcUInt32 tmp_len = x ? strlen(x) : 0; + + if (!process) + break; + + if (x && tmp_len) { + FORMAT_HAS_SPACE(stack, dst, tmp_len); + silc_buffer_put(dst, x, tmp_len); + silc_buffer_pull(dst, tmp_len); + } + break; + } + + case SILC_PARAM_UI8_STRING | SILC_PARAM_APPEND: + case SILC_PARAM_UI16_STRING | SILC_PARAM_APPEND: + case SILC_PARAM_UI32_STRING | SILC_PARAM_APPEND: + { + char *x = va_arg(ap, char *); + SilcUInt32 tmp_len = x ? strlen(x) : 0; + + if (!process) + break; + + if (x && tmp_len) { + FORMAT_HAS_SPACE_APPEND(stack, dst, tmp_len); + silc_buffer_put(dst, x, tmp_len); + silc_buffer_pull(dst, tmp_len); + } + break; + } + + case SILC_PARAM_UI8_NSTRING: + case SILC_PARAM_UI16_NSTRING: + case SILC_PARAM_UI32_NSTRING: + case SILC_PARAM_UICHAR: + case SILC_PARAM_UI8_NSTRING | SILC_PARAM_ALLOC: + case SILC_PARAM_UI16_NSTRING | SILC_PARAM_ALLOC: + case SILC_PARAM_UI32_NSTRING | SILC_PARAM_ALLOC: + case SILC_PARAM_UICHAR | SILC_PARAM_ALLOC: + { + unsigned char *x = va_arg(ap, unsigned char *); + SilcUInt32 tmp_len = va_arg(ap, SilcUInt32); + + if (!process) + break; + + if (x && tmp_len) { + FORMAT_HAS_SPACE(stack, dst, tmp_len); + silc_buffer_put(dst, x, tmp_len); + silc_buffer_pull(dst, tmp_len); + } + break; + } + + case SILC_PARAM_UINT8: + { + unsigned char x = (unsigned char)va_arg(ap, int); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, 1); + silc_buffer_put(dst, &x, 1); + silc_buffer_pull(dst, 1); break; } - case SILC_BUFFER_PARAM_UI16_SHORT: + + case SILC_PARAM_UINT16: { unsigned char xf[2]; SilcUInt16 x = (SilcUInt16)va_arg(ap, int); - FORMAT_HAS_SPACE(dst, 2); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, 2); SILC_PUT16_MSB(x, xf); silc_buffer_put(dst, xf, 2); silc_buffer_pull(dst, 2); break; } - case SILC_BUFFER_PARAM_SI32_INT: + + case SILC_PARAM_UINT32: { unsigned char xf[4]; - SilcInt32 x = va_arg(ap, SilcInt32); - FORMAT_HAS_SPACE(dst, 4); + SilcUInt32 x = va_arg(ap, SilcUInt32); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, 4); SILC_PUT32_MSB(x, xf); silc_buffer_put(dst, xf, 4); silc_buffer_pull(dst, 4); break; } - case SILC_BUFFER_PARAM_UI32_INT: + + case SILC_PARAM_UINT64: + { + unsigned char xf[8]; + SilcUInt64 x = va_arg(ap, SilcUInt64); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, sizeof(SilcUInt64)); + SILC_PUT64_MSB(x, xf); + silc_buffer_put(dst, xf, sizeof(SilcUInt64)); + silc_buffer_pull(dst, sizeof(SilcUInt64)); + break; + } + + case SILC_PARAM_SINT8: + { + char x = (char)va_arg(ap, int); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, 1); + silc_buffer_put(dst, (unsigned char *)&x, 1); + silc_buffer_pull(dst, 1); + break; + } + + case SILC_PARAM_SINT16: + { + unsigned char xf[2]; + SilcInt16 x = (SilcInt16)va_arg(ap, int); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, 2); + SILC_PUT16_MSB(x, xf); + silc_buffer_put(dst, xf, 2); + silc_buffer_pull(dst, 2); + break; + } + + case SILC_PARAM_SINT32: { unsigned char xf[4]; - SilcUInt32 x = va_arg(ap, SilcUInt32); - FORMAT_HAS_SPACE(dst, 4); + SilcInt32 x = va_arg(ap, SilcInt32); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, 4); SILC_PUT32_MSB(x, xf); silc_buffer_put(dst, xf, 4); silc_buffer_pull(dst, 4); break; } - case SILC_BUFFER_PARAM_SI64_INT: + + case SILC_PARAM_SINT64: { unsigned char xf[8]; SilcInt64 x = va_arg(ap, SilcInt64); - FORMAT_HAS_SPACE(dst, sizeof(SilcInt64)); + + if (!process) + break; + + FORMAT_HAS_SPACE(stack, dst, sizeof(SilcInt64)); SILC_PUT64_MSB(x, xf); silc_buffer_put(dst, xf, sizeof(SilcInt64)); silc_buffer_pull(dst, sizeof(SilcInt64)); break; } - case SILC_BUFFER_PARAM_UI64_INT: - { - unsigned char xf[8]; - SilcUInt64 x = va_arg(ap, SilcUInt64); - FORMAT_HAS_SPACE(dst, sizeof(SilcUInt64)); - SILC_PUT64_MSB(x, xf); - silc_buffer_put(dst, xf, sizeof(SilcUInt64)); - silc_buffer_pull(dst, sizeof(SilcUInt64)); - break; - } - case SILC_BUFFER_PARAM_UI8_STRING: - case SILC_BUFFER_PARAM_UI16_STRING: - case SILC_BUFFER_PARAM_UI32_STRING: - case SILC_BUFFER_PARAM_UI8_STRING_ALLOC: - case SILC_BUFFER_PARAM_UI16_STRING_ALLOC: - case SILC_BUFFER_PARAM_UI32_STRING_ALLOC: + + case SILC_PARAM_BUFFER: + case SILC_PARAM_BUFFER | SILC_PARAM_ALLOC: { - unsigned char *x = va_arg(ap, unsigned char *); - SilcUInt32 tmp_len = strlen(x); - FORMAT_HAS_SPACE(dst, tmp_len); - silc_buffer_put(dst, x, tmp_len); - silc_buffer_pull(dst, tmp_len); - break; + SilcBuffer x = va_arg(ap, SilcBuffer); + unsigned char xf[4]; + + if (!process) + break; + + if (x && silc_buffer_len(x)) { + FORMAT_HAS_SPACE(stack, dst, silc_buffer_len(x) + 4); + SILC_PUT32_MSB(silc_buffer_len(x), xf); + silc_buffer_put(dst, xf, 4); + silc_buffer_pull(dst, 4); + silc_buffer_put(dst, silc_buffer_data(x), silc_buffer_len(x)); + silc_buffer_pull(dst, silc_buffer_len(x)); + } } - case SILC_BUFFER_PARAM_UI8_NSTRING: - case SILC_BUFFER_PARAM_UI16_NSTRING: - case SILC_BUFFER_PARAM_UI32_NSTRING: - case SILC_BUFFER_PARAM_UI_XNSTRING: - case SILC_BUFFER_PARAM_UI8_NSTRING_ALLOC: - case SILC_BUFFER_PARAM_UI16_NSTRING_ALLOC: - case SILC_BUFFER_PARAM_UI32_NSTRING_ALLOC: - case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC: + break; + + case SILC_PARAM_OFFSET: { - unsigned char *x = va_arg(ap, unsigned char *); - SilcUInt32 len = va_arg(ap, SilcUInt32); - if (x && len) { - FORMAT_HAS_SPACE(dst, len); - silc_buffer_put(dst, x, len); - silc_buffer_pull(dst, len); + int offst = va_arg(ap, int); + + if (!process) + break; + + if (!offst) + break; + + if (offst > 1) { + if (offst > silc_buffer_len(dst)) { + silc_set_errno(SILC_ERR_OVERFLOW); + goto fail; + } + silc_buffer_pull(dst, offst); + flen += offst; + } else { + silc_buffer_push(dst, -(offst)); + flen += -(offst); } break; } - case SILC_BUFFER_PARAM_END: + + case SILC_PARAM_OFFSET_START: + if (!process) + break; + if (!silc_buffer_push(dst, flen)) + goto fail; + flen = 0; + break; + + case SILC_PARAM_OFFSET_END: + if (!process) + break; + flen += silc_buffer_len(dst); + silc_buffer_pull(dst, silc_buffer_len(dst)); + break; + + case SILC_PARAM_ADVANCE: + if (!process) + break; + advance = TRUE; + break; + + case SILC_PARAM_END: goto ok; break; + default: SILC_LOG_DEBUG(("Bad buffer formatting type `%d'. Could not " "format the data.", fmt)); + silc_set_errno_reason(SILC_ERR_INVALID_ARGUMENT, + "Bad buffer formatting type %d", fmt); goto fail; break; } @@ -188,355 +449,789 @@ int silc_buffer_format_vp(SilcBuffer dst, va_list ap) fail: SILC_LOG_DEBUG(("Error occured while formatting data")); - len = dst->data - start_ptr; - silc_buffer_push(dst, len); + if (process && !advance) + silc_buffer_push(dst, flen); return -1; ok: /* Push the buffer back to where it belongs. */ - len = dst->data - start_ptr; - silc_buffer_push(dst, len); - return len; + if (process && !advance) + silc_buffer_push(dst, flen); + return flen; } -/* Unformats the buffer sent as argument. The unformatted data is returned - to the variable argument list of pointers. The buffer must point to the - start of the data area to be unformatted. Buffer maybe be safely free'd - after this returns succesfully. */ +int silc_buffer_format(SilcBuffer dst, ...) +{ + va_list ap; + int ret; -int silc_buffer_unformat(SilcBuffer src, ...) + va_start(ap, dst); + ret = silc_buffer_sformat_vp(NULL, dst, ap); + va_end(ap); + + return ret; +} + +int silc_buffer_format_vp(SilcBuffer dst, va_list ap) +{ + return silc_buffer_sformat_vp(NULL, dst, ap); +} + +int silc_buffer_sformat(SilcStack stack, SilcBuffer dst, ...) { va_list ap; int ret; - va_start(ap, src); - ret = silc_buffer_unformat_vp(src, ap); + va_start(ap, dst); + ret = silc_buffer_sformat_vp(stack, dst, ap); va_end(ap); return ret; } -int silc_buffer_unformat_vp(SilcBuffer src, va_list ap) +int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) +{ + return silc_buffer_sformat_vp_i(stack, dst, ap, TRUE); +} + +/****************************** Unformatting ********************************/ + +int silc_buffer_sunformat_vp_i(SilcStack stack, SilcBuffer src, va_list ap, + SilcBool process) { - SilcBufferParamType fmt; + SilcParam fmt; unsigned char *start_ptr = src->data; int len = 0; + SilcBool advance = FALSE; /* Parse the arguments by formatting type. */ - while(1) { - fmt = va_arg(ap, SilcBufferParamType); + while (1) { + fmt = va_arg(ap, SilcParam); - switch(fmt) { - case SILC_BUFFER_PARAM_SI8_CHAR: + SILC_LOG_DEBUG(("Buffer unformat type %d", fmt)); + + switch (fmt) { + case SILC_PARAM_FUNC: { - char *x = va_arg(ap, char *); - UNFORMAT_HAS_SPACE(src, 1); - if (x) - *x = src->data[0]; - silc_buffer_pull(src, 1); + SilcBufferUnformatFunc func; + void **val; + void *context; + int tmp_len; + func = va_arg(ap, SilcBufferUnformatFunc); + val = va_arg(ap, void **); + context = va_arg(ap, void *); + + if (!process) + break; + + tmp_len = func(stack, src, val, context); + if (tmp_len < 0) + goto fail; + if (tmp_len) { + UNFORMAT_HAS_SPACE(src, tmp_len); + silc_buffer_pull(src, tmp_len); + } + } + break; + + case SILC_PARAM_REGEX: + { + const char *regex = va_arg(ap, char *); + SilcBufferRegexFlags rflags = va_arg(ap, SilcUInt32); + SilcBufferStruct match, saved; + SilcBool match_all = (rflags & SILC_STR_REGEX_ALL) != 0; + SilcBool match_nl = (rflags & SILC_STR_REGEX_NL) != 0; + SilcBool ret; + SilcUInt32 inclusive_pos = 0; + int matched = 0, ret_len; + va_list cp; + + if (!process) + break; + + if (!regex) + goto fail; + + memset(&saved, 0, sizeof(saved)); + + if (match_nl) { + start_nl_match: + /* Match for '\n' in the buffer. If not found, treat as line + without '\n' (buffer has only one line, or this is last line). */ + saved = *src; + if (silc_regex_buffer(src, "\n", &match, NULL)) + src->tail = match.tail; + } + + start_match: + /* Match */ + ret = silc_regex_buffer(src, regex, &match, NULL); + ret ^= (rflags & SILC_STR_REGEX_NOT) != 0; + if (!ret) { + if (!matched && rflags & SILC_STR_REGEX_MISMATCH) { + silc_set_errno(SILC_ERR_NOT_FOUND); + goto fail; + } + goto end_match; + } + matched++; + + if (rflags & SILC_STR_REGEX_NOT) + match = *src; + + if (!(rflags & SILC_STR_REGEX_NO_ADVANCE)) { + /* Advance buffer after match */ + UNFORMAT_HAS_SPACE(src, (match.data - src->data)); + if (!silc_buffer_pull(src, (match.data - src->data))) + goto fail; + } + + if (rflags & SILC_STR_REGEX_INCLUSIVE) { + inclusive_pos = src->tail - match.tail; + src->tail = match.tail; + } + + /* Recursively format */ + silc_va_copy(cp, ap); + ret_len = silc_buffer_sunformat_vp_i(stack, src, cp, TRUE); + va_end(cp); + if (ret_len < 0) + goto fail; + + if (rflags & SILC_STR_REGEX_INCLUSIVE) + if (!silc_buffer_pull_tail(src, inclusive_pos)) + goto fail; + + /* Advance buffer after formatting */ + UNFORMAT_HAS_SPACE(src, ret_len); + if (!silc_buffer_pull(src, ret_len)) + goto fail; + + if (match_all && (!match_nl || silc_buffer_len(src) > 1)) + goto start_match; + + end_match: + if (match_nl) { + /* Go to next line, it is at the end of the data area. Adjust + the tail area of the target buffer to show rest of the buffer. */ + UNFORMAT_HAS_SPACE(src, src->tail - src->data); + if (!silc_buffer_pull(src, (src->tail - src->data))) + goto fail; + if (!silc_buffer_pull_tail(src, (saved.tail - src->tail))) + goto fail; + + if (silc_buffer_len(src) > 0) + goto start_nl_match; + } + + /* Skip to the next SILC_PARAM_END */ + silc_buffer_sunformat_vp_i(NULL, src, ap, FALSE); + } + break; + + case SILC_PARAM_UICHAR: + { + unsigned char **x = va_arg(ap, unsigned char **); + SilcUInt32 len2 = va_arg(ap, SilcUInt32); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, len2); + if (silc_likely(len2 && x)) + *x = src->data; + silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI8_CHAR: + + case SILC_PARAM_UICHAR | SILC_PARAM_ALLOC: + { + unsigned char **x = va_arg(ap, unsigned char **); + SilcUInt32 len2 = va_arg(ap, SilcUInt32); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, len2); + if (silc_likely(len2 && x)) { + *x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char)); + memcpy(*x, src->data, len2); + } + silc_buffer_pull(src, len2); + break; + } + + case SILC_PARAM_UINT8: { unsigned char *x = va_arg(ap, unsigned char *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 1); - if (x) + if (silc_likely(x)) *x = src->data[0]; silc_buffer_pull(src, 1); break; } - case SILC_BUFFER_PARAM_SI16_SHORT: - { - SilcInt16 *x = va_arg(ap, SilcInt16 *); - UNFORMAT_HAS_SPACE(src, 2); - if (x) - SILC_GET16_MSB(*x, src->data); - silc_buffer_pull(src, 2); - break; - } - case SILC_BUFFER_PARAM_UI16_SHORT: + + case SILC_PARAM_UINT16: { SilcUInt16 *x = va_arg(ap, SilcUInt16 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 2); - if (x) + if (silc_likely(x)) SILC_GET16_MSB(*x, src->data); silc_buffer_pull(src, 2); break; } - case SILC_BUFFER_PARAM_SI32_INT: + + case SILC_PARAM_UINT32: { - SilcInt32 *x = va_arg(ap, SilcInt32 *); + SilcUInt32 *x = va_arg(ap, SilcUInt32 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 4); - if (x) + if (silc_likely(x)) SILC_GET32_MSB(*x, src->data); silc_buffer_pull(src, 4); break; } - case SILC_BUFFER_PARAM_UI32_INT: + + case SILC_PARAM_UINT64: { - SilcUInt32 *x = va_arg(ap, SilcUInt32 *); + SilcUInt64 *x = va_arg(ap, SilcUInt64 *); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, sizeof(SilcUInt64)); + if (silc_likely(x)) + SILC_GET64_MSB(*x, src->data); + silc_buffer_pull(src, sizeof(SilcUInt64)); + break; + } + + case SILC_PARAM_SINT8: + { + char *x = va_arg(ap, char *); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, 1); + if (silc_likely(x)) + *x = src->data[0]; + silc_buffer_pull(src, 1); + break; + } + + case SILC_PARAM_SINT16: + { + SilcInt16 *x = va_arg(ap, SilcInt16 *); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, 2); + if (silc_likely(x)) + SILC_GET16_MSB(*x, src->data); + silc_buffer_pull(src, 2); + break; + } + + case SILC_PARAM_SINT32: + { + SilcInt32 *x = va_arg(ap, SilcInt32 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 4); - if (x) + if (silc_likely(x)) SILC_GET32_MSB(*x, src->data); silc_buffer_pull(src, 4); break; } - case SILC_BUFFER_PARAM_SI64_INT: + + case SILC_PARAM_SINT64: { SilcInt64 *x = va_arg(ap, SilcInt64 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, sizeof(SilcInt64)); - if (x) + if (silc_likely(x)) SILC_GET64_MSB(*x, src->data); silc_buffer_pull(src, sizeof(SilcInt64)); break; } - case SILC_BUFFER_PARAM_UI64_INT: + + case SILC_PARAM_UI8_STRING: { - SilcUInt64 *x = va_arg(ap, SilcUInt64 *); - UNFORMAT_HAS_SPACE(src, sizeof(SilcUInt64)); - if (x) - SILC_GET64_MSB(*x, src->data); - silc_buffer_pull(src, sizeof(SilcUInt64)); + SilcUInt8 len2; + unsigned char **x = va_arg(ap, unsigned char **); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, 1); + len2 = (SilcUInt8)src->data[0]; + silc_buffer_pull(src, 1); + UNFORMAT_HAS_SPACE(src, len2); + if (silc_likely(x)) + *x = src->data; + silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI8_STRING: + + case SILC_PARAM_UI8_STRING | SILC_PARAM_ALLOC: { SilcUInt8 len2; unsigned char **x = va_arg(ap, unsigned char **); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 1); len2 = (SilcUInt8)src->data[0]; silc_buffer_pull(src, 1); UNFORMAT_HAS_SPACE(src, len2); - if (x) - *x = src->data; + if (silc_likely(x && len2)) { + *x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char)); + memcpy(*x, src->data, len2); + } silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI16_STRING: + + case SILC_PARAM_UI16_STRING: { SilcUInt16 len2; unsigned char **x = va_arg(ap, unsigned char **); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 2); SILC_GET16_MSB(len2, src->data); silc_buffer_pull(src, 2); UNFORMAT_HAS_SPACE(src, len2); - if (x) + if (silc_likely(x)) *x = src->data; silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI8_STRING_ALLOC: - { - SilcUInt8 len2; - unsigned char **x = va_arg(ap, unsigned char **); - UNFORMAT_HAS_SPACE(src, 1); - len2 = (SilcUInt8)src->data[0]; - silc_buffer_pull(src, 1); - UNFORMAT_HAS_SPACE(src, len2); - if (x && len2) { - *x = silc_calloc(len2 + 1, sizeof(unsigned char)); - memcpy(*x, src->data, len2); - } - silc_buffer_pull(src, len2); - break; - } - case SILC_BUFFER_PARAM_UI16_STRING_ALLOC: + + case SILC_PARAM_UI16_STRING | SILC_PARAM_ALLOC: { SilcUInt16 len2; unsigned char **x = va_arg(ap, unsigned char **); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 2); SILC_GET16_MSB(len2, src->data); silc_buffer_pull(src, 2); UNFORMAT_HAS_SPACE(src, len2); - if (x && len2) { - *x = silc_calloc(len2 + 1, sizeof(unsigned char)); + if (silc_likely(x && len2)) { + *x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char)); memcpy(*x, src->data, len2); } silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI32_STRING: + + case SILC_PARAM_UI32_STRING: { SilcUInt32 len2; unsigned char **x = va_arg(ap, unsigned char **); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 4); SILC_GET32_MSB(len2, src->data); silc_buffer_pull(src, 4); UNFORMAT_HAS_SPACE(src, len2); - if (x) + if (silc_likely(x)) *x = src->data; silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI32_STRING_ALLOC: + + case SILC_PARAM_UI32_STRING | SILC_PARAM_ALLOC: { SilcUInt32 len2; unsigned char **x = va_arg(ap, unsigned char **); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 4); SILC_GET32_MSB(len2, src->data); silc_buffer_pull(src, 4); UNFORMAT_HAS_SPACE(src, len2); - if (x && len2) { - *x = silc_calloc(len2 + 1, sizeof(unsigned char)); + if (silc_likely(x && len2)) { + *x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char)); memcpy(*x, src->data, len2); } silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI8_NSTRING: + + case SILC_PARAM_UI8_NSTRING: { SilcUInt8 len2; unsigned char **x = va_arg(ap, unsigned char **); - SilcUInt8 *len = va_arg(ap, SilcUInt8 *); + SilcUInt8 *len3 = va_arg(ap, SilcUInt8 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 1); len2 = (SilcUInt8)src->data[0]; silc_buffer_pull(src, 1); UNFORMAT_HAS_SPACE(src, len2); - if (len) - *len = len2; + if (len3) + *len3 = len2; if (x) *x = src->data; silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI16_NSTRING: - { - SilcUInt16 len2; - unsigned char **x = va_arg(ap, unsigned char **); - SilcUInt16 *len = va_arg(ap, SilcUInt16 *); - UNFORMAT_HAS_SPACE(src, 2); - SILC_GET16_MSB(len2, src->data); - silc_buffer_pull(src, 2); - UNFORMAT_HAS_SPACE(src, len2); - if (len) - *len = len2; - if (x) - *x = src->data; - silc_buffer_pull(src, len2); - break; - } - case SILC_BUFFER_PARAM_UI8_NSTRING_ALLOC: + + case SILC_PARAM_UI8_NSTRING | SILC_PARAM_ALLOC: { SilcUInt8 len2; unsigned char **x = va_arg(ap, unsigned char **); - SilcUInt8 *len = va_arg(ap, SilcUInt8 *); + SilcUInt8 *len3 = va_arg(ap, SilcUInt8 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 1); len2 = (SilcUInt8)src->data[0]; silc_buffer_pull(src, 1); UNFORMAT_HAS_SPACE(src, len2); - if (len) - *len = len2; + if (len3) + *len3 = len2; if (x && len2) { - *x = silc_calloc(len2 + 1, sizeof(unsigned char)); + *x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char)); memcpy(*x, src->data, len2); } silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI16_NSTRING_ALLOC: + + case SILC_PARAM_UI16_NSTRING: + { + SilcUInt16 len2; + unsigned char **x = va_arg(ap, unsigned char **); + SilcUInt16 *len3 = va_arg(ap, SilcUInt16 *); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, 2); + SILC_GET16_MSB(len2, src->data); + silc_buffer_pull(src, 2); + UNFORMAT_HAS_SPACE(src, len2); + if (len3) + *len3 = len2; + if (x) + *x = src->data; + silc_buffer_pull(src, len2); + break; + } + + case SILC_PARAM_UI16_NSTRING | SILC_PARAM_ALLOC: { SilcUInt16 len2; unsigned char **x = va_arg(ap, unsigned char **); - SilcUInt16 *len = va_arg(ap, SilcUInt16 *); + SilcUInt16 *len3 = va_arg(ap, SilcUInt16 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 2); SILC_GET16_MSB(len2, src->data); silc_buffer_pull(src, 2); UNFORMAT_HAS_SPACE(src, len2); - if (len) - *len = len2; + if (len3) + *len3 = len2; if (x && len2) { - *x = silc_calloc(len2 + 1, sizeof(unsigned char)); + *x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char)); memcpy(*x, src->data, len2); } silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI32_NSTRING: + + case SILC_PARAM_UI32_NSTRING: { SilcUInt32 len2; unsigned char **x = va_arg(ap, unsigned char **); - SilcUInt32 *len = va_arg(ap, SilcUInt32 *); + SilcUInt32 *len3 = va_arg(ap, SilcUInt32 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 4); SILC_GET32_MSB(len2, src->data); silc_buffer_pull(src, 4); UNFORMAT_HAS_SPACE(src, len2); - if (len) - *len = len2; + if (len3) + *len3 = len2; if (x) *x = src->data; silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI_XNSTRING: + + case SILC_PARAM_UI32_NSTRING | SILC_PARAM_ALLOC: { + SilcUInt32 len2; unsigned char **x = va_arg(ap, unsigned char **); - SilcUInt32 len = va_arg(ap, SilcUInt32); - UNFORMAT_HAS_SPACE(src, len); - if (len && x) - *x = src->data; - silc_buffer_pull(src, len); + SilcUInt32 *len3 = va_arg(ap, SilcUInt32 *); + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, 4); + SILC_GET32_MSB(len2, src->data); + silc_buffer_pull(src, 4); + UNFORMAT_HAS_SPACE(src, len2); + if (len3) + *len3 = len2; + if (silc_likely(x && len2)) { + *x = silc_scalloc(stack, len2 + 1, sizeof(unsigned char)); + memcpy(*x, src->data, len2); + } + silc_buffer_pull(src, len2); break; } - case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC: + + case SILC_PARAM_BUFFER: { - unsigned char **x = va_arg(ap, unsigned char **); - SilcUInt32 len = va_arg(ap, SilcUInt32); - UNFORMAT_HAS_SPACE(src, len); - if (len && x) { - *x = silc_calloc(len + 1, sizeof(unsigned char)); - memcpy(*x, src->data, len); + SilcBuffer x = va_arg(ap, SilcBuffer); + SilcUInt32 len2; + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, 4); + SILC_GET32_MSB(len2, src->data); + silc_buffer_pull(src, 4); + UNFORMAT_HAS_SPACE(src, len2); + silc_buffer_set(x, src->data, len2); + silc_buffer_pull(src, len2); + } + break; + + case SILC_PARAM_BUFFER | SILC_PARAM_ALLOC: + { + SilcBuffer x = va_arg(ap, SilcBuffer); + SilcUInt32 len2; + + if (!process) + break; + + UNFORMAT_HAS_SPACE(src, 4); + SILC_GET32_MSB(len2, src->data); + silc_buffer_pull(src, 4); + UNFORMAT_HAS_SPACE(src, len2); + silc_buffer_sformat(stack, x, + SILC_STR_DATA(src->data, len2), + SILC_STR_END); + silc_buffer_pull(src, len2); + } + break; + + case SILC_PARAM_OFFSET: + { + int offst = va_arg(ap, int); + + if (!process) + break; + + if (!offst) + break; + + if (offst > 1) { + UNFORMAT_HAS_SPACE(src, offst); + silc_buffer_pull(src, offst); + } else { + silc_buffer_push(src, -(offst)); } - silc_buffer_pull(src, len); break; } - case SILC_BUFFER_PARAM_END: + + case SILC_PARAM_OFFSET_START: + if (!process) + break; + silc_buffer_push(src, (src->data - start_ptr)); + break; + + case SILC_PARAM_OFFSET_END: + if (!process) + break; + silc_buffer_pull(src, silc_buffer_len(src)); + break; + + case SILC_PARAM_ADVANCE: + if (!process) + break; + advance = TRUE; + break; + + case SILC_PARAM_END: goto ok; break; + default: SILC_LOG_DEBUG(("Bad buffer formatting type `%d'. Could not " "format the data.", fmt)); + silc_set_errno_reason(SILC_ERR_INVALID_ARGUMENT, + "Bad buffer formatting type %d", fmt); goto fail; break; } } fail: - SILC_LOG_DEBUG(("Error occured while unformatting buffer")); - len = src->data - start_ptr; - silc_buffer_push(src, len); + SILC_LOG_DEBUG(("Error occured while unformatting buffer, type %d", fmt)); + if (process && !advance) { + len = src->data - start_ptr; + silc_buffer_push(src, len); + } return -1; ok: /* Push the buffer back to the start. */ - len = src->data - start_ptr; - silc_buffer_push(src, len); + if (process && !advance) { + len = src->data - start_ptr; + silc_buffer_push(src, len); + } return len; } +int silc_buffer_unformat(SilcBuffer src, ...) +{ + va_list ap; + int ret; + + va_start(ap, src); + ret = silc_buffer_sunformat_vp(NULL, src, ap); + va_end(ap); + + return ret; +} + +int silc_buffer_unformat_vp(SilcBuffer src, va_list ap) +{ + return silc_buffer_sunformat_vp(NULL, src, ap); +} + +int silc_buffer_sunformat(SilcStack stack, SilcBuffer src, ...) +{ + va_list ap; + int ret; + + va_start(ap, src); + ret = silc_buffer_sunformat_vp(stack, src, ap); + va_end(ap); + + return ret; +} + +int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) +{ + return silc_buffer_sunformat_vp_i(stack, src, ap, TRUE); +} + +/**************************** Utility functions *****************************/ + /* Formats strings into a buffer */ int silc_buffer_strformat(SilcBuffer dst, ...) { - int len = dst->truelen; + int len = silc_buffer_truelen(dst); + int hlen = silc_buffer_headlen(dst); + va_list va; + + va_start(va, dst); + + /* Parse the arguments by formatting type. */ + while(1) { + char *string = va_arg(va, char *); + unsigned char *d; + SilcInt32 slen; + + if (!string) + continue; + if (string == (char *)SILC_PARAM_END) + goto ok; + + slen = strlen(string); + d = silc_realloc(dst->head, sizeof(*dst->head) * (slen + len + 1)); + if (silc_unlikely(!d)) + return -1; + dst->head = d; + memcpy(dst->head + len, string, slen); + len += slen; + dst->head[len] = '\0'; + } + + SILC_LOG_DEBUG(("Error occured while formatting buffer")); + va_end(va); + return -1; + + ok: + dst->end = dst->head + len; + dst->data = dst->head + hlen; + dst->tail = dst->end; + + va_end(va); + return len; +} + +/* Formats strings into a buffer. Allocates memory from SilcStack. */ + +int silc_buffer_sstrformat(SilcStack stack, SilcBuffer dst, ...) +{ + int len = silc_buffer_truelen(dst); + int hlen = silc_buffer_headlen(dst); va_list va; va_start(va, dst); /* Parse the arguments by formatting type. */ while(1) { - char *string = (char *)va_arg(va, void *); + char *string = va_arg(va, char *); + unsigned char *d; + SilcInt32 slen; if (!string) continue; - if (string == (char *)SILC_BUFFER_PARAM_END) + if (string == (char *)SILC_PARAM_END) goto ok; - dst->head = silc_realloc(dst->head, sizeof(*dst->head) * - (strlen(string) + len + 1)); - if (!dst->head) + slen = strlen(string); + d = silc_srealloc(stack, len + 1, dst->head, + sizeof(*dst->head) * (slen + len + 1)); + if (silc_unlikely(!d)) return -1; - memcpy(dst->head + len, string, strlen(string)); - len += strlen(string); + dst->head = d; + memcpy(dst->head + len, string, slen); + len += slen; dst->head[len] = '\0'; } @@ -546,9 +1241,8 @@ int silc_buffer_strformat(SilcBuffer dst, ...) ok: dst->end = dst->head + len; - dst->data = dst->head; + dst->data = dst->head + hlen; dst->tail = dst->end; - dst->len = dst->truelen = len; va_end(va); return len;