/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#include "gnunet-service-fs_put.h"
#include "gnunet-service-fs_cadet.h"
#include "fs.h"
+#include "fs_api.h"
/**
* Size for the hash map for DHT requests from the FS
*/
static struct GNUNET_CONFIGURATION_Handle *block_cfg;
+/**
+ * Private key of this peer. Used to sign LOC URI requests.
+ */
+static struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
+
/**
* ID of our task that we use to age the cover counters.
*/
-static GNUNET_SCHEDULER_TaskIdentifier cover_age_task;
+static struct GNUNET_SCHEDULER_Task * cover_age_task;
/**
* Datastore 'GET' load tracking.
*/
static struct GNUNET_PeerIdentity my_id;
+
/**
* Task that periodically ages our cover traffic statistics.
*
* @param cls unused closure
- * @param tc task context
*/
static void
-age_cover_counters (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+age_cover_counters (void *cls)
{
GSF_cover_content_count = (GSF_cover_content_count * 15) / 16;
GSF_cover_query_count = (GSF_cover_query_count * 15) / 16;
* 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)
+ * @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)
*/
int
GSF_test_get_load_too_high_ (uint32_t priority)
/**
* We've received peer performance information. Update
* our running average for the P2P latency.
-*
+ *
* @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)
- * @param ats_count number of performance records in 'ats'
+ * @param prop performance data for the address (as far as known)
*/
static void
update_latencies (void *cls,
int active,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ const struct GNUNET_ATS_Properties *prop)
{
- unsigned int i;
- struct GNUNET_TIME_Relative latency;
-
if (NULL == address)
{
/* ATS service temporarily disconnected */
if (GNUNET_YES != active)
return;
- for (i = 0; i < ats_count; i++)
- {
- if (GNUNET_ATS_QUALITY_NET_DELAY != ntohl (ats[i].type))
- continue;
- latency.rel_value_us = ntohl (ats[i].value);
- GSF_update_peer_latency_ (&address->peer,
- latency);
- 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_us / 1000LL, GNUNET_NO);
- break;
- }
+ GSF_update_peer_latency_ (&address->peer,
+ prop->delay);
+ GSF_avg_latency.rel_value_us =
+ (GSF_avg_latency.rel_value_us * 31 +
+ GNUNET_MIN (5000, prop->delay.rel_value_us)) / 32;
+ GNUNET_STATISTICS_set (GSF_stats,
+ gettext_noop ("# running average P2P latency (ms)"),
+ GSF_avg_latency.rel_value_us / 1000LL,
+ GNUNET_NO);
}
* @param other the other peer involved (sender or receiver, NULL
* for loopback messages where we are both sender and receiver)
* @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_p2p_put (void *cls, const struct GNUNET_PeerIdentity *other,
+handle_p2p_put (void *cls,
+ const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message)
{
struct GSF_ConnectedPeer *cp;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received P2P PUT from %s\n",
+ GNUNET_i2s (other));
cp = GSF_peer_get_ (other);
if (NULL == cp)
{
* We have a new request, consider forwarding it to the given
* peer.
*
- * @param cls the 'struct GSF_PendingRequest'
+ * @param cls the `struct GSF_PendingRequest`
* @param peer identity of the peer
* @param cp handle to the connected peer record
* @param ppd peer performance data
* @param result final datastore lookup result
*/
static void
-consider_forwarding (void *cls, struct GSF_PendingRequest *pr,
+consider_forwarding (void *cls,
+ struct GSF_PendingRequest *pr,
enum GNUNET_BLOCK_EvaluationResult result)
{
if (GNUNET_BLOCK_EVALUATION_OK_LAST == result)
return; /* we're done... */
- GSF_iterate_connected_peers_ (&consider_request_for_forwarding, pr);
+ if (GNUNET_YES !=
+ GSF_pending_request_test_active_ (pr))
+ return; /* request is not actually active, skip! */
+ GSF_iterate_connected_peers_ (&consider_request_for_forwarding,
+ pr);
}
* @param other the other peer involved (sender or receiver, NULL
* for loopback messages where we are both sender and receiver)
* @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- * GNUNET_SYSERR to close it (signal serious error)
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
*/
static int
-handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other,
+handle_p2p_get (void *cls,
+ const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message)
{
struct GSF_PendingRequest *pr;
- pr = GSF_handle_p2p_query_ (other, message);
+ pr = GSF_handle_p2p_query_ (other,
+ message);
if (NULL == pr)
- return GNUNET_SYSERR;
+ return GNUNET_OK; /* exists, identical to existing request, or malformed */
GSF_pending_request_get_data_ (pr)->has_started = GNUNET_YES;
- GSF_local_lookup_ (pr, &consider_forwarding, NULL);
+ GSF_local_lookup_ (pr,
+ &consider_forwarding,
+ NULL);
return GNUNET_OK;
}
* result status). Also signal that we can now
* receive more request information from the client.
*
- * @param cls the client doing the request ('struct GNUNET_SERVER_Client')
+ * @param cls the client doing the request (`struct GNUNET_SERVER_Client`)
* @param pr the pending request we were processing
* @param result final datastore lookup result
*/
static void
-start_p2p_processing (void *cls, struct GSF_PendingRequest *pr,
+start_p2p_processing (void *cls,
+ struct GSF_PendingRequest *pr,
enum GNUNET_BLOCK_EvaluationResult result)
{
struct GNUNET_SERVER_Client *client = cls;
struct GSF_PendingRequestData *prd;
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
+ if (GNUNET_BLOCK_EVALUATION_OK_LAST == result)
+ return; /* we're done, 'pr' was already destroyed... */
prd = GSF_pending_request_get_data_ (pr);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Finished database lookup for local request `%s' with result %d\n",
GNUNET_h2s (&prd->query), result);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- if (GNUNET_BLOCK_EVALUATION_OK_LAST == result)
- return; /* we're done, 'pr' was already destroyed... */
- if (0 != (GSF_PRO_LOCAL_ONLY & prd->options))
- {
- GSF_pending_request_cancel_ (pr, GNUNET_YES);
- return;
- }
if (0 == prd->anonymity_level)
{
switch (prd->type)
/**
- * Handle START_SEARCH-message (search request from client).
+ * Handle #GNUNET_MESSAGE_TYPE_FS_START_SEARCH-message (search request
+ * from client).
*
* @param cls closure
* @param client identification of the client
* @param message the actual message
*/
static void
-handle_start_search (void *cls, struct GNUNET_SERVER_Client *client,
+handle_start_search (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct GSF_PendingRequest *pr;
int ret;
pr = NULL;
- ret = GSF_local_client_start_search_handler_ (client, message, &pr);
+ ret = GSF_local_client_start_search_handler_ (client,
+ message,
+ &pr);
switch (ret)
{
case GNUNET_SYSERR:
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
break;
case GNUNET_NO:
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
break;
case GNUNET_YES:
GSF_pending_request_get_data_ (pr)->has_started = GNUNET_YES;
- GSF_local_lookup_ (pr, &start_p2p_processing, client);
+ GSF_local_lookup_ (pr,
+ &start_p2p_processing,
+ client);
break;
default:
GNUNET_assert (0);
}
+/**
+ * Handle request to sign a LOC URI (from client).
+ *
+ * @param cls closure (NULL)
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_loc_sign (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct RequestLocSignatureMessage *msg;
+ struct GNUNET_FS_Uri base;
+ struct GNUNET_FS_Uri *loc;
+ struct ResponseLocSignatureMessage resp;
+ struct GSF_LocalClient *lc;
+
+ msg = (const struct RequestLocSignatureMessage *) message;
+ GNUNET_break (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT ==
+ ntohl (msg->purpose));
+ base.type = GNUNET_FS_URI_CHK;
+ base.data.chk.chk = msg->chk;
+ base.data.chk.file_length = GNUNET_ntohll (msg->file_length);
+ loc = GNUNET_FS_uri_loc_create (&base,
+ pk,
+ GNUNET_TIME_absolute_ntoh (msg->expiration_time));
+ resp.header.size = htons (sizeof (struct ResponseLocSignatureMessage));
+ resp.header.type = htons (GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGNATURE);
+ resp.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
+ resp.expiration_time = GNUNET_TIME_absolute_hton (loc->data.loc.expirationTime);
+ resp.signature = loc->data.loc.contentSignature;
+ resp.peer = loc->data.loc.peer;
+ GNUNET_FS_uri_destroy (loc);
+ lc = GSF_local_client_lookup_ (client);
+ GSF_local_client_transmit_ (lc,
+ &resp.header);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
/**
* Task run during shutdown.
*
* @param cls unused
- * @param tc unused
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
GSF_cadet_stop_client ();
GSF_cadet_stop_server ();
block_cfg = NULL;
GNUNET_STATISTICS_destroy (GSF_stats, GNUNET_NO);
GSF_stats = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != cover_age_task)
+ if (NULL != cover_age_task)
{
GNUNET_SCHEDULER_cancel (cover_age_task);
- cover_age_task = GNUNET_SCHEDULER_NO_TASK;
+ cover_age_task = NULL;
}
GNUNET_FS_indexing_done ();
GNUNET_LOAD_value_free (datastore_get_load);
* peer connects, giving us a chance to decide about submitting
* the existing request to the new peer.
*
- * @param cls the 'struct GSF_ConnectedPeer' of the new peer
+ * @param cls the `struct GSF_ConnectedPeer` of the new peer
* @param key query for the request
* @param pr handle to the pending request
- * @return GNUNET_YES to continue to iterate
+ * @return #GNUNET_YES to continue to iterate
*/
static int
-consider_peer_for_forwarding (void *cls, const struct GNUNET_HashCode * key,
+consider_peer_for_forwarding (void *cls,
+ const struct GNUNET_HashCode *key,
struct GSF_PendingRequest *pr)
{
struct GSF_ConnectedPeer *cp = cls;
struct GNUNET_PeerIdentity pid;
+ if (GNUNET_YES !=
+ GSF_pending_request_test_active_ (pr))
+ return GNUNET_YES; /* request is not actually active, skip! */
GSF_connected_peer_get_identity_ (cp, &pid);
- if (GNUNET_YES != GSF_pending_request_test_target_ (pr, &pid))
+ if (GNUNET_YES !=
+ GSF_pending_request_test_target_ (pr, &pid))
{
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Loopback routes suppressed"), 1,
+ gettext_noop ("# Loopback routes suppressed"),
+ 1,
GNUNET_NO);
return GNUNET_YES;
}
}
+/**
+ * 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.
*
* @param peer peer identity this notification is about
*/
static void
-peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
+peer_connect_handler (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
- struct GSF_ConnectedPeer *cp;
-
- if (0 == memcmp (&my_id, peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 ==
+ GNUNET_CRYPTO_cmp_peer_identity (&my_id,
+ peer))
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);
}
peer_init_handler (void *cls,
const struct GNUNET_PeerIdentity *my_identity)
{
- my_id = *my_identity;
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_id,
+ my_identity))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Peer identity missmatch, refusing to start!\n");
+ GNUNET_SCHEDULER_shutdown ();
+ }
}
const struct GNUNET_CONFIGURATION_Handle *c)
{
static const struct GNUNET_CORE_MessageHandler no_p2p_handlers[] = {
- {NULL, 0, 0}
+ { NULL, 0, 0 }
};
static const struct GNUNET_CORE_MessageHandler p2p_handlers[] = {
- {&handle_p2p_get,
- GNUNET_MESSAGE_TYPE_FS_GET, 0},
- {&handle_p2p_put,
- GNUNET_MESSAGE_TYPE_FS_PUT, 0},
- {&GSF_handle_p2p_migration_stop_,
- GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP,
- sizeof (struct MigrationStopMessage)},
- {NULL, 0, 0}
+ { &handle_p2p_get,
+ GNUNET_MESSAGE_TYPE_FS_GET, 0 },
+ { &handle_p2p_put,
+ GNUNET_MESSAGE_TYPE_FS_PUT, 0 },
+ { &GSF_handle_p2p_migration_stop_,
+ GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP,
+ sizeof (struct MigrationStopMessage) },
+ { NULL, 0, 0 }
};
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
- {&GNUNET_FS_handle_index_start, NULL,
- GNUNET_MESSAGE_TYPE_FS_INDEX_START, 0},
- {&GNUNET_FS_handle_index_list_get, NULL,
- GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET,
- sizeof (struct GNUNET_MessageHeader)},
- {&GNUNET_FS_handle_unindex, NULL, GNUNET_MESSAGE_TYPE_FS_UNINDEX,
- sizeof (struct UnindexMessage)},
- {&handle_start_search, NULL, GNUNET_MESSAGE_TYPE_FS_START_SEARCH,
- 0},
+ { &GNUNET_FS_handle_index_start, NULL,
+ GNUNET_MESSAGE_TYPE_FS_INDEX_START, 0 },
+ { &GNUNET_FS_handle_index_list_get, NULL,
+ GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET,
+ sizeof (struct GNUNET_MessageHeader) },
+ { &GNUNET_FS_handle_unindex, NULL,
+ GNUNET_MESSAGE_TYPE_FS_UNINDEX,
+ sizeof (struct UnindexMessage) },
+ { &handle_start_search, NULL,
+ GNUNET_MESSAGE_TYPE_FS_START_SEARCH, 0 },
+ { &handle_loc_sign, NULL,
+ GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGN,
+ sizeof (struct RequestLocSignatureMessage) },
{NULL, NULL, 0, 0}
};
int anon_p2p_off;
+ char *keyfile;
/* this option is really only for testcases that need to disable
_anonymous_ file-sharing for some reason */
GNUNET_CONFIGURATION_get_value_yesno (GSF_cfg,
"fs",
"DISABLE_ANON_TRANSFER"));
- GSF_core =
- GNUNET_CORE_connect (GSF_cfg, NULL, &peer_init_handler,
- &peer_connect_handler, &GSF_peer_disconnect_handler_,
- NULL, GNUNET_NO, NULL, GNUNET_NO,
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (GSF_cfg,
+ "PEER",
+ "PRIVATE_KEY",
+ &keyfile))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("FS service is lacking HOSTKEY configuration setting. Exiting.\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ return GNUNET_SYSERR;
+ }
+ pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile);
+ GNUNET_free (keyfile);
+ GNUNET_assert (NULL != pk);
+ GNUNET_CRYPTO_eddsa_key_get_public (pk,
+ &my_id.public_key);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "I am peer %s\n",
+ GNUNET_i2s (&my_id));
+ GSF_core
+ = GNUNET_CORE_connect (GSF_cfg, NULL,
+ &peer_init_handler,
+ &peer_connect_handler,
+ &GSF_peer_disconnect_handler_,
+ NULL, GNUNET_NO,
+ NULL, GNUNET_NO,
(GNUNET_YES == anon_p2p_off)
? no_p2p_handlers
: p2p_handlers);
(GNUNET_OK != main_init (server, cfg)))
{
GNUNET_SCHEDULER_shutdown ();
- shutdown_task (NULL, NULL);
+ shutdown_task (NULL);
return;
}
}
projects / oweals / gnunet.git / blobdiff