[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (28bfcbd63 -> aa033d451)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (28bfcbd63 -> aa033d451) |
|
Date: |
Mon, 14 Mar 2022 01:50:16 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository gnunet.
from 28bfcbd63 -add sanity check on local inputs, fix assertion
new d5285fadb implement nicer path truncation where we keep the part of
the path that did verify
new aa033d451 slightly beautify alg
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/block/bg_bf.c | 4 +-
src/dht/gnunet-service-dht_neighbours.c | 166 +++++++++++++++-----------------
2 files changed, 82 insertions(+), 88 deletions(-)
diff --git a/src/block/bg_bf.c b/src/block/bg_bf.c
index ae8ee0e51..601f605a2 100644
--- a/src/block/bg_bf.c
+++ b/src/block/bg_bf.c
@@ -61,7 +61,7 @@ struct BfGroupInternals
* @return #GNUNET_OK on success, #GNUNET_NO if serialization is not
* supported, #GNUNET_SYSERR on error
*/
-static int
+static enum GNUNET_GenericReturnValue
bf_group_serialize_cb (struct GNUNET_BLOCK_Group *bg,
uint32_t *nonce,
void **raw_data,
@@ -124,7 +124,7 @@ bf_group_mark_seen_cb (struct GNUNET_BLOCK_Group *bg,
* @return #GNUNET_OK on success, #GNUNET_NO if the nonces were different and
thus
* we failed.
*/
-static int
+static enum GNUNET_GenericReturnValue
bf_group_merge_cb (struct GNUNET_BLOCK_Group *bg1,
const struct GNUNET_BLOCK_Group *bg2)
{
diff --git a/src/dht/gnunet-service-dht_neighbours.c
b/src/dht/gnunet-service-dht_neighbours.c
index 9aea34354..2f9cbab84 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -39,10 +39,15 @@
__VA_ARGS__)
/**
- * Enable slow sanity checks to debug issues.
- * 0: do not check
- * 1: check all external inputs
- * 2: check internal computations as well
+ * Enable slow sanity checks to debug issues.
+ *
+ * TODO: might want to eventually implement probabilistic
+ * load-based path verification, but for now it is all or nothing
+ * based on this define.
+ *
+ * 0: do not check -- if signatures become performance critical
+ * 1: check all external inputs -- normal production for now
+ * 2: check internal computations as well -- for debugging
*/
#define SANITY_CHECKS 2
@@ -886,11 +891,8 @@ get_forward_count (uint16_t hop_count,
uint32_t random_value;
uint32_t forward_count;
float target_value;
+ float rm1;
- if (0 == target_replication)
- target_replication = 1; /* 0 is verboten */
- if (target_replication > GNUNET_DHT_MAXIMUM_REPLICATION_LEVEL)
- target_replication = GNUNET_DHT_MAXIMUM_REPLICATION_LEVEL;
if (hop_count > GDS_NSE_get () * 4.0)
{
/* forcefully terminate */
@@ -905,15 +907,15 @@ get_forward_count (uint16_t hop_count,
/* Once we have reached our ideal number of hops, only forward to 1 peer */
return 1;
}
- /* bound by system-wide maximum */
+ /* bound by system-wide maximum and minimum */
+ if (0 == target_replication)
+ target_replication = 1; /* 0 is verboten */
target_replication =
GNUNET_MIN (GNUNET_DHT_MAXIMUM_REPLICATION_LEVEL,
target_replication);
+ rm1 = target_replication - 1.0;
target_value =
- 1 + (target_replication - 1.0) / (GDS_NSE_get ()
- + ((float) (target_replication - 1.0)
- * hop_count));
-
+ 1 + (rm1) / (GDS_NSE_get () + (rm1 * hop_count));
/* Set forward count to floor of target_value */
forward_count = (uint32_t) target_value;
@@ -1796,45 +1798,6 @@ handle_dht_p2p_put (void *cls,
GNUNET_break_op (0);
return;
}
- {
-#if SANITY_CHECKS
- struct GNUNET_DHT_PathElement pp[putlen + 1];
-
- GNUNET_memcpy (pp,
- put_path,
- putlen * sizeof(struct GNUNET_DHT_PathElement));
- pp[putlen].pred = peer->id;
- /* zero-out signature, not valid until we actually do forward! */
- memset (&pp[putlen].sig,
- 0,
- sizeof (pp[putlen].sig));
- for (unsigned int i = 0; i <= putlen; i++)
- {
- for (unsigned int j = 0; j < i; j++)
- {
- GNUNET_break (0 !=
- GNUNET_memcmp (&pp[i].pred,
- &pp[j].pred));
- }
- if (i < putlen)
- GNUNET_break (0 !=
- GNUNET_memcmp (&pp[i].pred,
- &peer->id));
- }
- if (0 !=
- GNUNET_DHT_verify_path (bd.data,
- bd.data_size,
- bd.expiration_time,
- pp,
- putlen + 1,
- NULL, 0, /* get_path */
- &GDS_my_identity))
- {
- GNUNET_break_op (0);
- putlen = 0;
- }
-#endif
- }
if (0 == (options & GNUNET_DHT_RO_RECORD_ROUTE))
putlen = 0;
GNUNET_STATISTICS_update (GDS_stats,
@@ -1888,6 +1851,8 @@ handle_dht_p2p_put (void *cls,
bd.put_path_length = putlen + 1;
if (0 != (options & GNUNET_DHT_RO_RECORD_ROUTE))
{
+ unsigned int failure_offset;
+
GNUNET_memcpy (pp,
put_path,
putlen * sizeof(struct GNUNET_DHT_PathElement));
@@ -1896,6 +1861,29 @@ handle_dht_p2p_put (void *cls,
memset (&pp[putlen].sig,
0,
sizeof (pp[putlen].sig));
+#if SANITY_CHECKS
+ /* TODO: might want to eventually implement probabilistic
+ load-based path verification, but for now it is all or nothing */
+ failure_offset
+ = GNUNET_DHT_verify_path (bd.data,
+ bd.data_size,
+ bd.expiration_time,
+ pp,
+ putlen + 1,
+ NULL, 0, /* get_path */
+ &GDS_my_identity);
+#else
+ failure_offset = 0;
+#endif
+ if (0 != failure_offset)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Recorded put path invalid at offset %u, truncating\n",
+ failure_offset);
+ GNUNET_assert (failure_offset <= putlen);
+ bd.put_path = &pp[failure_offset];
+ bd.put_path_length = putlen - failure_offset;
+ }
}
else
{
@@ -2365,7 +2353,7 @@ handle_dht_p2p_result (void *cls,
};
const struct GNUNET_DHT_PathElement *get_path
= &bd.put_path[bd.put_path_length];
-
+
/* parse and validate message */
if (GNUNET_TIME_absolute_is_past (bd.expiration_time))
{
@@ -2389,34 +2377,6 @@ handle_dht_p2p_result (void *cls,
GNUNET_break_op (0);
return;
}
- {
-#if SANITY_CHECKS
- struct GNUNET_DHT_PathElement gpx[get_path_length + 1];
-
- memcpy (gpx,
- get_path,
- get_path_length
- * sizeof (struct GNUNET_DHT_PathElement));
- gpx[get_path_length].pred = peer->id;
- memset (&gpx[get_path_length].sig,
- 0,
- sizeof (gpx[get_path_length].sig));
- if (0 !=
- GNUNET_DHT_verify_path (bd.data,
- bd.data_size,
- bd.expiration_time,
- bd.put_path,
- bd.put_path_length,
- gpx,
- get_path_length + 1,
- &GDS_my_identity))
- {
- GNUNET_break_op (0);
- get_path_length = 0;
- bd.put_path_length = 0;
- }
-#endif
- }
GNUNET_STATISTICS_update (GDS_stats,
"# P2P RESULTS received",
1,
@@ -2434,18 +2394,17 @@ handle_dht_p2p_result (void *cls,
bd.data_size,
&bd.key);
if (GNUNET_NO == ret)
- {
bd.key = prm->key;
- return;
- }
}
/* if we got a HELLO, consider it for our own routing table */
hello_check (&bd);
- /* Need to append 'peer' to 'get_path' (normal case) */
+ /* Need to append 'peer' to 'get_path' */
{
struct GNUNET_DHT_PathElement xget_path[get_path_length + 1];
+ struct GNUNET_DHT_PathElement *gp = xget_path;
+ unsigned int failure_offset;
GNUNET_memcpy (xget_path,
get_path,
@@ -2454,6 +2413,41 @@ handle_dht_p2p_result (void *cls,
memset (&xget_path[get_path_length].sig,
0,
sizeof (xget_path[get_path_length].sig));
+#if SANITY_CHECKS
+ /* TODO: might want to eventually implement probabilistic
+ load-based path verification, but for now it is all or nothing */
+ failure_offset
+ = GNUNET_DHT_verify_path (bd.data,
+ bd.data_size,
+ bd.expiration_time,
+ bd.put_path,
+ bd.put_path_length,
+ xget_path,
+ get_path_length + 1,
+ &GDS_my_identity);
+#else
+ failure_offset = 0;
+#endif
+ if (0 != failure_offset)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Recorded path invalid at offset %u, truncating\n",
+ failure_offset);
+ GNUNET_assert (failure_offset <= bd.put_path_length + get_path_length);
+ if (failure_offset >= bd.put_path_length)
+ {
+ /* failure on get path */
+ get_path_length -= (failure_offset - bd.put_path_length);
+ gp = &xget_path[failure_offset - bd.put_path_length];
+ bd.put_path_length = 0;
+ }
+ else
+ {
+ /* failure on put path */
+ bd.put_path = &bd.put_path[failure_offset];
+ bd.put_path_length -= failure_offset;
+ }
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Extending GET path of length %u with %s\n",
get_path_length,
@@ -2461,7 +2455,7 @@ handle_dht_p2p_result (void *cls,
GNUNET_break (process_reply_with_path (&bd,
&prm->key,
get_path_length + 1,
- xget_path));
+ gp));
}
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (28bfcbd63 -> aa033d451),
gnunet <=