X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilcchannel.c;h=ca783cc6da02eecf6471a02aab396878b3860db6;hb=72cfa31520ebc0058763a30e21c13f6e9a964aa0;hp=1dc0f438b6250116926a12280e3c88994ff9f8fa;hpb=2be0be2432fff760084c4093291e79f1fa6262d8;p=silc.git diff --git a/lib/silccore/silcchannel.c b/lib/silccore/silcchannel.c index 1dc0f438..ca783cc6 100644 --- a/lib/silccore/silcchannel.c +++ b/lib/silccore/silcchannel.c @@ -33,11 +33,11 @@ /* Channel Message Payload structure. Contents of this structure is parsed from SILC packets. */ struct SilcChannelPayloadStruct { - unsigned short name_len; + uint16 name_len; unsigned char *channel_name; - unsigned short id_len; + uint16 id_len; unsigned char *channel_id; - unsigned int mode; + uint32 mode; }; /* Parses channel payload returning new channel payload structure. */ @@ -123,10 +123,10 @@ SilcDList silc_channel_payload_parse_list(SilcBuffer buffer) /* Encode new channel payload and returns it as buffer. */ SilcBuffer silc_channel_payload_encode(unsigned char *channel_name, - unsigned short channel_name_len, + uint16 channel_name_len, unsigned char *channel_id, - unsigned int channel_id_len, - unsigned int mode) + uint32 channel_id_len, + uint32 mode) { SilcBuffer buffer; @@ -176,7 +176,7 @@ void silc_channel_payload_list_free(SilcDList list) /* Return the channel name */ unsigned char *silc_channel_get_name(SilcChannelPayload payload, - unsigned int *channel_name_len) + uint32 *channel_name_len) { if (channel_name_len) *channel_name_len = payload->name_len; @@ -187,7 +187,7 @@ unsigned char *silc_channel_get_name(SilcChannelPayload payload, /* Return the channel ID */ unsigned char *silc_channel_get_id(SilcChannelPayload payload, - unsigned int *channel_id_len) + uint32 *channel_id_len) { if (channel_id_len) *channel_id_len = payload->id_len; @@ -207,7 +207,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. */ -unsigned int silc_channel_get_mode(SilcChannelPayload payload) +uint32 silc_channel_get_mode(SilcChannelPayload payload) { return payload->mode; } @@ -221,8 +221,8 @@ unsigned int silc_channel_get_mode(SilcChannelPayload payload) /* Channel Message Payload structure. Contents of this structure is parsed from SILC packets. */ struct SilcChannelMessagePayloadStruct { - unsigned short flags; - unsigned short data_len; + uint16 flags; + uint16 data_len; unsigned char *data; unsigned char *mac; unsigned char *iv; @@ -235,7 +235,7 @@ int silc_channel_message_payload_decrypt(unsigned char *data, SilcCipher cipher, SilcHmac hmac) { - unsigned int iv_len, mac_len; + uint32 iv_len, mac_len; unsigned char *end, *mac, mac2[32]; /* Decrypt the channel message. First push the IV out of the packet. @@ -279,7 +279,7 @@ silc_channel_message_payload_parse(SilcBuffer buffer, { SilcChannelMessagePayload new; int ret; - unsigned int iv_len, mac_len; + uint32 iv_len, mac_len; SILC_LOG_DEBUG(("Parsing channel message payload")); @@ -324,17 +324,17 @@ silc_channel_message_payload_parse(SilcBuffer buffer, encrypted separately from other parts of the packet padding must be applied to the payload. */ -SilcBuffer silc_channel_message_payload_encode(unsigned short flags, - unsigned short data_len, +SilcBuffer silc_channel_message_payload_encode(uint16 flags, + uint16 data_len, unsigned char *data, - unsigned short iv_len, + uint16 iv_len, unsigned char *iv, SilcCipher cipher, SilcHmac hmac) { int i; SilcBuffer buffer; - unsigned int len, pad_len, mac_len; + uint32 len, pad_len, mac_len; unsigned char pad[SILC_PACKET_MAX_PADLEN]; unsigned char mac[32]; @@ -398,7 +398,7 @@ void silc_channel_message_payload_free(SilcChannelMessagePayload payload) /* Return flags */ -unsigned short +uint16 silc_channel_message_get_flags(SilcChannelMessagePayload payload) { return payload->flags; @@ -407,7 +407,7 @@ silc_channel_message_get_flags(SilcChannelMessagePayload payload) /* Return data */ unsigned char *silc_channel_message_get_data(SilcChannelMessagePayload payload, - unsigned int *data_len) + uint32 *data_len) { if (data_len) *data_len = payload->data_len; @@ -438,11 +438,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 { - unsigned short id_len; + uint16 id_len; unsigned char *id; - unsigned short cipher_len; + uint16 cipher_len; unsigned char *cipher; - unsigned short key_len; + uint16 key_len; unsigned char *key; }; @@ -489,15 +489,15 @@ SilcChannelKeyPayload silc_channel_key_payload_parse(SilcBuffer buffer) /* 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(unsigned short id_len, +SilcBuffer silc_channel_key_payload_encode(uint16 id_len, unsigned char *id, - unsigned short cipher_len, + uint16 cipher_len, unsigned char *cipher, - unsigned short key_len, + uint16 key_len, unsigned char *key) { SilcBuffer buffer; - unsigned int len; + uint32 len; SILC_LOG_DEBUG(("Encoding channel key payload")); @@ -539,7 +539,7 @@ void silc_channel_key_payload_free(SilcChannelKeyPayload payload) /* Return ID */ unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload, - unsigned int *id_len) + uint32 *id_len) { if (id_len) *id_len = payload->id_len; @@ -550,7 +550,7 @@ unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload, /* Return cipher name */ unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload, - unsigned int *cipher_len) + uint32 *cipher_len) { if (cipher_len) *cipher_len = payload->cipher_len; @@ -561,7 +561,7 @@ unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload, /* Return key */ unsigned char *silc_channel_key_get_key(SilcChannelKeyPayload payload, - unsigned int *key_len) + uint32 *key_len) { if (key_len) *key_len = payload->key_len;