[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15508 - gnunet/src/chat
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15508 - gnunet/src/chat |
Date: |
Fri, 10 Jun 2011 11:06:07 +0200 |
Author: grothoff
Date: 2011-06-10 11:06:07 +0200 (Fri, 10 Jun 2011)
New Revision: 15508
Modified:
gnunet/src/chat/chat.c
gnunet/src/chat/gnunet-service-chat.c
Log:
fix for 1685
Modified: gnunet/src/chat/chat.c
===================================================================
--- gnunet/src/chat/chat.c 2011-06-09 23:10:27 UTC (rev 15507)
+++ gnunet/src/chat/chat.c 2011-06-10 09:06:07 UTC (rev 15508)
@@ -187,8 +187,9 @@
receipt->header.size = htons (msg_size);
receipt->header.type =
htons (GNUNET_MESSAGE_TYPE_CHAT_CONFIRMATION_RECEIPT);
+ receipt->reserved = htonl (0);
receipt->sequence_number = src->received_msg->sequence_number;
- receipt->reserved2 = 0;
+ receipt->reserved2 = htonl (0);
receipt->timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
GNUNET_CRYPTO_rsa_key_get_public (src->chat_room->my_private_key, &pub_key);
GNUNET_CRYPTO_hash (&pub_key,
@@ -565,6 +566,7 @@
join_msg->msg_options = htonl (chat_room->msg_options);
join_msg->room_name_len = htons (room_len);
join_msg->reserved = htons (0);
+ join_msg->reserved2 = htonl (0);
GNUNET_CRYPTO_rsa_key_get_public (chat_room->my_private_key,
&join_msg->public_key);
room = (char *) &join_msg[1];
memcpy (room, chat_room->room_name, room_len);
Modified: gnunet/src/chat/gnunet-service-chat.c
===================================================================
--- gnunet/src/chat/gnunet-service-chat.c 2011-06-09 23:10:27 UTC (rev
15507)
+++ gnunet/src/chat/gnunet-service-chat.c 2011-06-10 09:06:07 UTC (rev
15508)
@@ -474,7 +474,7 @@
p2p_rnmsg->msg_options = trmsg->msg_options;
p2p_rnmsg->sequence_number = trmsg->sequence_number;
p2p_rnmsg->timestamp = trmsg->timestamp;
- p2p_rnmsg->reserved = 0;
+ p2p_rnmsg->reserved = htons (0);
p2p_rnmsg->sender = rnmsg->sender;
p2p_rnmsg->target = trmsg->target;
if (is_anon)
@@ -523,6 +523,7 @@
m->msg_options = htonl (entry->msg_options);
m->room_name_len = htons (room_len);
m->reserved = htons (0);
+ m->reserved2 = htonl (0);
m->public_key = entry->public_key;
roomptr = (char *) &m[1];
memcpy (roomptr, entry->room, room_len);
@@ -826,6 +827,7 @@
p2p_crmsg = GNUNET_malloc (sizeof (struct
P2PConfirmationReceiptMessage));
p2p_crmsg->header.size = htons (sizeof (struct
P2PConfirmationReceiptMessage));
p2p_crmsg->header.type = htons
(GNUNET_MESSAGE_TYPE_CHAT_P2P_CONFIRMATION_RECEIPT);
+ p2p_crmsg->reserved = htonl (0);
p2p_crmsg->signature = receipt->signature;
p2p_crmsg->purpose = receipt->purpose;
p2p_crmsg->msg_sequence_number = receipt->sequence_number;
@@ -909,7 +911,7 @@
m = buf;
m->header.type = htons (GNUNET_MESSAGE_TYPE_CHAT_P2P_LEAVE_NOTIFICATION);
m->header.size = htons (msg_size);
- m->reserved = htons (0);
+ m->reserved = htonl (0);
m->user = *public_key;
GNUNET_free (public_key);
return msg_size;
@@ -1336,6 +1338,7 @@
rnmsg->header.type = htons (GNUNET_MESSAGE_TYPE_CHAT_MESSAGE_NOTIFICATION);
rnmsg->msg_options = p2p_rnmsg->msg_options;
rnmsg->sequence_number = p2p_rnmsg->sequence_number;
+ rnmsg->reserved = htonl (0);
rnmsg->timestamp = p2p_rnmsg->timestamp;
is_priv = (0 != memcmp (&all_zeros,
&p2p_rnmsg->target, sizeof (GNUNET_HashCode)));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15508 - gnunet/src/chat,
gnunet <=