[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: PEERSTORE: Fix peerstore monitor RPC
From: |
gnunet |
Subject: |
[gnunet] branch master updated: PEERSTORE: Fix peerstore monitor RPC |
Date: |
Sun, 25 Feb 2024 19:44:54 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new dd0a5ec1c PEERSTORE: Fix peerstore monitor RPC
dd0a5ec1c is described below
commit dd0a5ec1cc0f39026993883aa5980eae526f5ce8
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Feb 25 19:44:50 2024 +0100
PEERSTORE: Fix peerstore monitor RPC
---
src/service/peerstore/peerstore_api.c | 3 +++
src/service/peerstore/peerstore_api_monitor.c | 12 +++++++++---
src/service/transport/gnunet-service-transport.c | 7 +++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/service/peerstore/peerstore_api.c
b/src/service/peerstore/peerstore_api.c
index 3b945928a..19cb1213e 100644
--- a/src/service/peerstore/peerstore_api.c
+++ b/src/service/peerstore/peerstore_api.c
@@ -889,6 +889,9 @@ hello_add_iter (void *cls, const struct
GNUNET_PEERSTORE_Record *record,
}
if (GNUNET_TIME_absolute_cmp (record->expiry, >, hello_exp))
{
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Not storing hello for %s since we seem to have a newer version on
record.\n",
+ GNUNET_i2s (&huc->pid));
huc->cont (huc->cont_cls, GNUNET_OK);
GNUNET_PEERSTORE_iteration_stop (huc->ic);
GNUNET_free (huc->hello);
diff --git a/src/service/peerstore/peerstore_api_monitor.c
b/src/service/peerstore/peerstore_api_monitor.c
index 8badb43eb..fff0b3eb0 100644
--- a/src/service/peerstore/peerstore_api_monitor.c
+++ b/src/service/peerstore/peerstore_api_monitor.c
@@ -198,6 +198,7 @@ reconnect (struct GNUNET_PEERSTORE_Monitor *mc)
struct GNUNET_MQ_Envelope *env;
struct PeerstoreMonitorStartMessage *sm;
size_t key_len = 0;
+ size_t ss_size = 0;
if (NULL != mc->mq)
{
@@ -213,9 +214,11 @@ reconnect (struct GNUNET_PEERSTORE_Monitor *mc)
return;
if (NULL != mc->key)
key_len = strlen (mc->key) + 1;
+ if (NULL != mc->sub_system)
+ ss_size = strlen (mc->sub_system) + 1;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending MONITOR_START\n");
env = GNUNET_MQ_msg_extra (sm,
- htons (key_len),
+ htons (key_len) + htons (ss_size),
GNUNET_MESSAGE_TYPE_PEERSTORE_MONITOR_START);
sm->iterate_first = htons (mc->iterate_first);
if (NULL != mc->peer)
@@ -223,8 +226,11 @@ reconnect (struct GNUNET_PEERSTORE_Monitor *mc)
sm->peer = *mc->peer;
sm->peer_set = htons (GNUNET_YES);
}
+ if (NULL != mc->sub_system)
+ GNUNET_memcpy (&sm[1], mc->sub_system, ss_size);
+ sm->sub_system_size = htons (ss_size);
if (NULL != mc->key)
- GNUNET_memcpy (&sm[1], mc->key, key_len);
+ GNUNET_memcpy (((char*) &sm[1]) + ss_size, mc->key, key_len);
sm->key_size = htons (key_len);
GNUNET_MQ_send (mc->mq, env);
}
@@ -255,7 +261,7 @@ GNUNET_PEERSTORE_monitor_start (const struct
GNUNET_CONFIGURATION_Handle *cfg,
mc->key = key;
mc->peer = peer;
mc->iterate_first = iterate_first;
- mc->sub_system = sub_system;
+ mc->sub_system = GNUNET_strdup (sub_system);
mc->cfg = cfg;
reconnect (mc);
if (NULL == mc->mq)
diff --git a/src/service/transport/gnunet-service-transport.c
b/src/service/transport/gnunet-service-transport.c
index 6d2ba4139..344f46f1e 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -5750,6 +5750,13 @@ store_pi (void *cls)
GNUNET_free (address_uri);
return;
}
+ else
+ {
+
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Storing our address `%s'\n",
+ address_uri);
+ }
// FIXME hello_mono_time used here?? What about expiration in ale?
GNUNET_HELLO_sign_address (ale->address,
ale->nt,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: PEERSTORE: Fix peerstore monitor RPC,
gnunet <=