X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilccommand.c;h=50d96200eddc547736e9604514524af7479de95a;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=3185fe305cb064810752a2e2d6ea7b5e54206f37;hpb=32fd2624bef1d1e64b3250d7ff8475db043fd4a5;p=silc.git diff --git a/lib/silccore/silccommand.c b/lib/silccore/silccommand.c index 3185fe30..50d96200 100644 --- a/lib/silccore/silccommand.c +++ b/lib/silccore/silccommand.c @@ -2,9 +2,9 @@ silccommand.c - Author: Pekka Riikonen + Author: Pekka Riikonen - Copyright (C) 1997 - 2000 Pekka Riikonen + Copyright (C) 1997 - 2001 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 @@ -32,7 +32,7 @@ from SILC packets. */ struct SilcCommandPayloadStruct { SilcCommand cmd; - unsigned short ident; + SilcUInt16 ident; SilcArgumentPayload args; }; @@ -41,20 +41,23 @@ struct SilcCommandPayloadStruct { /* Parses command payload returning new command payload structure */ -SilcCommandPayload silc_command_payload_parse(SilcBuffer buffer) +SilcCommandPayload silc_command_payload_parse(const unsigned char *payload, + SilcUInt32 payload_len) { + SilcBufferStruct buffer; SilcCommandPayload new; unsigned char args_num; - unsigned short payload_len; + SilcUInt16 p_len; int ret; SILC_LOG_DEBUG(("Parsing command payload")); + silc_buffer_set(&buffer, (unsigned char *)payload, payload_len); new = silc_calloc(1, sizeof(*new)); /* Parse the Command Payload */ - ret = silc_buffer_unformat(buffer, - SILC_STR_UI_SHORT(&payload_len), + ret = silc_buffer_unformat(&buffer, + SILC_STR_UI_SHORT(&p_len), SILC_STR_UI_CHAR(&new->cmd), SILC_STR_UI_CHAR(&args_num), SILC_STR_UI_SHORT(&new->ident), @@ -64,7 +67,7 @@ SilcCommandPayload silc_command_payload_parse(SilcBuffer buffer) return NULL; } - if (payload_len != buffer->len) { + if (p_len != buffer.len) { SILC_LOG_ERROR(("Incorrect command payload in packet, packet dropped")); silc_free(new); return NULL; @@ -75,15 +78,15 @@ SilcCommandPayload silc_command_payload_parse(SilcBuffer buffer) return NULL; } - silc_buffer_pull(buffer, SILC_COMMAND_PAYLOAD_LEN); + silc_buffer_pull(&buffer, SILC_COMMAND_PAYLOAD_LEN); if (args_num) { - new->args = silc_argument_payload_parse(buffer, args_num); + new->args = silc_argument_payload_parse(buffer.data, buffer.len, args_num); if (!new->args) { silc_free(new); return NULL; } } - silc_buffer_push(buffer, SILC_COMMAND_PAYLOAD_LEN); + silc_buffer_push(&buffer, SILC_COMMAND_PAYLOAD_LEN); return new; } @@ -91,15 +94,15 @@ SilcCommandPayload silc_command_payload_parse(SilcBuffer buffer) /* Encodes Command Payload returning it to SilcBuffer. */ SilcBuffer silc_command_payload_encode(SilcCommand cmd, - unsigned int argc, + SilcUInt32 argc, unsigned char **argv, - unsigned int *argv_lens, - unsigned int *argv_types, - unsigned short ident) + SilcUInt32 *argv_lens, + SilcUInt32 *argv_types, + SilcUInt16 ident) { SilcBuffer buffer; SilcBuffer args = NULL; - unsigned int len = 0; + SilcUInt32 len = 0; SILC_LOG_DEBUG(("Encoding command payload")); @@ -127,7 +130,7 @@ SilcBuffer silc_command_payload_encode(SilcCommand cmd, SILC_STR_UI_XNSTRING(args->data, args->len), SILC_STR_END); silc_buffer_push(buffer, SILC_COMMAND_PAYLOAD_LEN); - silc_free(args); + silc_buffer_free(args); } return buffer; @@ -140,8 +143,8 @@ SilcBuffer silc_command_payload_encode_payload(SilcCommandPayload payload) { SilcBuffer buffer; SilcBuffer args = NULL; - unsigned int len = 0; - unsigned int argc = 0; + SilcUInt32 len = 0; + SilcUInt32 argc = 0; SILC_LOG_DEBUG(("Encoding command payload")); @@ -170,58 +173,30 @@ SilcBuffer silc_command_payload_encode_payload(SilcCommandPayload payload) SILC_STR_UI_XNSTRING(args->data, args->len), SILC_STR_END); silc_buffer_push(buffer, SILC_COMMAND_PAYLOAD_LEN); - silc_free(args); + silc_buffer_free(args); } return buffer; } /* Encodes Command 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 + 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, - unsigned short ident, - unsigned int argc, ...) + SilcUInt16 ident, + SilcUInt32 argc, ...) { 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; - int i; va_start(ap, argc); - - argv = silc_calloc(argc, sizeof(unsigned char *)); - argv_lens = silc_calloc(argc, sizeof(unsigned int)); - argv_types = silc_calloc(argc, sizeof(unsigned int)); - - 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_command_payload_encode(cmd, argc, argv, - argv_lens, argv_types, ident); - - for (i = 0; i < argc; i++) - silc_free(argv[i]); - silc_free(argv); - silc_free(argv_lens); - silc_free(argv_types); + buffer = silc_command_payload_encode_vap(cmd, ident, argc, ap); + va_end(ap); return buffer; } @@ -229,36 +204,41 @@ SilcBuffer silc_command_payload_encode_va(SilcCommand cmd, /* Same as above but with va_list. */ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd, - unsigned short ident, - unsigned int argc, va_list ap) + SilcUInt16 ident, + SilcUInt32 argc, va_list ap) { - unsigned char **argv; - unsigned int *argv_lens = NULL, *argv_types = NULL; + unsigned char **argv = NULL; + SilcUInt32 *argv_lens = NULL, *argv_types = NULL; unsigned char *x; - unsigned int x_len; - unsigned int x_type; + SilcUInt32 x_len; + SilcUInt32 x_type; SilcBuffer buffer; - int i; - - argv = silc_calloc(argc, sizeof(unsigned char *)); - argv_lens = silc_calloc(argc, sizeof(unsigned int)); - argv_types = silc_calloc(argc, sizeof(unsigned int)); + int i, k = 0; - 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; + if (argc) { + argv = silc_calloc(argc, sizeof(unsigned char *)); + argv_lens = silc_calloc(argc, sizeof(SilcUInt32)); + argv_types = silc_calloc(argc, sizeof(SilcUInt32)); + + for (i = 0, k = 0; i < argc; i++) { + 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); + argv_lens[k] = x_len; + argv_types[k] = x_type; + k++; + } } - buffer = silc_command_payload_encode(cmd, argc, argv, - argv_lens, argv_types, ident); + buffer = silc_command_payload_encode(cmd, k, argv, argv_lens, + argv_types, ident); - for (i = 0; i < argc; i++) + for (i = 0; i < k; i++) silc_free(argv[i]); silc_free(argv); silc_free(argv_lens); @@ -275,47 +255,62 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd, SilcBuffer silc_command_reply_payload_encode_va(SilcCommand cmd, SilcCommandStatus status, - unsigned short ident, - unsigned int argc, ...) + SilcUInt16 ident, + SilcUInt32 argc, ...) { va_list ap; + SilcBuffer buffer; + + va_start(ap, argc); + buffer = silc_command_reply_payload_encode_vap(cmd, status, ident, argc, ap); + va_end(ap); + + return buffer; +} + +SilcBuffer +silc_command_reply_payload_encode_vap(SilcCommand cmd, + SilcCommandStatus status, + SilcUInt16 ident, SilcUInt32 argc, + va_list ap) +{ unsigned char **argv; - unsigned int *argv_lens = NULL, *argv_types = NULL; + SilcUInt32 *argv_lens = NULL, *argv_types = NULL; unsigned char status_data[2]; unsigned char *x; - unsigned int x_len; - unsigned int x_type; + SilcUInt32 x_len; + SilcUInt32 x_type; SilcBuffer buffer; - int i; - - va_start(ap, argc); + int i, k; 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)); SILC_PUT16_MSB(status, status_data); - argv[0] = silc_calloc(sizeof(status_data) + 1, sizeof(unsigned char)); - memcpy(argv[0], status_data, sizeof(status_data)); + argv[0] = silc_memdup(status_data, sizeof(status_data)); argv_lens[0] = sizeof(status_data); argv_types[0] = 1; - for (i = 1; i < argc; i++) { - x_type = va_arg(ap, unsigned int); + for (i = 1, k = 1; i < argc; i++) { + x_type = va_arg(ap, SilcUInt32); x = va_arg(ap, unsigned char *); - x_len = va_arg(ap, unsigned int); + x_len = va_arg(ap, SilcUInt32); + + if (!x_type || !x || !x_len) + continue; - 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; + argv[k] = silc_memdup(x, x_len); + argv_lens[k] = x_len; + argv_types[k] = x_type; + k++; } - buffer = silc_command_payload_encode(cmd, argc, argv, - argv_lens, argv_types, ident); + buffer = silc_command_payload_encode(cmd, k, argv, argv_lens, + argv_types, ident); - for (i = 0; i < argc; i++) + for (i = 0; i < k; i++) silc_free(argv[i]); silc_free(argv); silc_free(argv_lens); @@ -324,9 +319,9 @@ silc_command_reply_payload_encode_va(SilcCommand cmd, return buffer; } -/* Free's Command Payload */ +/* Frees Command Payload */ -void silc_command_free_payload(SilcCommandPayload payload) +void silc_command_payload_free(SilcCommandPayload payload) { if (payload) { silc_argument_payload_free(payload->args); @@ -350,7 +345,7 @@ SilcArgumentPayload silc_command_get_args(SilcCommandPayload payload) /* Returns identifier */ -unsigned short silc_command_get_ident(SilcCommandPayload payload) +SilcUInt16 silc_command_get_ident(SilcCommandPayload payload) { return payload->ident; } @@ -359,7 +354,7 @@ unsigned short silc_command_get_ident(SilcCommandPayload payload) payloads are frequentlly resent in SILC and thusly this makes it easy to set the identifier. */ -void silc_command_set_ident(SilcCommandPayload payload, unsigned short ident) +void silc_command_set_ident(SilcCommandPayload payload, SilcUInt16 ident) { payload->ident = ident; }