/* Parse notify payload buffer and return data into payload structure */
-SilcNotifyPayload silc_notify_payload_parse(SilcBuffer buffer)
+SilcNotifyPayload silc_notify_payload_parse(const unsigned char *payload,
+ SilcUInt32 payload_len)
{
+ SilcBufferStruct buffer;
SilcNotifyPayload new;
- unsigned short len;
+ SilcUInt16 len;
int ret;
SILC_LOG_DEBUG(("Parsing Notify payload"));
+ silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
new = silc_calloc(1, sizeof(*new));
- ret = silc_buffer_unformat(buffer,
+ ret = silc_buffer_unformat(&buffer,
SILC_STR_UI_SHORT(&new->type),
SILC_STR_UI_SHORT(&len),
SILC_STR_UI_CHAR(&new->argc),
if (ret == -1)
goto err;
- if (len > buffer->len)
+ if (len > buffer.len)
goto err;
if (new->argc) {
- silc_buffer_pull(buffer, 5);
- new->args = silc_argument_payload_parse(buffer, new->argc);
- silc_buffer_push(buffer, 5);
+ silc_buffer_pull(&buffer, 5);
+ new->args = silc_argument_payload_parse(buffer.data, buffer.len,
+ new->argc);
+ silc_buffer_push(&buffer, 5);
}
return new;
/* Encode notify payload with variable argument list. If `argc' is > 0
argument payloads will be associated to the notify payload. Variable
- arguments must be {usigned char *, unsigned int (len)}. */
+ arguments must be {usigned char *, SilcUInt32 (len)}. */
-SilcBuffer silc_notify_payload_encode(SilcNotifyType type, unsigned int argc,
+SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
va_list ap)
{
SilcBuffer buffer;
SilcBuffer args = NULL;
unsigned char **argv;
- unsigned int *argv_lens = NULL, *argv_types = NULL;
+ SilcUInt32 *argv_lens = NULL, *argv_types = NULL;
unsigned char *x;
- unsigned int x_len;
+ SilcUInt32 x_len;
int i, k = 0, len = 0;
if (argc) {
argv = silc_calloc(argc, sizeof(unsigned char *));
- argv_lens = silc_calloc(argc, sizeof(unsigned int));
- argv_types = silc_calloc(argc, sizeof(unsigned int));
+ argv_lens = silc_calloc(argc, sizeof(SilcUInt32));
+ argv_types = silc_calloc(argc, sizeof(SilcUInt32));
for (i = 0, k = 0; i < argc; i++) {
x = va_arg(ap, unsigned char *);
- x_len = va_arg(ap, unsigned int);
+ x_len = va_arg(ap, SilcUInt32);
if (!x || !x_len)
continue;
- argv[k] = silc_calloc(x_len + 1, sizeof(unsigned char));
- memcpy(argv[k], x, x_len);
+ argv[k] = silc_memdup(x, x_len);
argv_lens[k] = x_len;
argv_types[k] = i + 1;
k++;
/* Same as above but takes argument from the `args' Argument Payload. */
SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type,
- unsigned int argc,
+ SilcUInt32 argc,
SilcBuffer args)
{
SilcBuffer buffer;
return buffer;
}
-/* Free's notify payload */
+/* Frees notify payload */
void silc_notify_payload_free(SilcNotifyPayload payload)
{
/* Return argument nums */
-unsigned int silc_notify_get_arg_num(SilcNotifyPayload payload)
+SilcUInt32 silc_notify_get_arg_num(SilcNotifyPayload payload)
{
return payload->argc;
}