GNU General Public License for more details.
*/
-/* XXX: These routines needs to be made more stable as these can crash
- if the data (for unformatting for example) is malformed or the buffer
- is too short. Must be fixed. There are some other obvious bugs as
- well. */
-/*
- * $Id$
- * $Log$
- * Revision 1.1 2000/09/13 17:45:16 priikone
- * Splitted SILC core library. Core library includes now only
- * SILC protocol specific stuff. New utility library includes the
- * old stuff from core library that is more generic purpose stuff.
- *
- * Revision 1.2 2000/07/05 06:06:35 priikone
- * Global cosmetic change.
- *
- * Revision 1.1.1.1 2000/06/27 11:36:55 priikone
- * Imported from internal CVS/Added Log headers.
- *
- *
- */
+/* $Id$ */
#include "silcincludes.h"
+/* Macro 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 HAS_SPACE(x, req) \
+do { \
+ if (req > (x)->len) \
+ 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
int silc_buffer_format(SilcBuffer dst, ...)
{
va_list ap;
- SilcBufferParamType fmt;
- unsigned char *start_ptr = dst->data;
+ int ret;
va_start(ap, dst);
+ ret = silc_buffer_format_vp(dst, ap);
+ va_end(ap);
+
+ return ret;
+}
+
+int silc_buffer_format_vp(SilcBuffer dst, va_list ap)
+{
+ SilcBufferParamType fmt;
+ unsigned char *start_ptr = dst->data;
+ int len;
/* Parse the arguments by formatting type. */
while(1) {
switch(fmt) {
case SILC_BUFFER_PARAM_SI8_CHAR:
{
- char x = va_arg(ap, char);
+ char x = (char)va_arg(ap, int);
+ HAS_SPACE(dst, 1);
silc_buffer_put(dst, &x, 1);
silc_buffer_pull(dst, 1);
break;
}
case SILC_BUFFER_PARAM_UI8_CHAR:
{
- unsigned char x = va_arg(ap, unsigned char);
+ unsigned char x = (unsigned char)va_arg(ap, int);
+ HAS_SPACE(dst, 1);
silc_buffer_put(dst, &x, 1);
silc_buffer_pull(dst, 1);
break;
case SILC_BUFFER_PARAM_SI16_SHORT:
{
unsigned char xf[2];
- short x = va_arg(ap, short);
+ int16 x = (int16)va_arg(ap, int);
+ HAS_SPACE(dst, 2);
SILC_PUT16_MSB(x, xf);
silc_buffer_put(dst, xf, 2);
silc_buffer_pull(dst, 2);
case SILC_BUFFER_PARAM_UI16_SHORT:
{
unsigned char xf[2];
- unsigned short x = va_arg(ap, unsigned short);
+ uint16 x = (uint16)va_arg(ap, int);
+ HAS_SPACE(dst, 2);
SILC_PUT16_MSB(x, xf);
silc_buffer_put(dst, xf, 2);
silc_buffer_pull(dst, 2);
case SILC_BUFFER_PARAM_SI32_INT:
{
unsigned char xf[4];
- int x = va_arg(ap, int);
+ int32 x = va_arg(ap, int32);
+ HAS_SPACE(dst, 4);
SILC_PUT32_MSB(x, xf);
silc_buffer_put(dst, xf, 4);
silc_buffer_pull(dst, 4);
case SILC_BUFFER_PARAM_UI32_INT:
{
unsigned char xf[4];
- unsigned int x = va_arg(ap, unsigned int);
+ uint32 x = va_arg(ap, uint32);
+ HAS_SPACE(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:
+ {
+ unsigned char xf[8];
+ int64 x = va_arg(ap, int64);
+ HAS_SPACE(dst, 8);
+ SILC_PUT64_MSB(x, xf);
+ silc_buffer_put(dst, xf, 8);
+ silc_buffer_pull(dst, 8);
+ break;
+ }
+ case SILC_BUFFER_PARAM_UI64_INT:
+ {
+ unsigned char xf[8];
+ uint64 x = va_arg(ap, uint64);
+ HAS_SPACE(dst, 8);
+ SILC_PUT64_MSB(x, xf);
+ silc_buffer_put(dst, xf, 8);
+ silc_buffer_pull(dst, 8);
+ break;
+ }
case SILC_BUFFER_PARAM_UI16_STRING:
case SILC_BUFFER_PARAM_UI32_STRING:
case SILC_BUFFER_PARAM_UI16_STRING_ALLOC:
case SILC_BUFFER_PARAM_UI32_STRING_ALLOC:
{
unsigned char *x = va_arg(ap, unsigned char *);
- silc_buffer_put(dst, x, strlen(x));
- silc_buffer_pull(dst, strlen(x));
+ uint32 tmp_len = strlen(x);
+ HAS_SPACE(dst, tmp_len);
+ silc_buffer_put(dst, x, tmp_len);
+ silc_buffer_pull(dst, tmp_len);
break;
}
case SILC_BUFFER_PARAM_UI16_NSTRING:
case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC:
{
unsigned char *x = va_arg(ap, unsigned char *);
- unsigned int len = va_arg(ap, unsigned int);
+ uint32 len = va_arg(ap, uint32);
+ HAS_SPACE(dst, len);
silc_buffer_put(dst, x, len);
silc_buffer_pull(dst, len);
break;
goto ok;
break;
default:
- SILC_LOG_ERROR(("Bad buffer formatting type `%d'. Could not "
+ SILC_LOG_DEBUG(("Bad buffer formatting type `%d'. Could not "
"format the data.", fmt));
goto fail;
break;
}
fail:
- SILC_LOG_ERROR(("Error occured while formatting data"));
- return FALSE;
+ SILC_LOG_DEBUG(("Error occured while formatting data"));
+ return -1;
ok:
/* Push the buffer back to where it belongs. */
- silc_buffer_push(dst, dst->data - start_ptr);
- return dst->len;
+ len = dst->data - start_ptr;
+ silc_buffer_push(dst, len);
+ return len;
}
/* Unformats the buffer sent as argument. The unformatted data is returned
int silc_buffer_unformat(SilcBuffer src, ...)
{
va_list ap;
+ int ret;
+
+ va_start(ap, src);
+ ret = silc_buffer_unformat_vp(src, ap);
+ va_end(ap);
+
+ return ret;
+}
+
+int silc_buffer_unformat_vp(SilcBuffer src, va_list ap)
+{
SilcBufferParamType fmt;
unsigned char *start_ptr = src->data;
int len = 0;
- va_start(ap, src);
-
/* Parse the arguments by formatting type. */
while(1) {
fmt = va_arg(ap, SilcBufferParamType);
case SILC_BUFFER_PARAM_SI8_CHAR:
{
char *x = va_arg(ap, char *);
+ HAS_SPACE(src, 1);
if (x)
*x = src->data[0];
silc_buffer_pull(src, 1);
case SILC_BUFFER_PARAM_UI8_CHAR:
{
unsigned char *x = va_arg(ap, unsigned char *);
+ HAS_SPACE(src, 1);
if (x)
*x = src->data[0];
silc_buffer_pull(src, 1);
}
case SILC_BUFFER_PARAM_SI16_SHORT:
{
- short *x = va_arg(ap, short *);
+ int16 *x = va_arg(ap, int16 *);
+ HAS_SPACE(src, 2);
if (x)
SILC_GET16_MSB(*x, src->data);
silc_buffer_pull(src, 2);
}
case SILC_BUFFER_PARAM_UI16_SHORT:
{
- unsigned short *x = va_arg(ap, unsigned short *);
+ uint16 *x = va_arg(ap, uint16 *);
+ HAS_SPACE(src, 2);
if (x)
SILC_GET16_MSB(*x, src->data);
silc_buffer_pull(src, 2);
}
case SILC_BUFFER_PARAM_SI32_INT:
{
- int *x = va_arg(ap, int *);
+ int32 *x = va_arg(ap, int32 *);
+ HAS_SPACE(src, 4);
if (x)
SILC_GET32_MSB(*x, src->data);
silc_buffer_pull(src, 4);
}
case SILC_BUFFER_PARAM_UI32_INT:
{
- unsigned int *x = va_arg(ap, unsigned int *);
+ uint32 *x = va_arg(ap, uint32 *);
+ HAS_SPACE(src, 4);
if (x)
SILC_GET32_MSB(*x, src->data);
silc_buffer_pull(src, 4);
break;
}
+ case SILC_BUFFER_PARAM_SI64_INT:
+ {
+ int64 *x = va_arg(ap, int64 *);
+ HAS_SPACE(src, 8);
+ if (x)
+ SILC_GET64_MSB(*x, src->data);
+ silc_buffer_pull(src, 8);
+ break;
+ }
+ case SILC_BUFFER_PARAM_UI64_INT:
+ {
+ uint64 *x = va_arg(ap, uint64 *);
+ HAS_SPACE(src, 8);
+ if (x)
+ SILC_GET64_MSB(*x, src->data);
+ silc_buffer_pull(src, 8);
+ break;
+ }
case SILC_BUFFER_PARAM_UI16_STRING:
{
- unsigned short len2;
+ uint16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
+ HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
- if ((len2 > src->len))
- goto fail;
- if (len2 < 1)
- break;
+ HAS_SPACE(src, len2);
if (x)
- memcpy(x, src->data, len2);
+ *x = src->data;
silc_buffer_pull(src, len2);
break;
}
case SILC_BUFFER_PARAM_UI16_STRING_ALLOC:
{
- unsigned short len2;
+ uint16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
+ HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
- if ((len2 > src->len))
- goto fail;
- if (len2 < 1)
- break;
- if (x) {
+ HAS_SPACE(src, len2);
+ if (x && len2) {
*x = silc_calloc(len2 + 1, sizeof(unsigned char));
memcpy(*x, src->data, len2);
}
}
case SILC_BUFFER_PARAM_UI32_STRING:
{
- unsigned int len2;
+ uint32 len2;
unsigned char **x = va_arg(ap, unsigned char **);
+ HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
silc_buffer_pull(src, 4);
- if ((len2 > src->len))
- goto fail;
- if (len2 < 1)
- break;
+ HAS_SPACE(src, len2);
if (x)
- memcpy(x, src->data, len2);
+ *x = src->data;
silc_buffer_pull(src, len2);
break;
}
case SILC_BUFFER_PARAM_UI32_STRING_ALLOC:
{
- unsigned int len2;
+ uint32 len2;
unsigned char **x = va_arg(ap, unsigned char **);
+ HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
silc_buffer_pull(src, 4);
- if ((len2 > src->len))
- goto fail;
- if (len2 < 1)
- break;
- if (x) {
+ HAS_SPACE(src, len2);
+ if (x && len2) {
*x = silc_calloc(len2 + 1, sizeof(unsigned char));
memcpy(*x, src->data, len2);
}
}
case SILC_BUFFER_PARAM_UI16_NSTRING:
{
- unsigned short len2;
+ uint16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
- unsigned short *len = va_arg(ap, unsigned short *);
+ uint16 *len = va_arg(ap, unsigned short *);
+ HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
- if ((len2 > src->len))
- break;
- if (len2 < 1)
- break;
+ HAS_SPACE(src, len2);
if (len)
*len = len2;
if (x)
- memcpy(x, src->data, len2);
+ *x = src->data;
silc_buffer_pull(src, len2);
break;
}
case SILC_BUFFER_PARAM_UI16_NSTRING_ALLOC:
{
- unsigned short len2;
+ uint16 len2;
unsigned char **x = va_arg(ap, unsigned char **);
- unsigned short *len = va_arg(ap, unsigned short *);
+ uint16 *len = va_arg(ap, uint16 *);
+ HAS_SPACE(src, 2);
SILC_GET16_MSB(len2, src->data);
silc_buffer_pull(src, 2);
- if ((len2 > src->len))
- break;
- if (len2 < 1)
- break;
+ HAS_SPACE(src, len2);
if (len)
*len = len2;
- if (x) {
+ if (x && len2) {
*x = silc_calloc(len2 + 1, sizeof(unsigned char));
memcpy(*x, src->data, len2);
}
}
case SILC_BUFFER_PARAM_UI32_NSTRING:
{
- unsigned int len2;
+ uint32 len2;
unsigned char **x = va_arg(ap, unsigned char **);
- unsigned int *len = va_arg(ap, unsigned int *);
+ uint32 *len = va_arg(ap, uint32 *);
+ HAS_SPACE(src, 4);
SILC_GET32_MSB(len2, src->data);
silc_buffer_pull(src, 4);
- if ((len2 > src->len))
- goto fail;
- if (len2 < 1)
- break;
+ HAS_SPACE(src, len2);
if (len)
*len = len2;
if (x)
- memcpy(x, src->data, len2);
+ *x = src->data;
silc_buffer_pull(src, len2);
break;
}
- case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC:
+ case SILC_BUFFER_PARAM_UI_XNSTRING:
{
unsigned char **x = va_arg(ap, unsigned char **);
- unsigned int len = va_arg(ap, unsigned int);
- if (len && x) {
- *x = silc_calloc(len + 1, sizeof(unsigned char));
- memcpy(*x, src->data, len);
- }
+ uint32 len = va_arg(ap, uint32);
+ HAS_SPACE(src, len);
+ if (len && x)
+ *x = src->data;
silc_buffer_pull(src, len);
break;
}
- case SILC_BUFFER_PARAM_UI_XNSTRING:
+ case SILC_BUFFER_PARAM_UI_XNSTRING_ALLOC:
{
unsigned char **x = va_arg(ap, unsigned char **);
- unsigned int len = va_arg(ap, unsigned int);
- if (len && x)
- memcpy(x, src->data, len);
+ uint32 len = va_arg(ap, uint32);
+ HAS_SPACE(src, len);
+ if (len && x) {
+ *x = silc_calloc(len + 1, sizeof(unsigned char));
+ memcpy(*x, src->data, len);
+ }
silc_buffer_pull(src, len);
break;
}
goto ok;
break;
default:
- SILC_LOG_ERROR(("Bad buffer formatting type `%d'. Could not "
+ SILC_LOG_DEBUG(("Bad buffer formatting type `%d'. Could not "
"format the data.", fmt));
goto fail;
break;
}
fail:
- SILC_LOG_ERROR(("Error occured while unformatting buffer"));
- return FALSE;
+ SILC_LOG_DEBUG(("Error occured while unformatting buffer"));
+ return -1;
ok:
/* Push the buffer back to the start. */
projects / silc.git / blobdiff