#include "gnunet-service-fs_pr.h"
#include "gnunet-service-fs_push.h"
#include "gnunet-service-fs_put.h"
-#include "gnunet-service-fs_mesh.h"
+#include "gnunet-service-fs_cadet.h"
#include "fs.h"
/**
int active,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *ats,
+ const struct GNUNET_ATS_Information *ats,
uint32_t ats_count)
{
unsigned int i;
struct GNUNET_TIME_Relative latency;
+ if (NULL == address)
+ {
+ /* ATS service temporarily disconnected */
+ return;
+ }
+
if (GNUNET_YES != active)
- return;
+ return;
for (i = 0; i < ats_count; i++)
{
if (GNUNET_ATS_QUALITY_NET_DELAY != ntohl (ats[i].type))
gettext_noop
("# running average P2P latency (ms)"),
GSF_avg_latency.rel_value_us / 1000LL, GNUNET_NO);
- break;
+ break;
}
}
{
case GNUNET_BLOCK_TYPE_FS_DBLOCK:
case GNUNET_BLOCK_TYPE_FS_IBLOCK:
- /* the above block types MAY be available via 'mesh' */
+ /* the above block types MAY be available via 'cadet' */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Considering mesh-based download for block\n");
- GSF_mesh_lookup_ (pr);
- break;
+ "Considering cadet-based download for block\n");
+ GSF_cadet_lookup_ (pr);
+ break;
case GNUNET_BLOCK_TYPE_FS_UBLOCK:
/* the above block types are in the DHT */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GSF_mesh_stop_client ();
- GSF_mesh_stop_server ();
+ GSF_cadet_stop_client ();
+ GSF_cadet_stop_server ();
if (NULL != GSF_core)
{
GNUNET_CORE_disconnect (GSF_core);
}
+/**
+ * Function called after the creation of a connected peer record is complete.
+ *
+ * @param cls closure (unused)
+ * @param cp handle to the newly created connected peer record
+ */
+static void
+connected_peer_cb (void *cls, struct GSF_ConnectedPeer *cp)
+{
+ if (NULL == cp)
+ return;
+ GSF_iterate_pending_requests_ (&consider_peer_for_forwarding, cp);
+}
+
+
/**
* Method called whenever a given peer connects.
*
static void
peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- struct GSF_ConnectedPeer *cp;
-
if (0 == memcmp (&my_id, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
- cp = GSF_peer_connect_handler_ (peer);
- if (NULL == cp)
- return;
- GSF_iterate_pending_requests_ (&consider_peer_for_forwarding, cp);
+ GSF_peer_connect_handler_ (peer, &connected_peer_cb, NULL);
}
anon_p2p_off = (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_yesno (GSF_cfg,
"fs",
- "DISABLE_ANON_TRANSFER"));
+ "DISABLE_ANON_TRANSFER"));
GSF_core =
GNUNET_CORE_connect (GSF_cfg, NULL, &peer_init_handler,
&peer_connect_handler, &GSF_peer_disconnect_handler_,
GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY, &age_cover_counters,
NULL);
datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE);
- GSF_mesh_start_server ();
- GSF_mesh_start_client ();
+ GSF_cadet_start_server ();
+ GSF_cadet_start_client ();
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
return GNUNET_OK;