#include "gnunet-service-fs_pr.h"
#include "gnunet-service-fs_push.h"
#include "gnunet-service-fs_put.h"
-#include "gnunet-service-fs_stream.h"
+#include "gnunet-service-fs_mesh.h"
#include "fs.h"
/**
struct GNUNET_TIME_Relative delay;
delay = GNUNET_TIME_absolute_get_duration (start);
- GNUNET_LOAD_update (datastore_get_load, delay.rel_value);
+ GNUNET_LOAD_update (datastore_get_load, delay.rel_value_us);
}
* to even consider processing the query at
* all.
*
+ * @param priority priority of the request (used as a reference point to compare with the load)
* @return GNUNET_YES if the load is too high to do anything (load high)
* GNUNET_NO to process normally (load normal)
* GNUNET_SYSERR to process for free (load low)
*
* @param cls closure
* @param address the address
+ * @param active is this address in active use
* @param bandwidth_out assigned outbound bandwidth for the connection
* @param bandwidth_in assigned inbound bandwidth for the connection
* @param ats performance data for the address (as far as known)
static void
update_latencies (void *cls,
const struct GNUNET_HELLO_Address *address,
- unsigned int active,
+ 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;
{
if (GNUNET_ATS_QUALITY_NET_DELAY != ntohl (ats[i].type))
continue;
- latency.rel_value = ntohl (ats[i].value);
+ latency.rel_value_us = ntohl (ats[i].value);
GSF_update_peer_latency_ (&address->peer,
latency);
- GSF_avg_latency.rel_value =
- (GSF_avg_latency.rel_value * 31 +
+ GSF_avg_latency.rel_value_us =
+ (GSF_avg_latency.rel_value_us * 31 +
GNUNET_MIN (5000, ntohl (ats[i].value))) / 32;
GNUNET_STATISTICS_set (GSF_stats,
gettext_noop
("# running average P2P latency (ms)"),
- GSF_avg_latency.rel_value, GNUNET_NO);
- break;
+ GSF_avg_latency.rel_value_us / 1000LL, GNUNET_NO);
+ break;
}
}
{
case GNUNET_BLOCK_TYPE_FS_DBLOCK:
case GNUNET_BLOCK_TYPE_FS_IBLOCK:
- /* the above block types MAY be available via 'stream' */
+ /* the above block types MAY be available via 'mesh' */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Considering stream-based download for block\n");
- GSF_stream_lookup_ (pr);
- break;
+ "Considering mesh-based download for block\n");
+ GSF_mesh_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_stream_stop ();
+ GSF_mesh_stop_client ();
+ GSF_mesh_stop_server ();
if (NULL != GSF_core)
{
GNUNET_CORE_disconnect (GSF_core);
* directly (which should work if you are authorized...).
*
* @param cls closure
- * @param server handle to the server, NULL if we failed
* @param my_identity ID of this peer, NULL if we failed
*/
static void
-peer_init_handler (void *cls, struct GNUNET_CORE_Handle *server,
+peer_init_handler (void *cls,
const struct GNUNET_PeerIdentity *my_identity)
{
my_id = *my_identity;
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_stream_start ();
+ GSF_mesh_start_server ();
+ GSF_mesh_start_client ();
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
return GNUNET_OK;
GSF_rt_entry_lifetime = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_FOREVER_REL);
GSF_stats = GNUNET_STATISTICS_create ("fs", cfg);
block_cfg = GNUNET_CONFIGURATION_create ();
- GNUNET_CONFIGURATION_set_value_string (block_cfg, "block", "PLUGINS", "fs");
GSF_block_ctx = GNUNET_BLOCK_context_create (block_cfg);
GNUNET_assert (NULL != GSF_block_ctx);
GSF_dht = GNUNET_DHT_connect (cfg, FS_DHT_HT_SIZE);
GSF_plan_init ();
GSF_pending_request_init_ ();
GSF_connected_peer_init_ ();
- GSF_ats = GNUNET_ATS_performance_init (GSF_cfg, NULL, NULL, &update_latencies, NULL);
+ GSF_ats = GNUNET_ATS_performance_init (GSF_cfg, &update_latencies, NULL);
GSF_push_init_ ();
GSF_put_init_ ();
if ((GNUNET_OK != GNUNET_FS_indexing_init (cfg, GSF_dsh)) ||