projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates. New data types.
[silc.git]
/
lib
/
silccore
/
silcprivate.c
diff --git
a/lib/silccore/silcprivate.c
b/lib/silccore/silcprivate.c
index 41d948e2daeddec433a9238ce9b3ab84cbd7bd42..789bde0e4ec39917f9d86537c562e351eeae9833 100644
(file)
--- a/
lib/silccore/silcprivate.c
+++ b/
lib/silccore/silcprivate.c
@@
-32,10
+32,10
@@
/* Private Message Payload structure. Contents of this structure is parsed
from SILC packets. */
struct SilcPrivateMessagePayloadStruct {
/* Private Message Payload structure. Contents of this structure is parsed
from SILC packets. */
struct SilcPrivateMessagePayloadStruct {
- u
nsigned short
flags;
- u
nsigned short
nickname_len;
+ u
int16
flags;
+ u
int16
nickname_len;
unsigned char *nickname;
unsigned char *nickname;
- u
nsigned short
message_len;
+ u
int16
message_len;
unsigned char *message;
};
unsigned char *message;
};
@@
-86,16
+86,16
@@
silc_private_message_payload_parse(SilcBuffer buffer, SilcCipher cipher)
the cipher is provided the packet is also encrypted here. It is provided
if the private message private keys are used. */
the cipher is provided the packet is also encrypted here. It is provided
if the private message private keys are used. */
-SilcBuffer silc_private_message_payload_encode(u
nsigned short
flags,
- u
nsigned int
nickname_len,
+SilcBuffer silc_private_message_payload_encode(u
int16
flags,
+ u
int32
nickname_len,
unsigned char *nickname,
unsigned char *nickname,
- u
nsigned short
data_len,
+ u
int16
data_len,
unsigned char *data,
SilcCipher cipher)
{
int i;
SilcBuffer buffer;
unsigned char *data,
SilcCipher cipher)
{
int i;
SilcBuffer buffer;
- u
nsigned int
len, pad_len = 0;
+ u
int32
len, pad_len = 0;
unsigned char pad[SILC_PACKET_MAX_PADLEN];
SILC_LOG_DEBUG(("Encoding private message payload"));
unsigned char pad[SILC_PACKET_MAX_PADLEN];
SILC_LOG_DEBUG(("Encoding private message payload"));
@@
-149,7
+149,7
@@
void silc_private_message_payload_free(SilcPrivateMessagePayload payload)
/* Return flags */
/* Return flags */
-u
nsigned short
+u
int16
silc_private_message_get_flags(SilcPrivateMessagePayload payload)
{
return payload->flags;
silc_private_message_get_flags(SilcPrivateMessagePayload payload)
{
return payload->flags;
@@
-159,7
+159,7
@@
silc_private_message_get_flags(SilcPrivateMessagePayload payload)
unsigned char *
silc_private_message_get_nickname(SilcPrivateMessagePayload payload,
unsigned char *
silc_private_message_get_nickname(SilcPrivateMessagePayload payload,
- u
nsigned int
*nickname_len)
+ u
int32
*nickname_len)
{
if (nickname_len)
*nickname_len = payload->nickname_len;
{
if (nickname_len)
*nickname_len = payload->nickname_len;
@@
-171,7
+171,7
@@
silc_private_message_get_nickname(SilcPrivateMessagePayload payload,
unsigned char *
silc_private_message_get_message(SilcPrivateMessagePayload payload,
unsigned char *
silc_private_message_get_message(SilcPrivateMessagePayload payload,
- u
nsigned int
*message_len)
+ u
int32
*message_len)
{
if (message_len)
*message_len = payload->message_len;
{
if (message_len)
*message_len = payload->message_len;