Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2001 Pekka Riikonen
+ Copyright (C) 1997 - 2006 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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*/
/* $Id$ */
-#include "silcincludes.h"
+#include "silc.h"
#include "silccommand.h"
/******************************************************************************
return NULL;
/* Parse the Command Payload */
- ret = silc_buffer_unformat(&buffer,
+ ret = silc_buffer_unformat(&buffer,
SILC_STR_UI_SHORT(&p_len),
SILC_STR_UI_CHAR(&newp->cmd),
SILC_STR_UI_CHAR(&args_num),
SILC_STR_UI_SHORT(&newp->ident),
SILC_STR_END);
if (ret == -1) {
+ SILC_LOG_ERROR(("Incorrect command payload in packet"));
silc_free(newp);
return NULL;
}
- if (p_len != buffer.len) {
- SILC_LOG_ERROR(("Incorrect command payload in packet, packet dropped"));
+ if (p_len != silc_buffer_len(&buffer)) {
+ SILC_LOG_ERROR(("Incorrect command payload in packet"));
silc_free(newp);
return NULL;
}
if (newp->cmd == 0) {
+ SILC_LOG_ERROR(("Incorrect command type in command payload"));
silc_free(newp);
return NULL;
}
silc_buffer_pull(&buffer, SILC_COMMAND_PAYLOAD_LEN);
if (args_num) {
- newp->args = silc_argument_payload_parse(buffer.data, buffer.len,
+ newp->args = silc_argument_payload_parse(buffer.data,
+ silc_buffer_len(&buffer),
args_num);
if (!newp->args) {
silc_free(newp);
if (argc) {
args = silc_argument_payload_encode(argc, argv, argv_lens, argv_types);
- len = args->len;
+ if (!args)
+ return NULL;
+ len = silc_buffer_len(args);
}
len += SILC_COMMAND_PAYLOAD_LEN;
if (argc) {
silc_buffer_pull(buffer, SILC_COMMAND_PAYLOAD_LEN);
silc_buffer_format(buffer,
- SILC_STR_UI_XNSTRING(args->data, args->len),
+ SILC_STR_UI_XNSTRING(args->data,
+ silc_buffer_len(args)),
SILC_STR_END);
silc_buffer_push(buffer, SILC_COMMAND_PAYLOAD_LEN);
silc_buffer_free(args);
if (payload->args) {
args = silc_argument_payload_encode_payload(payload->args);
- len = args->len;
+ if (args)
+ len = silc_buffer_len(args);
argc = silc_argument_get_arg_num(payload->args);
}
if (args) {
silc_buffer_pull(buffer, SILC_COMMAND_PAYLOAD_LEN);
silc_buffer_format(buffer,
- SILC_STR_UI_XNSTRING(args->data, args->len),
+ SILC_STR_UI_XNSTRING(args->data,
+ silc_buffer_len(args)),
SILC_STR_END);
silc_buffer_push(buffer, SILC_COMMAND_PAYLOAD_LEN);
silc_buffer_free(args);
}
/* Encodes Command payload with variable argument list. The arguments
- must be: SilcUInt32, unsigned char *, unsigned int, ... One
- {SilcUInt32, unsigned char * and unsigned int} forms one argument,
- thus `argc' in case when sending one {SilcUInt32, unsigned char *
+ must be: SilcUInt32, unsigned char *, unsigned int, ... One
+ {SilcUInt32, unsigned char * and unsigned int} forms one argument,
+ thus `argc' in case when sending one {SilcUInt32, unsigned char *
and SilcUInt32} equals one (1) and when sending two of those it
equals two (2), and so on. This has to be preserved or bad things
will happen. The variable arguments is: {type, data, data_len}. */
-SilcBuffer silc_command_payload_encode_va(SilcCommand cmd,
- SilcUInt16 ident,
+SilcBuffer silc_command_payload_encode_va(SilcCommand cmd,
+ SilcUInt16 ident,
SilcUInt32 argc, ...)
{
va_list ap;
/* Same as above but with va_list. */
-SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
- SilcUInt16 ident,
+SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
+ SilcUInt16 ident,
SilcUInt32 argc, va_list ap)
{
unsigned char **argv = NULL;
x_type = va_arg(ap, SilcUInt32);
x = va_arg(ap, unsigned char *);
x_len = va_arg(ap, SilcUInt32);
-
+
if (!x_type || !x || !x_len)
continue;
-
+
argv[k] = silc_memdup(x, x_len);
if (!argv[k])
goto out;
}
}
- buffer = silc_command_payload_encode(cmd, k, argv, argv_lens,
+ buffer = silc_command_payload_encode(cmd, k, argv, argv_lens,
argv_types, ident);
out:
extra argument to this function. The `argc' must not count `status'
as on argument. */
-SilcBuffer
-silc_command_reply_payload_encode_va(SilcCommand cmd,
+SilcBuffer
+silc_command_reply_payload_encode_va(SilcCommand cmd,
SilcStatus status,
SilcStatus error,
SilcUInt16 ident,
return buffer;
}
-SilcBuffer
-silc_command_reply_payload_encode_vap(SilcCommand cmd,
+SilcBuffer
+silc_command_reply_payload_encode_vap(SilcCommand cmd,
SilcStatus status,
SilcStatus error,
- SilcUInt16 ident, SilcUInt32 argc,
+ SilcUInt16 ident, SilcUInt32 argc,
va_list ap)
{
unsigned char **argv;
k++;
}
- buffer = silc_command_payload_encode(cmd, k, argv, argv_lens,
+ buffer = silc_command_payload_encode(cmd, k, argv, argv_lens,
argv_types, ident);
out:
/* Return command status */
-bool silc_command_get_status(SilcCommandPayload payload,
- SilcStatus *status,
- SilcStatus *error)
+SilcBool silc_command_get_status(SilcCommandPayload payload,
+ SilcStatus *status,
+ SilcStatus *error)
{
unsigned char *tmp;
SilcUInt32 tmp_len;