silcchannel.c
- Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+ Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2001 Pekka Riikonen
+ Copyright (C) 1997 - 2005 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
GNU General Public License for more details.
*/
-/* Channel Payload, Channel Message Payload and Channel Key Payload
- implementations. */
+/* Channel Payload and Channel Key Payload implementations. */
/* $Id$ */
-#include "silcincludes.h"
+#include "silc.h"
#include "silcchannel.h"
-#include "silcchannel_i.h"
+
+/******************************************************************************
+
+ Channel Payload
+
+******************************************************************************/
+
+/* Channel Message Payload structure. Contents of this structure is parsed
+ from SILC packets. */
+struct SilcChannelPayloadStruct {
+ unsigned char *channel_name;
+ unsigned char *channel_id;
+ SilcUInt32 mode;
+ SilcUInt16 name_len;
+ SilcUInt16 id_len;
+};
/* Parses channel payload returning new channel payload structure. */
/* Parse the Channel Payload. Ignore the padding. */
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_name,
+ SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_name,
&newp->name_len),
- SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_id,
+ SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_id,
&newp->id_len),
SILC_STR_UI_INT(&newp->mode),
SILC_STR_END);
if (ret == -1)
goto err;
- if ((newp->name_len < 1 || newp->name_len > buffer.len - 8) ||
- (newp->id_len < 1 || newp->id_len > buffer.len - 8) ||
- (newp->id_len + newp->name_len > buffer.len - 8)) {
+ if ((newp->name_len < 1 || newp->name_len > silc_buffer_len(&buffer) - 8) ||
+ (newp->id_len < 1 || newp->id_len > silc_buffer_len(&buffer) - 8) ||
+ (newp->id_len + newp->name_len > silc_buffer_len(&buffer) - 8)) {
SILC_LOG_ERROR(("Incorrect channel payload in packet, packet dropped"));
goto err;
}
SilcBufferStruct buffer;
SilcDList list;
SilcChannelPayload newp;
- int len, ret;
+ SilcUInt32 len;
+ int ret;
SILC_LOG_DEBUG(("Parsing channel payload list"));
silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
list = silc_dlist_init();
- while (buffer.len) {
+ while (silc_buffer_len(&buffer)) {
newp = silc_calloc(1, sizeof(*newp));
if (!newp)
goto err;
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_name,
+ SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_name,
&newp->name_len),
- SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_id,
+ SILC_STR_UI16_NSTRING_ALLOC(&newp->channel_id,
&newp->id_len),
SILC_STR_UI_INT(&newp->mode),
SILC_STR_END);
if (ret == -1)
goto err;
- if ((newp->name_len < 1 || newp->name_len > buffer.len) ||
- (newp->id_len < 1 || newp->id_len > buffer.len)) {
+ if ((newp->name_len < 1 || newp->name_len > silc_buffer_len(&buffer) - 8) ||
+ (newp->id_len < 1 || newp->id_len > silc_buffer_len(&buffer) - 8) ||
+ (newp->id_len + newp->name_len > silc_buffer_len(&buffer) - 8)) {
SILC_LOG_ERROR(("Incorrect channel payload in packet, packet dropped"));
goto err;
}
len = 2 + newp->name_len + 2 + newp->id_len + 4;
- if (buffer.len < len)
+ if (silc_buffer_len(&buffer) < len)
break;
silc_buffer_pull(&buffer, len);
silc_dlist_add(list, newp);
}
-
+
return list;
err:
SILC_LOG_DEBUG(("Encoding message payload"));
- buffer = silc_buffer_alloc_size(2 + channel_name_len + 2 +
+ buffer = silc_buffer_alloc_size(2 + channel_name_len + 2 +
channel_id_len + 4);
if (!buffer)
return NULL;
/* Encode the Channel Payload */
- silc_buffer_format(buffer,
+ silc_buffer_format(buffer,
SILC_STR_UI_SHORT(channel_name_len),
SILC_STR_UI_XNSTRING(channel_name, channel_name_len),
SILC_STR_UI_SHORT(channel_id_len),
/* Return the channel ID as parsed ID. */
-SilcChannelID *silc_channel_get_id_parse(SilcChannelPayload payload)
+SilcBool silc_channel_get_id_parse(SilcChannelPayload payload,
+ SilcChannelID *ret_channel_id)
{
return silc_id_str2id(payload->channel_id, payload->id_len,
- SILC_ID_CHANNEL);
+ SILC_ID_CHANNEL, ret_channel_id,
+ sizeof(SilcChannelID));
}
/* Return the mode. The mode is arbitrary. It can be the mode of the
******************************************************************************/
+/* Channel Key Payload structrue. Channel keys are parsed from SILC
+ packets into this structure. */
+struct SilcChannelKeyPayloadStruct {
+ unsigned char *id;
+ unsigned char *cipher;
+ unsigned char *key;
+ SilcUInt16 id_len;
+ SilcUInt16 cipher_len;
+ SilcUInt16 key_len;
+};
+
/* Parses channel key payload returning new channel key payload structure */
-SilcChannelKeyPayload
+SilcChannelKeyPayload
silc_channel_key_payload_parse(const unsigned char *payload,
SilcUInt32 payload_len)
{
ret =
silc_buffer_unformat(&buffer,
SILC_STR_UI16_NSTRING_ALLOC(&newp->id, &newp->id_len),
- SILC_STR_UI16_NSTRING_ALLOC(&newp->cipher,
+ SILC_STR_UI16_NSTRING_ALLOC(&newp->cipher,
&newp->cipher_len),
- SILC_STR_UI16_NSTRING_ALLOC(&newp->key,
+ SILC_STR_UI16_NSTRING_ALLOC(&newp->key,
&newp->key_len),
SILC_STR_END);
if (ret == -1)
goto err;
if (newp->id_len < 1 || newp->key_len < 1 || newp->cipher_len < 1 ||
- newp->id_len + newp->cipher_len + newp->key_len > buffer.len - 6) {
+ newp->id_len + newp->cipher_len + newp->key_len > silc_buffer_len(&buffer) - 6) {
SILC_LOG_ERROR(("Incorrect channel key payload in packet"));
goto err;
}
return NULL;
}
-/* Encodes channel key payload into a buffer and returns it. This is used
+/* Encodes channel key payload into a buffer and returns it. This is used
to add channel key payload into a packet. */
SilcBuffer silc_channel_key_payload_encode(SilcUInt16 id_len,
SILC_LOG_DEBUG(("Encoding channel key payload"));
- /* Allocate channel payload buffer. Length is 2 + id + 2 + key +
+ /* Allocate channel payload buffer. Length is 2 + id + 2 + key +
2 + cipher */
len = 2 + id_len + 2 + key_len + 2 + cipher_len;
buffer = silc_buffer_alloc_size(len);
return NULL;
/* Encode the Channel Payload */
- silc_buffer_format(buffer,
+ silc_buffer_format(buffer,
SILC_STR_UI_SHORT(id_len),
SILC_STR_UI_XNSTRING(id, id_len),
SILC_STR_UI_SHORT(cipher_len),
/* Return ID */
-unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload,
+unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload,
SilcUInt32 *id_len)
{
if (id_len)
projects / silc.git / blobdiff