[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13115 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13115 - gnunet/src/core |
Date: |
Fri, 1 Oct 2010 21:21:19 +0200 |
Author: durner
Date: 2010-10-01 21:21:19 +0200 (Fri, 01 Oct 2010)
New Revision: 13115
Modified:
gnunet/src/core/gnunet-service-core.c
Log:
reintroduce seeds, fix calculations
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2010-10-01 17:51:05 UTC (rev
13114)
+++ gnunet/src/core/gnunet-service-core.c 2010-10-01 19:21:19 UTC (rev
13115)
@@ -228,8 +228,7 @@
/**
* Seed for the IV
*/
- /* FIXME: Does adding this member break things (why?) */
- /*uint32_t iv_seed GNUNET_PACKED;*/
+ uint32_t iv_seed GNUNET_PACKED;
/**
* Random number chosen to make reply harder.
@@ -259,8 +258,7 @@
/**
* Seed for the IV
*/
- /* FIXME: Does adding this member break things (why?) */
- /*uint32_t iv_seed GNUNET_PACKED;*/
+ uint32_t iv_seed GNUNET_PACKED;
/**
* Random number proochosen to make reply harder. Must be
@@ -1324,7 +1322,7 @@
&pp.challenge,
&pm->challenge,
sizeof (struct PingMessage) -
- sizeof (struct GNUNET_MessageHeader));
+ ((void *) &pm->challenge - (void *) pm));
process_encrypted_neighbour_queue (n);
/* reschedule PING job */
left = GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_add
(n->last_activity,
@@ -2733,7 +2731,7 @@
&pp.challenge,
&pm->challenge,
sizeof (struct PingMessage) -
- sizeof (struct GNUNET_MessageHeader));
+ ((void *) &pm->challenge - (void *) pm));
GNUNET_STATISTICS_update (stats,
gettext_noop ("# SET_KEY and PING messages
created"),
1,
@@ -2849,7 +2847,7 @@
&m->challenge,
&t.challenge,
sizeof (struct PingMessage) -
- sizeof (struct GNUNET_MessageHeader)))
+ ((void *) &m->challenge - (void *) m)))
return;
#if DEBUG_HANDSHAKE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2890,7 +2888,7 @@
&tx.challenge,
&tp->challenge,
sizeof (struct PongMessage) -
- sizeof (struct GNUNET_MessageHeader));
+ ((void *) &tp->challenge - (void *) tp));
GNUNET_STATISTICS_update (stats,
gettext_noop ("# PONG messages created"),
1,
@@ -2933,7 +2931,7 @@
&m->challenge,
&t.challenge,
sizeof (struct PongMessage) -
- sizeof (struct GNUNET_MessageHeader)))
+ ((void *) &m->challenge - (void *) m)))
{
GNUNET_break_op (0);
return;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13115 - gnunet/src/core,
gnunet <=