projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SILC Server library.
[silc.git]
/
lib
/
silccore
/
silcid.c
diff --git
a/lib/silccore/silcid.c
b/lib/silccore/silcid.c
index 9a35723a38832fc94ac599558dfe18edc07dc271..1e5727bc215bd96d94831b3aa7119e9e5b71ff97 100644
(file)
--- a/
lib/silccore/silcid.c
+++ b/
lib/silccore/silcid.c
@@
-2,15
+2,14
@@
id.c
id.c
- Author: Pekka Riikonen <priikone@
poseidon.pspt.fi
>
+ Author: Pekka Riikonen <priikone@
silcnet.org
>
- Copyright (C) 1997 - 200
1
Pekka Riikonen
+ Copyright (C) 1997 - 200
5
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
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
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
@@
-19,7
+18,7
@@
*/
/* $Id$ */
*/
/* $Id$ */
-#include "silc
includes
.h"
+#include "silc.h"
#include "silcid.h"
/* ID lengths (in bytes) without the IP address part */
#include "silcid.h"
/* ID lengths (in bytes) without the IP address part */
@@
-35,61
+34,65
@@
struct SilcIDPayloadStruct {
SilcIdType type;
struct SilcIDPayloadStruct {
SilcIdType type;
-
ui
nt16 len;
+
SilcUI
nt16 len;
unsigned char *id;
};
/* Parses buffer and return ID payload into payload structure */
SilcIDPayload silc_id_payload_parse(const unsigned char *payload,
unsigned char *id;
};
/* Parses buffer and return ID payload into payload structure */
SilcIDPayload silc_id_payload_parse(const unsigned char *payload,
-
ui
nt32 payload_len)
+
SilcUI
nt32 payload_len)
{
SilcBufferStruct buffer;
{
SilcBufferStruct buffer;
- SilcIDPayload new;
+ SilcIDPayload new
p
;
int ret;
int ret;
- SILC_LOG_DEBUG(("Parsing ID payload"));
-
silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
- new = silc_calloc(1, sizeof(*new));
+ newp = silc_calloc(1, sizeof(*newp));
+ if (!newp)
+ return NULL;
ret = silc_buffer_unformat(&buffer,
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI_SHORT(&new->type),
- SILC_STR_UI_SHORT(&new->len),
+ SILC_STR_UI_SHORT(&new
p
->type),
+ SILC_STR_UI_SHORT(&new
p
->len),
SILC_STR_END);
if (ret == -1)
goto err;
SILC_STR_END);
if (ret == -1)
goto err;
+ if (newp->type > SILC_ID_CHANNEL)
+ goto err;
+
silc_buffer_pull(&buffer, 4);
silc_buffer_pull(&buffer, 4);
- if (new->len > buffer.len)
+ if (newp->len > silc_buffer_len(&buffer) ||
+ newp->len > SILC_PACKET_MAX_ID_LEN)
goto err;
ret = silc_buffer_unformat(&buffer,
goto err;
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&new
->id, new
->len),
+ SILC_STR_UI_XNSTRING_ALLOC(&new
p->id, newp
->len),
SILC_STR_END);
if (ret == -1)
goto err;
SILC_STR_END);
if (ret == -1)
goto err;
- silc_buffer_push(&buffer, 4);
-
- return new;
+ return newp;
err:
err:
- silc_free(new);
+ SILC_LOG_DEBUG(("Error parsing ID payload"));
+ silc_free(newp);
return NULL;
}
/* Return the ID directly from the raw payload data. */
return NULL;
}
/* Return the ID directly from the raw payload data. */
-void *silc_id_payload_parse_id(const unsigned char *data, uint32 len)
+SilcBool silc_id_payload_parse_id(const unsigned char *data, SilcUInt32 len,
+ SilcIdType *ret_type, void *ret_id,
+ SilcUInt32 ret_id_size)
{
SilcBufferStruct buffer;
SilcIdType type;
{
SilcBufferStruct buffer;
SilcIdType type;
-
ui
nt16 idlen;
- unsigned char *id_data
= NULL
;
+
SilcUI
nt16 idlen;
+ unsigned char *id_data;
int ret;
int ret;
- void *id;
silc_buffer_set(&buffer, (unsigned char *)data, len);
ret = silc_buffer_unformat(&buffer,
silc_buffer_set(&buffer, (unsigned char *)data, len);
ret = silc_buffer_unformat(&buffer,
@@
-99,23
+102,31
@@
void *silc_id_payload_parse_id(const unsigned char *data, uint32 len)
if (ret == -1)
goto err;
if (ret == -1)
goto err;
+ if (type > SILC_ID_CHANNEL)
+ goto err;
+
silc_buffer_pull(&buffer, 4);
silc_buffer_pull(&buffer, 4);
- if (idlen >
buffer.len
)
+ if (idlen >
silc_buffer_len(&buffer) || idlen > SILC_PACKET_MAX_ID_LEN
)
goto err;
ret = silc_buffer_unformat(&buffer,
goto err;
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI_XNSTRING
_ALLOC
(&id_data, idlen),
+ SILC_STR_UI_XNSTRING(&id_data, idlen),
SILC_STR_END);
if (ret == -1)
goto err;
SILC_STR_END);
if (ret == -1)
goto err;
- id = silc_id_str2id(id_data, idlen, type);
- silc_free(id_data);
- return id;
+ if (!silc_id_str2id(id_data, idlen, type, ret_id, ret_id_size))
+ goto err;
+
+ if (ret_type)
+ *ret_type = type;
+
+ return TRUE;
err:
err:
- return NULL;
+ SILC_LOG_DEBUG(("Error parsing ID payload"));
+ return FALSE;
}
/* Encodes ID Payload */
}
/* Encodes ID Payload */
@@
-123,28
+134,24
@@
void *silc_id_payload_parse_id(const unsigned char *data, uint32 len)
SilcBuffer silc_id_payload_encode(const void *id, SilcIdType type)
{
SilcBuffer buffer;
SilcBuffer silc_id_payload_encode(const void *id, SilcIdType type)
{
SilcBuffer buffer;
- unsigned char
*id_data
;
-
ui
nt32 len;
+ unsigned char
id_data[32]
;
+
SilcUI
nt32 len;
- i
d_data = silc_id_id2str(id, type);
-
len = silc_id_get_len(id, type)
;
+ i
f (!silc_id_id2str(id, type, id_data, sizeof(id_data), &len))
+
return NULL
;
buffer = silc_id_payload_encode_data((const unsigned char *)id_data,
len, type);
buffer = silc_id_payload_encode_data((const unsigned char *)id_data,
len, type);
- silc_free(id_data);
return buffer;
}
SilcBuffer silc_id_payload_encode_data(const unsigned char *id,
return buffer;
}
SilcBuffer silc_id_payload_encode_data(const unsigned char *id,
-
ui
nt32 id_len, SilcIdType type)
+
SilcUI
nt32 id_len, SilcIdType type)
{
SilcBuffer buffer;
{
SilcBuffer buffer;
- SILC_LOG_DEBUG(("Encoding %s ID payload",
- type == SILC_ID_CLIENT ? "Client" :
- type == SILC_ID_SERVER ? "Server" : "Channel"));
-
- buffer = silc_buffer_alloc(4 + id_len);
- silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
+ buffer = silc_buffer_alloc_size(4 + id_len);
+ if (!buffer)
+ return NULL;
silc_buffer_format(buffer,
SILC_STR_UI_SHORT(type),
SILC_STR_UI_SHORT(id_len),
silc_buffer_format(buffer,
SILC_STR_UI_SHORT(type),
SILC_STR_UI_SHORT(id_len),
@@
-172,138
+179,158
@@
SilcIdType silc_id_payload_get_type(SilcIDPayload payload)
/* Get ID */
/* Get ID */
-void *silc_id_payload_get_id(SilcIDPayload payload)
+SilcBool silc_id_payload_get_id(SilcIDPayload payload, void *ret_id,
+ SilcUInt32 ret_id_len)
{
{
- return payload ? silc_id_str2id(payload->id, payload->len,
- payload->type) : NULL;
+ if (!payload)
+ return FALSE;
+ return silc_id_str2id(payload->id, payload->len, payload->type,
+ ret_id, ret_id_len);
}
/* Get raw ID data. Data is duplicated. */
unsigned char *silc_id_payload_get_data(SilcIDPayload payload)
{
}
/* Get raw ID data. Data is duplicated. */
unsigned char *silc_id_payload_get_data(SilcIDPayload payload)
{
- unsigned char *ret;
-
if (!payload)
return NULL;
if (!payload)
return NULL;
- ret = silc_calloc(payload->len, sizeof(*ret));
- memcpy(ret, payload->id, payload->len);
- return ret;
+ return silc_memdup(payload->id, payload->len);
}
/* Get length of ID */
}
/* Get length of ID */
-
ui
nt32 silc_id_payload_get_len(SilcIDPayload payload)
+
SilcUI
nt32 silc_id_payload_get_len(SilcIDPayload payload)
{
return payload ? payload->len : 0;
}
/* Converts ID to string. */
{
return payload ? payload->len : 0;
}
/* Converts ID to string. */
-unsigned char *silc_id_id2str(const void *id, SilcIdType type)
+SilcBool silc_id_id2str(const void *id, SilcIdType type,
+ unsigned char *ret_id, SilcUInt32 ret_id_size,
+ SilcUInt32 *ret_id_len)
{
{
- unsigned char *ret_id;
SilcServerID *server_id;
SilcClientID *client_id;
SilcChannelID *channel_id;
SilcServerID *server_id;
SilcClientID *client_id;
SilcChannelID *channel_id;
- uint32 id_len = silc_id_get_len(id, type);
+ SilcUInt32 id_len = silc_id_get_len(id, type);
+
+ if (id_len > ret_id_size)
+ return FALSE;
+
+ if (ret_id_len)
+ *ret_id_len = id_len;
+
+ if (id_len > SILC_PACKET_MAX_ID_LEN)
+ return FALSE;
switch(type) {
case SILC_ID_SERVER:
server_id = (SilcServerID *)id;
switch(type) {
case SILC_ID_SERVER:
server_id = (SilcServerID *)id;
- ret_id = silc_calloc(id_len, sizeof(unsigned char));
memcpy(ret_id, server_id->ip.data, server_id->ip.data_len);
memcpy(ret_id, server_id->ip.data, server_id->ip.data_len);
- SILC_PUT16_MSB(server_id->port, &ret_id[
4
]);
- SILC_PUT16_MSB(server_id->rnd, &ret_id[
6
]);
- return
ret_id
;
+ SILC_PUT16_MSB(server_id->port, &ret_id[
server_id->ip.data_len
]);
+ SILC_PUT16_MSB(server_id->rnd, &ret_id[
server_id->ip.data_len + 2
]);
+ return
TRUE
;
break;
case SILC_ID_CLIENT:
client_id = (SilcClientID *)id;
break;
case SILC_ID_CLIENT:
client_id = (SilcClientID *)id;
- ret_id = silc_calloc(id_len, sizeof(unsigned char));
memcpy(ret_id, client_id->ip.data, client_id->ip.data_len);
memcpy(ret_id, client_id->ip.data, client_id->ip.data_len);
- ret_id[4] = client_id->rnd;
- memcpy(&ret_id[5], client_id->hash, CLIENTID_HASH_LEN);
- return ret_id;
+ ret_id[client_id->ip.data_len] = client_id->rnd;
+ memcpy(&ret_id[client_id->ip.data_len + 1], client_id->hash,
+ CLIENTID_HASH_LEN);
+ return TRUE;
break;
case SILC_ID_CHANNEL:
channel_id = (SilcChannelID *)id;
break;
case SILC_ID_CHANNEL:
channel_id = (SilcChannelID *)id;
- ret_id = silc_calloc(id_len, sizeof(unsigned char));
memcpy(ret_id, channel_id->ip.data, channel_id->ip.data_len);
memcpy(ret_id, channel_id->ip.data, channel_id->ip.data_len);
- SILC_PUT16_MSB(channel_id->port, &ret_id[
4
]);
- SILC_PUT16_MSB(channel_id->rnd, &ret_id[
6
]);
- return
ret_id
;
+ SILC_PUT16_MSB(channel_id->port, &ret_id[
channel_id->ip.data_len
]);
+ SILC_PUT16_MSB(channel_id->rnd, &ret_id[
channel_id->ip.data_len + 2
]);
+ return
TRUE
;
break;
}
break;
}
- return
NULL
;
+ return
FALSE
;
}
/* Converts string to a ID */
}
/* Converts string to a ID */
-void *silc_id_str2id(const unsigned char *id, uint32 id_len, SilcIdType type)
+SilcBool silc_id_str2id(const unsigned char *id, SilcUInt32 id_len,
+ SilcIdType type, void *ret_id, SilcUInt32 ret_id_size)
{
{
+ if (id_len > SILC_PACKET_MAX_ID_LEN)
+ return FALSE;
switch(type) {
case SILC_ID_SERVER:
{
switch(type) {
case SILC_ID_SERVER:
{
- SilcServerID *server_id;
+ SilcServerID *server_id
= ret_id
;
if (id_len != ID_SERVER_LEN_PART + 4 &&
id_len != ID_SERVER_LEN_PART + 16)
if (id_len != ID_SERVER_LEN_PART + 4 &&
id_len != ID_SERVER_LEN_PART + 16)
- return
NULL
;
+ return
FALSE
;
- server_id = silc_calloc(1, sizeof(*server_id));
+ if (ret_id_size < sizeof(SilcServerID))
+ return FALSE;
+
+ memset(ret_id, 0, ret_id_size);
memcpy(server_id->ip.data, id, (id_len > ID_SERVER_LEN_PART + 4 ?
16 : 4));
server_id->ip.data_len = (id_len > ID_SERVER_LEN_PART + 4 ? 16 : 4);
memcpy(server_id->ip.data, id, (id_len > ID_SERVER_LEN_PART + 4 ?
16 : 4));
server_id->ip.data_len = (id_len > ID_SERVER_LEN_PART + 4 ? 16 : 4);
- SILC_GET16_MSB(server_id->port, &id[
4
]);
- SILC_GET16_MSB(server_id->rnd, &id[
6
]);
- return
server_id
;
+ SILC_GET16_MSB(server_id->port, &id[
server_id->ip.data_len
]);
+ SILC_GET16_MSB(server_id->rnd, &id[
server_id->ip.data_len + 2
]);
+ return
TRUE
;
}
break;
case SILC_ID_CLIENT:
{
}
break;
case SILC_ID_CLIENT:
{
- SilcClientID *client_id;
+ SilcClientID *client_id
= ret_id
;
if (id_len != ID_CLIENT_LEN_PART + 4 &&
id_len != ID_CLIENT_LEN_PART + 16)
if (id_len != ID_CLIENT_LEN_PART + 4 &&
id_len != ID_CLIENT_LEN_PART + 16)
- return NULL;
+ return FALSE;
+
+ if (ret_id_size < sizeof(SilcClientID))
+ return FALSE;
-
client_id = silc_calloc(1, sizeof(*client_id)
);
+
memset(ret_id, 0, ret_id_size
);
memcpy(client_id->ip.data, id, (id_len > ID_CLIENT_LEN_PART + 4 ?
16 : 4));
client_id->ip.data_len = (id_len > ID_CLIENT_LEN_PART + 4 ? 16 : 4);
memcpy(client_id->ip.data, id, (id_len > ID_CLIENT_LEN_PART + 4 ?
16 : 4));
client_id->ip.data_len = (id_len > ID_CLIENT_LEN_PART + 4 ? 16 : 4);
- client_id->rnd = id[4];
- memcpy(client_id->hash, &id[5], CLIENTID_HASH_LEN);
- return client_id;
+ client_id->rnd = id[client_id->ip.data_len];
+ memcpy(client_id->hash, &id[client_id->ip.data_len + 1],
+ CLIENTID_HASH_LEN);
+ return TRUE;
}
break;
case SILC_ID_CHANNEL:
{
}
break;
case SILC_ID_CHANNEL:
{
- SilcChannelID *channel_id;
+ SilcChannelID *channel_id
= ret_id
;
if (id_len != ID_CHANNEL_LEN_PART + 4 &&
id_len != ID_CHANNEL_LEN_PART + 16)
if (id_len != ID_CHANNEL_LEN_PART + 4 &&
id_len != ID_CHANNEL_LEN_PART + 16)
- return
NULL
;
+ return
FALSE
;
- channel_id = silc_calloc(1, sizeof(*channel_id));
+ if (ret_id_size < sizeof(SilcChannelID))
+ return FALSE;
+
+ memset(ret_id, 0, ret_id_size);
memcpy(channel_id->ip.data, id, (id_len > ID_CHANNEL_LEN_PART + 4 ?
16 : 4));
channel_id->ip.data_len = (id_len > ID_CHANNEL_LEN_PART + 4 ? 16 : 4);
memcpy(channel_id->ip.data, id, (id_len > ID_CHANNEL_LEN_PART + 4 ?
16 : 4));
channel_id->ip.data_len = (id_len > ID_CHANNEL_LEN_PART + 4 ? 16 : 4);
- SILC_GET16_MSB(channel_id->port, &id[
4
]);
- SILC_GET16_MSB(channel_id->rnd, &id[
6
]);
- return
channel_id
;
+ SILC_GET16_MSB(channel_id->port, &id[
channel_id->ip.data_len
]);
+ SILC_GET16_MSB(channel_id->rnd, &id[
channel_id->ip.data_len + 2
]);
+ return
TRUE
;
}
break;
}
}
break;
}
- return
NULL
;
+ return
FALSE
;
}
/* Returns length of the ID */
}
/* Returns length of the ID */
-
ui
nt32 silc_id_get_len(const void *id, SilcIdType type)
+
SilcUI
nt32 silc_id_get_len(const void *id, SilcIdType type)
{
switch(type) {
case SILC_ID_SERVER:
{
switch(type) {
case SILC_ID_SERVER:
@@
-336,26
+363,20
@@
void *silc_id_dup(const void *id, SilcIdType type)
switch(type) {
case SILC_ID_SERVER:
{
switch(type) {
case SILC_ID_SERVER:
{
- SilcServerID *server_id = (SilcServerID *)id, *new;
- new = silc_calloc(1, sizeof(*server_id));
- memcpy(new, server_id, sizeof(*server_id));
- return new;
+ SilcServerID *server_id = (SilcServerID *)id;
+ return silc_memdup(server_id, sizeof(*server_id));
}
break;
case SILC_ID_CLIENT:
{
}
break;
case SILC_ID_CLIENT:
{
- SilcClientID *client_id = (SilcClientID *)id, *new;
- new = silc_calloc(1, sizeof(*client_id));
- memcpy(new, client_id, sizeof(*client_id));
- return new;
+ SilcClientID *client_id = (SilcClientID *)id;
+ return silc_memdup(client_id, sizeof(*client_id));
}
break;
case SILC_ID_CHANNEL:
{
}
break;
case SILC_ID_CHANNEL:
{
- SilcChannelID *channel_id = (SilcChannelID *)id, *new;
- new = silc_calloc(1, sizeof(*channel_id));
- memcpy(new, channel_id, sizeof(*channel_id));
- return new;
+ SilcChannelID *channel_id = (SilcChannelID *)id;
+ return silc_memdup(channel_id, sizeof(*channel_id));
}
break;
}
}
break;
}