projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silccore
/
silcchannel.c
diff --git
a/lib/silccore/silcchannel.c
b/lib/silccore/silcchannel.c
index 0784a3b69ba2cc4d9911a13e4553bcc2e21aae26..ae6ac4be73493973807189e916b875809ddc6176 100644
(file)
--- a/
lib/silccore/silcchannel.c
+++ b/
lib/silccore/silcchannel.c
@@
-33,17
+33,17
@@
/* Channel Message Payload structure. Contents of this structure is parsed
from SILC packets. */
struct SilcChannelPayloadStruct {
/* Channel Message Payload structure. Contents of this structure is parsed
from SILC packets. */
struct SilcChannelPayloadStruct {
-
ui
nt16 name_len;
+
SilcUI
nt16 name_len;
unsigned char *channel_name;
unsigned char *channel_name;
-
ui
nt16 id_len;
+
SilcUI
nt16 id_len;
unsigned char *channel_id;
unsigned char *channel_id;
-
ui
nt32 mode;
+
SilcUI
nt32 mode;
};
/* Parses channel payload returning new channel payload structure. */
SilcChannelPayload silc_channel_payload_parse(const unsigned char *payload,
};
/* Parses channel payload returning new channel payload structure. */
SilcChannelPayload silc_channel_payload_parse(const unsigned char *payload,
-
ui
nt32 payload_len)
+
SilcUI
nt32 payload_len)
{
SilcBufferStruct buffer;
SilcChannelPayload new;
{
SilcBufferStruct buffer;
SilcChannelPayload new;
@@
-81,7
+81,7
@@
SilcChannelPayload silc_channel_payload_parse(const unsigned char *payload,
/* Parses list of channel payloads returning list of payloads. */
SilcDList silc_channel_payload_parse_list(const unsigned char *payload,
/* Parses list of channel payloads returning list of payloads. */
SilcDList silc_channel_payload_parse_list(const unsigned char *payload,
-
ui
nt32 payload_len)
+
SilcUI
nt32 payload_len)
{
SilcBufferStruct buffer;
SilcDList list;
{
SilcBufferStruct buffer;
SilcDList list;
@@
-129,10
+129,10
@@
SilcDList silc_channel_payload_parse_list(const unsigned char *payload,
/* Encode new channel payload and returns it as buffer. */
SilcBuffer silc_channel_payload_encode(const unsigned char *channel_name,
/* Encode new channel payload and returns it as buffer. */
SilcBuffer silc_channel_payload_encode(const unsigned char *channel_name,
-
ui
nt16 channel_name_len,
+
SilcUI
nt16 channel_name_len,
const unsigned char *channel_id,
const unsigned char *channel_id,
-
ui
nt32 channel_id_len,
-
ui
nt32 mode)
+
SilcUI
nt32 channel_id_len,
+
SilcUI
nt32 mode)
{
SilcBuffer buffer;
{
SilcBuffer buffer;
@@
-182,7
+182,7
@@
void silc_channel_payload_list_free(SilcDList list)
/* Return the channel name */
unsigned char *silc_channel_get_name(SilcChannelPayload payload,
/* Return the channel name */
unsigned char *silc_channel_get_name(SilcChannelPayload payload,
-
ui
nt32 *channel_name_len)
+
SilcUI
nt32 *channel_name_len)
{
if (channel_name_len)
*channel_name_len = payload->name_len;
{
if (channel_name_len)
*channel_name_len = payload->name_len;
@@
-193,7
+193,7
@@
unsigned char *silc_channel_get_name(SilcChannelPayload payload,
/* Return the channel ID */
unsigned char *silc_channel_get_id(SilcChannelPayload payload,
/* Return the channel ID */
unsigned char *silc_channel_get_id(SilcChannelPayload payload,
-
ui
nt32 *channel_id_len)
+
SilcUI
nt32 *channel_id_len)
{
if (channel_id_len)
*channel_id_len = payload->id_len;
{
if (channel_id_len)
*channel_id_len = payload->id_len;
@@
-213,7
+213,7
@@
SilcChannelID *silc_channel_get_id_parse(SilcChannelPayload payload)
channel or perhaps the mode of the client on the channel. The protocol
dictates what the usage of the mode is in different circumstances. */
channel or perhaps the mode of the client on the channel. The protocol
dictates what the usage of the mode is in different circumstances. */
-
ui
nt32 silc_channel_get_mode(SilcChannelPayload payload)
+
SilcUI
nt32 silc_channel_get_mode(SilcChannelPayload payload)
{
return payload->mode;
}
{
return payload->mode;
}
@@
-230,7
+230,7
@@
uint32 silc_channel_get_mode(SilcChannelPayload payload)
from SILC packets. */
struct SilcChannelMessagePayloadStruct {
SilcMessageFlags flags;
from SILC packets. */
struct SilcChannelMessagePayloadStruct {
SilcMessageFlags flags;
-
ui
nt16 data_len;
+
SilcUI
nt16 data_len;
unsigned char *data;
unsigned char *mac;
unsigned char *iv;
unsigned char *data;
unsigned char *mac;
unsigned char *iv;
@@
-247,7
+247,7
@@
bool silc_channel_message_payload_decrypt(unsigned char *data,
SilcCipher cipher,
SilcHmac hmac)
{
SilcCipher cipher,
SilcHmac hmac)
{
-
ui
nt32 iv_len, mac_len;
+
SilcUI
nt32 iv_len, mac_len;
unsigned char *end, *mac, mac2[32];
unsigned char *dst, iv[SILC_CIPHER_MAX_IV_SIZE];
unsigned char *end, *mac, mac2[32];
unsigned char *dst, iv[SILC_CIPHER_MAX_IV_SIZE];
@@
-299,14
+299,14
@@
bool silc_channel_message_payload_decrypt(unsigned char *data,
SilcChannelMessagePayload
silc_channel_message_payload_parse(unsigned char *payload,
SilcChannelMessagePayload
silc_channel_message_payload_parse(unsigned char *payload,
-
ui
nt32 payload_len,
+
SilcUI
nt32 payload_len,
SilcCipher cipher,
SilcHmac hmac)
{
SilcBufferStruct buffer;
SilcChannelMessagePayload new;
int ret;
SilcCipher cipher,
SilcHmac hmac)
{
SilcBufferStruct buffer;
SilcChannelMessagePayload new;
int ret;
-
ui
nt32 iv_len, mac_len;
+
SilcUI
nt32 iv_len, mac_len;
SILC_LOG_DEBUG(("Parsing channel message payload"));
SILC_LOG_DEBUG(("Parsing channel message payload"));
@@
-353,17
+353,17
@@
silc_channel_message_payload_parse(unsigned char *payload,
encrypted separately from other parts of the packet padding must
be applied to the payload. */
encrypted separately from other parts of the packet padding must
be applied to the payload. */
-SilcBuffer silc_channel_message_payload_encode(
ui
nt16 flags,
-
ui
nt16 data_len,
+SilcBuffer silc_channel_message_payload_encode(
SilcUI
nt16 flags,
+
SilcUI
nt16 data_len,
const unsigned char *data,
const unsigned char *data,
-
ui
nt16 iv_len,
+
SilcUI
nt16 iv_len,
unsigned char *iv,
SilcCipher cipher,
SilcHmac hmac)
{
int i;
SilcBuffer buffer;
unsigned char *iv,
SilcCipher cipher,
SilcHmac hmac)
{
int i;
SilcBuffer buffer;
-
ui
nt32 len, pad_len, mac_len;
+
SilcUI
nt32 len, pad_len, mac_len;
unsigned char pad[16];
unsigned char mac[32];
unsigned char pad[16];
unsigned char mac[32];
@@
-436,7
+436,7
@@
silc_channel_message_get_flags(SilcChannelMessagePayload payload)
/* Return data */
unsigned char *silc_channel_message_get_data(SilcChannelMessagePayload payload,
/* Return data */
unsigned char *silc_channel_message_get_data(SilcChannelMessagePayload payload,
-
ui
nt32 *data_len)
+
SilcUI
nt32 *data_len)
{
if (data_len)
*data_len = payload->data_len;
{
if (data_len)
*data_len = payload->data_len;
@@
-467,11
+467,11
@@
unsigned char *silc_channel_message_get_iv(SilcChannelMessagePayload payload)
/* Channel Key Payload structrue. Channel keys are parsed from SILC
packets into this structure. */
struct SilcChannelKeyPayloadStruct {
/* Channel Key Payload structrue. Channel keys are parsed from SILC
packets into this structure. */
struct SilcChannelKeyPayloadStruct {
-
ui
nt16 id_len;
+
SilcUI
nt16 id_len;
unsigned char *id;
unsigned char *id;
-
ui
nt16 cipher_len;
+
SilcUI
nt16 cipher_len;
unsigned char *cipher;
unsigned char *cipher;
-
ui
nt16 key_len;
+
SilcUI
nt16 key_len;
unsigned char *key;
};
unsigned char *key;
};
@@
-479,7
+479,7
@@
struct SilcChannelKeyPayloadStruct {
SilcChannelKeyPayload
silc_channel_key_payload_parse(const unsigned char *payload,
SilcChannelKeyPayload
silc_channel_key_payload_parse(const unsigned char *payload,
-
ui
nt32 payload_len)
+
SilcUI
nt32 payload_len)
{
SilcBufferStruct buffer;
SilcChannelKeyPayload new;
{
SilcBufferStruct buffer;
SilcChannelKeyPayload new;
@@
-522,15
+522,15
@@
silc_channel_key_payload_parse(const unsigned char *payload,
/* Encodes channel key payload into a buffer and returns it. This is used
to add channel key payload into a packet. */
/* 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(
ui
nt16 id_len,
+SilcBuffer silc_channel_key_payload_encode(
SilcUI
nt16 id_len,
const unsigned char *id,
const unsigned char *id,
-
ui
nt16 cipher_len,
+
SilcUI
nt16 cipher_len,
const unsigned char *cipher,
const unsigned char *cipher,
-
ui
nt16 key_len,
+
SilcUI
nt16 key_len,
const unsigned char *key)
{
SilcBuffer buffer;
const unsigned char *key)
{
SilcBuffer buffer;
-
ui
nt32 len;
+
SilcUI
nt32 len;
SILC_LOG_DEBUG(("Encoding channel key payload"));
SILC_LOG_DEBUG(("Encoding channel key payload"));
@@
-572,7
+572,7
@@
void silc_channel_key_payload_free(SilcChannelKeyPayload payload)
/* Return ID */
unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload,
/* Return ID */
unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload,
-
ui
nt32 *id_len)
+
SilcUI
nt32 *id_len)
{
if (id_len)
*id_len = payload->id_len;
{
if (id_len)
*id_len = payload->id_len;
@@
-583,7
+583,7
@@
unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload,
/* Return cipher name */
unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload,
/* Return cipher name */
unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload,
-
ui
nt32 *cipher_len)
+
SilcUI
nt32 *cipher_len)
{
if (cipher_len)
*cipher_len = payload->cipher_len;
{
if (cipher_len)
*cipher_len = payload->cipher_len;
@@
-594,7
+594,7
@@
unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload,
/* Return key */
unsigned char *silc_channel_key_get_key(SilcChannelKeyPayload payload,
/* Return key */
unsigned char *silc_channel_key_get_key(SilcChannelKeyPayload payload,
-
ui
nt32 *key_len)
+
SilcUI
nt32 *key_len)
{
if (key_len)
*key_len = payload->key_len;
{
if (key_len)
*key_len = payload->key_len;