struct SilcIDPayloadStruct {
SilcIdType type;
- unsigned short len;
+ uint16 len;
unsigned char *id;
};
SilcIDPayload silc_id_payload_parse(SilcBuffer buffer)
{
SilcIDPayload new;
+ int ret;
SILC_LOG_DEBUG(("Parsing ID payload"));
new = silc_calloc(1, sizeof(*new));
- silc_buffer_unformat(buffer,
- SILC_STR_UI_SHORT(&new->type),
- SILC_STR_UI_SHORT(&new->len),
- SILC_STR_END);
+ ret = silc_buffer_unformat(buffer,
+ SILC_STR_UI_SHORT(&new->type),
+ SILC_STR_UI_SHORT(&new->len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
silc_buffer_pull(buffer, 4);
if (new->len > buffer->len)
goto err;
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&new->id, new->len),
- SILC_STR_END);
+ ret = silc_buffer_unformat(buffer,
+ SILC_STR_UI_XNSTRING_ALLOC(&new->id, new->len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
+
silc_buffer_push(buffer, 4);
return new;
/* Parses data and return ID payload into payload structure. */
SilcIDPayload silc_id_payload_parse_data(unsigned char *data,
- unsigned int len)
+ uint32 len)
{
SilcIDPayload new;
- SilcBuffer buffer;
+ SilcBufferStruct buffer;
+ int ret;
SILC_LOG_DEBUG(("Parsing ID payload"));
- buffer = silc_buffer_alloc(len);
- silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
- silc_buffer_put(buffer, data, len);
+ silc_buffer_set(&buffer, data, len);
new = silc_calloc(1, sizeof(*new));
- silc_buffer_unformat(buffer,
- SILC_STR_UI_SHORT(&new->type),
- SILC_STR_UI_SHORT(&new->len),
- SILC_STR_END);
+ ret = silc_buffer_unformat(&buffer,
+ SILC_STR_UI_SHORT(&new->type),
+ SILC_STR_UI_SHORT(&new->len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
- silc_buffer_pull(buffer, 4);
+ silc_buffer_pull(&buffer, 4);
- if (new->len > buffer->len)
+ if (new->len > buffer.len)
goto err;
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&new->id, new->len),
- SILC_STR_END);
+ ret = silc_buffer_unformat(&buffer,
+ SILC_STR_UI_XNSTRING_ALLOC(&new->id, new->len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
- silc_buffer_free(buffer);
return new;
err:
- silc_buffer_free(buffer);
silc_free(new);
return NULL;
}
+/* Return the ID directly from the raw payload data. */
+
+void *silc_id_payload_parse_id(unsigned char *data, uint32 len)
+{
+ SilcBufferStruct buffer;
+ SilcIdType type;
+ uint16 idlen;
+ unsigned char *id_data = NULL;
+ int ret;
+ void *id;
+
+ silc_buffer_set(&buffer, data, len);
+
+ ret = silc_buffer_unformat(&buffer,
+ SILC_STR_UI_SHORT(&type),
+ SILC_STR_UI_SHORT(&idlen),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
+
+ silc_buffer_pull(&buffer, 4);
+
+ if (idlen > buffer.len)
+ goto err;
+
+ ret = silc_buffer_unformat(&buffer,
+ SILC_STR_UI_XNSTRING_ALLOC(&id_data, idlen),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
+
+ id = silc_id_str2id(id_data, idlen, type);
+ silc_free(id_data);
+ return id;
+
+ err:
+ return NULL;
+}
+
/* Encodes ID Payload */
-SilcBuffer silc_id_payload_encode(void *id, unsigned short len,
- SilcIdType type)
+SilcBuffer silc_id_payload_encode(void *id, SilcIdType type)
{
SilcBuffer buffer;
unsigned char *id_data;
+ uint32 len;
- SILC_LOG_DEBUG(("Parsing ID payload"));
+ SILC_LOG_DEBUG(("Encoding %s ID payload",
+ type == SILC_ID_CLIENT ? "Client" :
+ type == SILC_ID_SERVER ? "Server" : "Channel"));
id_data = silc_id_id2str(id, type);
+ len = silc_id_get_len(id, type);
buffer = silc_buffer_alloc(4 + len);
silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
{
if (payload) {
silc_free(payload->id);
+ silc_free(payload);
}
}
SilcIdType silc_id_payload_get_type(SilcIDPayload payload)
{
- return payload->type;
+ return payload ? payload->type : 0;
}
/* Get ID */
void *silc_id_payload_get_id(SilcIDPayload payload)
{
- return silc_id_str2id(payload->id, payload->type);
+ return payload ? silc_id_str2id(payload->id, payload->len,
+ payload->type) : NULL;
+}
+
+/* Get raw ID data. Data is duplicated. */
+
+unsigned char *silc_id_payload_get_data(SilcIDPayload payload)
+{
+ unsigned char *ret;
+
+ if (!payload)
+ return NULL;
+
+ ret = silc_calloc(payload->len, sizeof(*ret));
+ memcpy(ret, payload->id, payload->len);
+ return ret;
+}
+
+/* Get length of ID */
+
+uint32 silc_id_payload_get_len(SilcIDPayload payload)
+{
+ return payload ? payload->len : 0;
}
/******************************************************************************
******************************************************************************/
struct SilcArgumentPayloadStruct {
- unsigned int argc;
+ uint32 argc;
unsigned char **argv;
- unsigned int *argv_lens;
- unsigned int *argv_types;
- unsigned int pos;
+ uint32 *argv_lens;
+ uint32 *argv_types;
+ uint32 pos;
};
/* Parses arguments and returns them into Argument Payload structure. */
SilcArgumentPayload silc_argument_payload_parse(SilcBuffer buffer,
- unsigned int argc)
+ uint32 argc)
{
SilcArgumentPayload new;
- unsigned short payload_len = 0;
+ uint16 payload_len = 0;
unsigned char arg_num = 0;
- unsigned int arg_type = 0;
- unsigned int pull_len = 0;
- int i = 0;
+ unsigned char arg_type = 0;
+ uint32 pull_len = 0;
+ int i = 0, ret;
SILC_LOG_DEBUG(("Parsing argument payload"));
new = silc_calloc(1, sizeof(*new));
new->argv = silc_calloc(argc, sizeof(unsigned char *));
- new->argv_lens = silc_calloc(argc, sizeof(unsigned int));
- new->argv_types = silc_calloc(argc, sizeof(unsigned int));
+ new->argv_lens = silc_calloc(argc, sizeof(uint32));
+ new->argv_types = silc_calloc(argc, sizeof(uint32));
/* Get arguments */
arg_num = 1;
for (i = 0; i < argc; i++) {
- silc_buffer_unformat(buffer,
- SILC_STR_UI_SHORT(&payload_len),
- SILC_STR_UI_CHAR(&arg_type),
- SILC_STR_END);
+ ret = silc_buffer_unformat(buffer,
+ SILC_STR_UI_SHORT(&payload_len),
+ SILC_STR_UI_CHAR(&arg_type),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
new->argv_lens[i] = payload_len;
new->argv_types[i] = arg_type;
- if (payload_len > buffer->len)
+ if (payload_len > buffer->len - 3)
break;
/* Get argument data */
silc_buffer_pull(buffer, 3);
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&new->argv[i],
- payload_len),
- SILC_STR_END);
+ ret = silc_buffer_unformat(buffer,
+ SILC_STR_UI_XNSTRING_ALLOC(&new->argv[i],
+ payload_len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
silc_buffer_pull(buffer, payload_len);
pull_len += 3 + payload_len;
/* Encodes arguments in to Argument Paylods returning them to SilcBuffer. */
-SilcBuffer silc_argument_payload_encode(unsigned int argc,
+SilcBuffer silc_argument_payload_encode(uint32 argc,
unsigned char **argv,
- unsigned int *argv_lens,
- unsigned int *argv_types)
+ uint32 *argv_lens,
+ uint32 *argv_types)
{
SilcBuffer buffer;
- unsigned int len;
+ uint32 len;
int i;
SILC_LOG_DEBUG(("Encoding Argument payload"));
return buffer;
}
-#if 0
-/* Encodes Argument payload with variable argument list. The arguments
- must be: unsigned int, unsigned char *, unsigned int, ... One
- {unsigned int, unsigned char * and unsigned int} forms one argument,
- thus `argc' in case when sending one {unsigned int, unsigned char *
- and unsigned int} 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}. */
+/* Same as above but encode the buffer from SilcArgumentPayload structure
+ instead of raw data. */
-SilcBuffer silc_command_encode_payload_va(unsigned int argc, ...)
+SilcBuffer silc_argument_payload_encode_payload(SilcArgumentPayload payload)
{
- va_list ap;
- unsigned char **argv;
- unsigned int *argv_lens = NULL, *argv_types = NULL;
- unsigned char *x;
- unsigned int x_len;
- unsigned int x_type;
SilcBuffer buffer;
+ uint32 len;
int i;
- va_start(ap, argc);
+ SILC_LOG_DEBUG(("Encoding Argument payload"));
- argv = silc_calloc(argc, sizeof(unsigned char *));
- argv_lens = silc_calloc(argc, sizeof(unsigned int));
- argv_types = silc_calloc(argc, sizeof(unsigned int));
+ len = 0;
+ for (i = 0; i < payload->argc; i++)
+ len += 3 + payload->argv_lens[i];
- for (i = 0; i < argc; i++) {
- x_type = va_arg(ap, unsigned int);
- x = va_arg(ap, unsigned char *);
- x_len = va_arg(ap, unsigned int);
-
- argv[i] = silc_calloc(x_len + 1, sizeof(unsigned char));
- memcpy(argv[i], x, x_len);
- argv_lens[i] = x_len;
- argv_types[i] = x_type;
- }
+ buffer = silc_buffer_alloc(len);
+ silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
- buffer = silc_argument_payload_encode(argc, argv,
- argv_lens, argv_types);
+ /* Put arguments */
+ for (i = 0; i < payload->argc; i++) {
+ silc_buffer_format(buffer,
+ SILC_STR_UI_SHORT(payload->argv_lens[i]),
+ SILC_STR_UI_CHAR(payload->argv_types[i]),
+ SILC_STR_UI_XNSTRING(payload->argv[i],
+ payload->argv_lens[i]),
+ SILC_STR_END);
+ silc_buffer_pull(buffer, 3 + payload->argv_lens[i]);
+ }
- for (i = 0; i < argc; i++)
- silc_free(argv[i]);
- silc_free(argv);
- silc_free(argv_lens);
- silc_free(argv_types);
+ silc_buffer_push(buffer, len);
return buffer;
}
-#endif
-/* Free's Command Payload */
+/* Frees Argument Payload */
void silc_argument_payload_free(SilcArgumentPayload payload)
{
silc_free(payload->argv[i]);
silc_free(payload->argv);
+ silc_free(payload->argv_lens);
+ silc_free(payload->argv_types);
silc_free(payload);
}
}
/* Returns number of arguments in payload */
-unsigned int silc_argument_get_arg_num(SilcArgumentPayload payload)
+uint32 silc_argument_get_arg_num(SilcArgumentPayload payload)
{
- return payload->argc;
+ return payload ? payload->argc : 0;
}
/* Returns first argument from payload. */
unsigned char *silc_argument_get_first_arg(SilcArgumentPayload payload,
- unsigned int *ret_len)
+ uint32 *ret_len)
{
+ if (!payload)
+ return NULL;
+
payload->pos = 0;
if (ret_len)
/* Returns next argument from payload or NULL if no more arguments. */
unsigned char *silc_argument_get_next_arg(SilcArgumentPayload payload,
- unsigned int *ret_len)
+ uint32 *ret_len)
{
+ if (!payload)
+ return NULL;
+
if (payload->pos >= payload->argc)
return NULL;
/* Returns argument which type is `type'. */
unsigned char *silc_argument_get_arg_type(SilcArgumentPayload payload,
- unsigned int type,
- unsigned int *ret_len)
+ uint32 type,
+ uint32 *ret_len)
{
int i;
+ if (!payload)
+ return NULL;
+
for (i = 0; i < payload->argc; i++)
if (payload->argv_types[i] == type)
break;
projects / silc.git / blobdiff