X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilcchannel.h;h=60a19de9eedfc9692c8a8d0d055496e7cfb12543;hb=72cfa31520ebc0058763a30e21c13f6e9a964aa0;hp=813ad69437c4c64596da9e140c3195cc623d5106;hpb=2be0be2432fff760084c4093291e79f1fa6262d8;p=silc.git

diff --git a/lib/silccore/silcchannel.h b/lib/silccore/silcchannel.h
index 813ad694..60a19de9 100644
--- a/lib/silccore/silcchannel.h
+++ b/lib/silccore/silcchannel.h
@@ -36,7 +36,7 @@ typedef struct SilcChannelMessagePayloadStruct *SilcChannelMessagePayload;
 typedef struct SilcChannelKeyPayloadStruct *SilcChannelKeyPayload;
 
 /* The Message flag type */
-typedef unsigned short SilcMessageFlags;
+typedef uint16 SilcMessageFlags;
 
 /* The message flags (shared by both channel and private messages) */
 #define SILC_MESSAGE_FLAG_NONE        0x0000
@@ -52,18 +52,18 @@ typedef unsigned short SilcMessageFlags;
 SilcChannelPayload silc_channel_payload_parse(SilcBuffer buffer);
 SilcDList silc_channel_payload_parse_list(SilcBuffer 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);
 void silc_channel_payload_free(SilcChannelPayload payload);
 void silc_channel_payload_list_free(SilcDList list);
 unsigned char *silc_channel_get_name(SilcChannelPayload payload,
-				     unsigned int *channel_name_len);
+				     uint32 *channel_name_len);
 unsigned char *silc_channel_get_id(SilcChannelPayload payload,
-				   unsigned int *channel_id_len);
+				   uint32 *channel_id_len);
 SilcChannelID *silc_channel_get_id_parse(SilcChannelPayload payload);
-unsigned int silc_channel_get_mode(SilcChannelPayload payload);
+uint32 silc_channel_get_mode(SilcChannelPayload payload);
 int silc_channel_message_payload_decrypt(unsigned char *data,
 					 size_t data_len,
 					 SilcCipher cipher,
@@ -72,33 +72,33 @@ SilcChannelMessagePayload
 silc_channel_message_payload_parse(SilcBuffer buffer,
 				   SilcCipher cipher,
 				   SilcHmac hmac);
-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);
 void silc_channel_message_payload_free(SilcChannelMessagePayload payload);
-unsigned short 
+uint16 
 silc_channel_message_get_flags(SilcChannelMessagePayload payload);
 unsigned char *silc_channel_message_get_data(SilcChannelMessagePayload payload,
-				     unsigned int *data_len);
+				     uint32 *data_len);
 unsigned char *silc_channel_message_get_mac(SilcChannelMessagePayload payload);
 unsigned char *silc_channel_message_get_iv(SilcChannelMessagePayload payload);
 SilcChannelKeyPayload silc_channel_key_payload_parse(SilcBuffer buffer);
-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);
 void silc_channel_key_payload_free(SilcChannelKeyPayload payload);
 unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload, 
-				       unsigned int *id_len);
+				       uint32 *id_len);
 unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload,
-					   unsigned int *cipher_len);
+					   uint32 *cipher_len);
 unsigned char *silc_channel_key_get_key(SilcChannelKeyPayload payload,
-					unsigned int *key_len);
+					uint32 *key_len);
 
 #endif