X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcbuffmt.c;h=366c4478fa9d84eecaa579c2ac4a5ab76c2998cb;hp=b0c5d5c5beb8dfa110eb2eef704902daa205dfed;hb=f2462c5dd7e885e3daa00066fbf53e166fd361e0;hpb=c8fd78a59002c54dbc331a26839d042055e89d65 diff --git a/lib/silcutil/silcbuffmt.c b/lib/silcutil/silcbuffmt.c index b0c5d5c5..366c4478 100644 --- a/lib/silcutil/silcbuffmt.c +++ b/lib/silcutil/silcbuffmt.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2007 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 @@ -47,36 +47,8 @@ do { \ /******************************* Formatting *********************************/ -int silc_buffer_format(SilcBuffer dst, ...) -{ - va_list ap; - int ret; - - 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, dst); - ret = silc_buffer_sformat_vp(stack, dst, ap); - va_end(ap); - - return ret; -} - -int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) +int silc_buffer_sformat_vp_i(SilcStack stack, SilcBuffer dst, va_list ap, + SilcBool process) { SilcParam fmt; int flen = 0; @@ -86,7 +58,7 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) while (1) { fmt = va_arg(ap, SilcParam); - SILC_LOG_DEBUG(("Buffer format type %x", fmt)); + SILC_LOG_DEBUG(("Buffer format type %d", fmt)); switch (fmt) { case SILC_PARAM_FUNC: @@ -95,9 +67,14 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) 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; @@ -107,6 +84,101 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) } } 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; + unsigned char *saved_incl = NULL; + 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) { + saved_incl = dst->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) + dst->tail = saved_incl; + + /* 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_PARAM_UI8_STRING: case SILC_PARAM_UI16_STRING: case SILC_PARAM_UI32_STRING: @@ -116,6 +188,10 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) { 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, (unsigned char *)x, tmp_len); @@ -123,6 +199,7 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) } break; } + case SILC_PARAM_UI8_NSTRING: case SILC_PARAM_UI16_NSTRING: case SILC_PARAM_UI32_NSTRING: @@ -134,6 +211,10 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) { 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); @@ -141,87 +222,132 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) } 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_PARAM_UINT16: { unsigned char xf[2]; SilcUInt16 x = (SilcUInt16)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_UINT32: { unsigned char xf[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_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]; 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_PARAM_SINT64: { unsigned char xf[8]; SilcInt64 x = va_arg(ap, 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_PARAM_BUFFER: case SILC_PARAM_BUFFER | SILC_PARAM_ALLOC: { 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); @@ -232,11 +358,17 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) } } break; + case SILC_PARAM_OFFSET: { 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); @@ -250,12 +382,32 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) } break; } + + 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)); @@ -268,50 +420,55 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) fail: SILC_LOG_DEBUG(("Error occured while formatting data")); - if (!advance) + if (process && !advance) silc_buffer_push(dst, flen); return -1; ok: /* Push the buffer back to where it belongs. */ - if (!advance) + if (process && !advance) silc_buffer_push(dst, flen); return flen; } - -/****************************** Unformatting ********************************/ - -int silc_buffer_unformat(SilcBuffer src, ...) +int silc_buffer_format(SilcBuffer dst, ...) { va_list ap; int ret; - va_start(ap, src); - ret = silc_buffer_sunformat_vp(NULL, src, ap); + va_start(ap, dst); + ret = silc_buffer_sformat_vp(NULL, dst, ap); va_end(ap); return ret; } -int silc_buffer_unformat_vp(SilcBuffer src, va_list ap) +int silc_buffer_format_vp(SilcBuffer dst, va_list ap) { - return silc_buffer_sunformat_vp(NULL, src, ap); + return silc_buffer_sformat_vp(NULL, dst, ap); } -int silc_buffer_sunformat(SilcStack stack, SilcBuffer src, ...) +int silc_buffer_sformat(SilcStack stack, SilcBuffer dst, ...) { va_list ap; int ret; - va_start(ap, src); - ret = silc_buffer_sunformat_vp(stack, src, ap); + va_start(ap, dst); + ret = silc_buffer_sformat_vp(stack, dst, ap); va_end(ap); return ret; } -int silc_buffer_sunformat_vp(SilcStack stack, 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) { SilcParam fmt; unsigned char *start_ptr = src->data; @@ -322,7 +479,7 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) while (1) { fmt = va_arg(ap, SilcParam); - SILC_LOG_DEBUG(("Buffer unformat type %x", fmt)); + SILC_LOG_DEBUG(("Buffer unformat type %d", fmt)); switch (fmt) { case SILC_PARAM_FUNC: @@ -334,6 +491,10 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) 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; @@ -342,20 +503,125 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) 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; + unsigned char *saved_incl = NULL; + 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) { + saved_incl = src->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) + src->tail = saved_incl; + + /* 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_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)); @@ -364,82 +630,127 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) 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 (silc_likely(x)) *x = src->data[0]; silc_buffer_pull(src, 1); break; } + case SILC_PARAM_UINT16: { SilcUInt16 *x = va_arg(ap, SilcUInt16 *); + + 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_UINT32: { SilcUInt32 *x = va_arg(ap, SilcUInt32 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 4); if (silc_likely(x)) SILC_GET32_MSB(*x, src->data); silc_buffer_pull(src, 4); break; } + case SILC_PARAM_UINT64: { 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 (silc_likely(x)) SILC_GET32_MSB(*x, src->data); silc_buffer_pull(src, 4); break; } + case SILC_PARAM_SINT64: { SilcInt64 *x = va_arg(ap, SilcInt64 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, sizeof(SilcInt64)); if (silc_likely(x)) SILC_GET64_MSB(*x, src->data); silc_buffer_pull(src, sizeof(SilcInt64)); break; } + case SILC_PARAM_UI8_STRING: { 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); @@ -449,10 +760,15 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + 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); @@ -464,10 +780,15 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + 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); @@ -477,10 +798,15 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + 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); @@ -492,10 +818,15 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + 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); @@ -505,10 +836,15 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + 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); @@ -520,11 +856,16 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + case SILC_PARAM_UI8_NSTRING: { SilcUInt8 len2; unsigned char **x = va_arg(ap, unsigned char **); SilcUInt8 *len3 = va_arg(ap, SilcUInt8 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 1); len2 = (SilcUInt8)src->data[0]; silc_buffer_pull(src, 1); @@ -536,11 +877,16 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + case SILC_PARAM_UI8_NSTRING | SILC_PARAM_ALLOC: { SilcUInt8 len2; unsigned char **x = va_arg(ap, unsigned char **); SilcUInt8 *len3 = va_arg(ap, SilcUInt8 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 1); len2 = (SilcUInt8)src->data[0]; silc_buffer_pull(src, 1); @@ -554,11 +900,16 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + 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); @@ -570,11 +921,16 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) 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 *len3 = va_arg(ap, SilcUInt16 *); + + if (!process) + break; + UNFORMAT_HAS_SPACE(src, 2); SILC_GET16_MSB(len2, src->data); silc_buffer_pull(src, 2); @@ -588,11 +944,16 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + case SILC_PARAM_UI32_NSTRING: { SilcUInt32 len2; unsigned char **x = va_arg(ap, unsigned char **); 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); @@ -604,11 +965,16 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + case SILC_PARAM_UI32_NSTRING | SILC_PARAM_ALLOC: { SilcUInt32 len2; unsigned char **x = va_arg(ap, unsigned char **); 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); @@ -622,10 +988,15 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) silc_buffer_pull(src, len2); break; } + case SILC_PARAM_BUFFER: { 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); @@ -634,10 +1005,15 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) 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); @@ -648,11 +1024,17 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) 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); @@ -661,12 +1043,29 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) } break; } + + 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)); @@ -679,19 +1078,54 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) fail: SILC_LOG_DEBUG(("Error occured while unformatting buffer, type %d", fmt)); - len = src->data - start_ptr; - silc_buffer_push(src, len); + if (process && !advance) { + len = src->data - start_ptr; + silc_buffer_push(src, len); + } return -1; ok: /* Push the buffer back to the start. */ - if (!advance) { + 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 *****************************/