struct SilcIDPayloadStruct {
SilcIdType type;
- unsigned short len;
+ uint16 len;
unsigned char *id;
};
/* 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));
- ret = silc_buffer_unformat(buffer,
+ 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;
- ret = silc_buffer_unformat(buffer,
+ 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, unsigned int len)
+void *silc_id_payload_parse_id(unsigned char *data, uint32 len)
{
- SilcBuffer buffer;
+ SilcBufferStruct buffer;
SilcIdType type;
- unsigned short idlen;
- unsigned char *id_data;
+ uint16 idlen;
+ unsigned char *id_data = NULL;
int ret;
void *id;
- 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);
- ret = silc_buffer_unformat(buffer,
+ 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);
+ silc_buffer_pull(&buffer, 4);
- if (idlen > buffer->len)
+ if (idlen > buffer.len)
goto err;
- ret = silc_buffer_unformat(buffer,
+ ret = silc_buffer_unformat(&buffer,
SILC_STR_UI_XNSTRING_ALLOC(&id_data, idlen),
SILC_STR_END);
if (ret == -1)
goto err;
- silc_buffer_free(buffer);
-
id = silc_id_str2id(id_data, idlen, type);
silc_free(id_data);
return id;
err:
- silc_buffer_free(buffer);
return NULL;
}
{
SilcBuffer buffer;
unsigned char *id_data;
- unsigned int len;
+ uint32 len;
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(type);
+ len = silc_id_get_len(id, type);
buffer = silc_buffer_alloc(4 + len);
silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
/* Get length of ID */
-unsigned int silc_id_payload_get_len(SilcIDPayload payload)
+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 char arg_type = 0;
- unsigned int pull_len = 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;
/* 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"));
SilcBuffer silc_argument_payload_encode_payload(SilcArgumentPayload payload)
{
SilcBuffer buffer;
- unsigned int len;
+ uint32 len;
int i;
SILC_LOG_DEBUG(("Encoding Argument payload"));
return buffer;
}
-/* Free's Command Payload */
+/* Frees Argument Payload */
void silc_argument_payload_free(SilcArgumentPayload 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 ? 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;
/* 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;
/* 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;
projects / silc.git / blobdiff