#define INSANE_STATISTICS GNUNET_NO
+
+/**
+ * Doubly-linked list of requests we are performing
+ * on behalf of the same client.
+ */
+struct ClientRequest
+{
+
+ /**
+ * This is a doubly-linked list.
+ */
+ struct ClientRequest *next;
+
+ /**
+ * This is a doubly-linked list.
+ */
+ struct ClientRequest *prev;
+
+ /**
+ * Request this entry represents.
+ */
+ struct GSF_PendingRequest *pr;
+
+ /**
+ * Client list this request belongs to.
+ */
+ struct GSF_LocalClient *lc;
+
+ /**
+ * Task scheduled to destroy the request.
+ */
+ struct GNUNET_SCHEDULER_Task * kill_task;
+
+};
+
+
+/**
+ * Replies to be transmitted to the client. The actual
+ * response message is allocated after this struct.
+ */
+struct ClientResponse
+{
+ /**
+ * This is a doubly-linked list.
+ */
+ struct ClientResponse *next;
+
+ /**
+ * This is a doubly-linked list.
+ */
+ struct ClientResponse *prev;
+
+ /**
+ * Client list entry this response belongs to.
+ */
+ struct GSF_LocalClient *lc;
+
+ /**
+ * Number of bytes in the response.
+ */
+ size_t msize;
+};
+
+
+/**
+ * Information we track while handling an index
+ * start request from a client.
+ */
+struct IndexStartContext
+{
+
+ /**
+ * This is a doubly linked list.
+ */
+ struct IndexStartContext *next;
+
+ /**
+ * This is a doubly linked list.
+ */
+ struct IndexStartContext *prev;
+
+ /**
+ * Name of the indexed file.
+ */
+ char *filename;
+
+ /**
+ * Context for transmitting confirmation to client.
+ */
+ struct GSF_LocalClient *lc;
+
+ /**
+ * Context for hashing of the file.
+ */
+ struct GNUNET_CRYPTO_FileHashContext *fhc;
+
+ /**
+ * Hash of the contents of the file.
+ */
+ struct GNUNET_HashCode file_id;
+
+};
+
+
+/**
+ * A local client.
+ */
+struct GSF_LocalClient
+{
+
+ /**
+ * ID of the client.
+ */
+ struct GNUNET_SERVICE_Client *client;
+
+ /**
+ * Queue for sending replies.
+ */
+ struct GNUNET_MQ_Handle *mq;
+
+ /**
+ * Head of list of requests performed on behalf
+ * of this client right now.
+ */
+ struct ClientRequest *cr_head;
+
+ /**
+ * Tail of list of requests performed on behalf
+ * of this client right now.
+ */
+ struct ClientRequest *cr_tail;
+
+ /**
+ * This is a doubly linked list.
+ */
+ struct IndexStartContext *isc_head;
+
+ /**
+ * This is a doubly linked list.
+ */
+ struct IndexStartContext *isc_tail;
+
+ /**
+ * Head of linked list of responses.
+ */
+ struct ClientResponse *res_head;
+
+ /**
+ * Tail of linked list of responses.
+ */
+ struct ClientResponse *res_tail;
+
+};
+
+
/* ****************************** globals ****************************** */
/**
*/
int GSF_enable_randomized_delays;
+/**
+ * Identity of this peer.
+ */
+struct GNUNET_PeerIdentity GSF_my_id;
+
/* ***************************** locals ******************************* */
/**
*/
static struct GNUNET_LOAD_Value *datastore_get_load;
+
/**
- * Identity of this peer.
+ * Creates a fresh local client handle.
+ *
+ * @param cls NULL
+ * @param client handle of the client
+ * @param mq message queue for @a client
+ * @return handle to local client entry
*/
-struct GNUNET_PeerIdentity GSF_my_id;
+static void *
+client_connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ struct GNUNET_MQ_Handle *mq)
+{
+ struct GSF_LocalClient *pos;
+
+ pos = GNUNET_new (struct GSF_LocalClient);
+ pos->client = client;
+ pos->mq = mq;
+ return pos;
+}
+
+
+/**
+ * Free the given client request.
+ *
+ * @param cls the client request to free
+ */
+static void
+client_request_destroy (void *cls)
+{
+ struct ClientRequest *cr = cls;
+ struct GSF_LocalClient *lc = cr->lc;
+
+ cr->kill_task = NULL;
+ GNUNET_CONTAINER_DLL_remove (lc->cr_head,
+ lc->cr_tail,
+ cr);
+ GSF_pending_request_cancel_ (cr->pr,
+ GNUNET_YES);
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# client searches active"),
+ -1,
+ GNUNET_NO);
+ GNUNET_free (cr);
+}
+
+
+/**
+ * Handle a reply to a pending request. Also called if a request
+ * expires (then with data == NULL). The handler may be called
+ * many times (depending on the request type), but will not be
+ * called during or after a call to #GSF_pending_request_cancel()
+ * and will also not be called anymore after a call signalling
+ * expiration.
+ *
+ * @param cls user-specified closure
+ * @param eval evaluation of the result
+ * @param pr handle to the original pending request
+ * @param reply_anonymity_level anonymity level for the reply, UINT32_MAX for "unknown"
+ * @param expiration when does @a data expire?
+ * @param last_transmission when was the last time we've tried to download this block? (FOREVER if unknown)
+ * @param type type of the block
+ * @param data response data, NULL on request expiration
+ * @param data_len number of bytes in @a data
+ */
+static void
+client_response_handler (void *cls,
+ enum GNUNET_BLOCK_EvaluationResult eval,
+ struct GSF_PendingRequest *pr,
+ uint32_t reply_anonymity_level,
+ struct GNUNET_TIME_Absolute expiration,
+ struct GNUNET_TIME_Absolute last_transmission,
+ enum GNUNET_BLOCK_Type type,
+ const void *data,
+ size_t data_len)
+{
+ struct ClientRequest *cr = cls;
+ struct GSF_LocalClient *lc;
+ struct GNUNET_MQ_Envelope *env;
+ struct ClientPutMessage *pm;
+ const struct GSF_PendingRequestData *prd;
+
+ if (NULL == data)
+ {
+ /* local-only request, with no result, clean up. */
+ if (NULL == cr->kill_task)
+ cr->kill_task = GNUNET_SCHEDULER_add_now (&client_request_destroy,
+ cr);
+ return;
+ }
+ prd = GSF_pending_request_get_data_ (pr);
+ GNUNET_break (type != GNUNET_BLOCK_TYPE_ANY);
+ if ((prd->type != type) && (prd->type != GNUNET_BLOCK_TYPE_ANY))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# replies received for local clients"), 1,
+ GNUNET_NO);
+ GNUNET_assert (pr == cr->pr);
+ lc = cr->lc;
+ env = GNUNET_MQ_msg_extra (pm,
+ data_len,
+ GNUNET_MESSAGE_TYPE_FS_PUT);
+ pm->type = htonl (type);
+ pm->expiration = GNUNET_TIME_absolute_hton (expiration);
+ pm->last_transmission = GNUNET_TIME_absolute_hton (last_transmission);
+ pm->num_transmissions = htonl (prd->num_transmissions);
+ pm->respect_offered = htonl (prd->respect_offered);
+ GNUNET_memcpy (&pm[1],
+ data,
+ data_len);
+ GNUNET_MQ_send (lc->mq,
+ env);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Queued reply to query `%s' for local client\n",
+ GNUNET_h2s (&prd->query));
+ if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Evaluation %d - keeping query alive\n",
+ (int) eval);
+ return;
+ }
+ if (NULL == cr->kill_task)
+ cr->kill_task = GNUNET_SCHEDULER_add_now (&client_request_destroy,
+ cr);
+}
+
+
+/**
+ * A client disconnected from us. Tear down the local client
+ * record.
+ *
+ * @param cls unused
+ * @param client handle of the client
+ * @param app_ctx the `struct GSF_LocalClient`
+ */
+static void
+client_disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *client,
+ void *app_ctx)
+{
+ struct GSF_LocalClient *lc = app_ctx;
+ struct IndexStartContext *isc;
+ struct ClientRequest *cr;
+ struct ClientResponse *res;
+
+ while (NULL != (cr = lc->cr_head))
+ {
+ if (NULL != cr->kill_task)
+ GNUNET_SCHEDULER_cancel (cr->kill_task);
+ client_request_destroy (cr);
+ }
+ while (NULL != (res = lc->res_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (lc->res_head,
+ lc->res_tail,
+ res);
+ GNUNET_free (res);
+ }
+ while (NULL != (isc = lc->isc_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (lc->isc_head,
+ lc->isc_tail,
+ isc);
+ GNUNET_CRYPTO_hash_file_cancel (isc->fhc);
+ GNUNET_free (isc);
+ }
+ GNUNET_free (lc);
+}
+
+
+
/**
const struct PutMessage *put)
{
enum GNUNET_BLOCK_Type type;
-
+
type = ntohl (put->type);
if (GNUNET_BLOCK_TYPE_FS_ONDEMAND == type)
{
unsigned int bm;
unsigned int bits;
size_t bfsize;
-
+
msize = ntohs (gm->header.size);
bm = ntohl (gm->hash_bitmap);
bits = 0;
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
- }
- return GNUNET_OK;
+ }
+ 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 GSF_LocalClient`)
* @param pr the pending request we were processing
* @param result final datastore lookup result
*/
struct GSF_PendingRequest *pr,
enum GNUNET_BLOCK_EvaluationResult result)
{
- struct GNUNET_SERVER_Client *client = cls;
+ struct GSF_LocalClient *lc = cls;
struct GSF_PendingRequestData *prd;
- GNUNET_SERVER_receive_done (client,
- GNUNET_OK);
+ GNUNET_SERVICE_client_continue (lc->client);
if (GNUNET_BLOCK_EVALUATION_OK_LAST == result)
return; /* we're done, 'pr' was already destroyed... */
prd = GSF_pending_request_get_data_ (pr);
break;
}
}
- GSF_consider_forwarding (NULL, pr, result);
+ GSF_consider_forwarding (NULL,
+ pr,
+ result);
+}
+
+
+/**
+ * Check #GNUNET_MESSAGE_TYPE_FS_START_SEARCH-message (search request
+ * from client).
+ *
+ * @param cls identification of the client
+ * @param sm the actual message
+ * @return #GNUNET_OK if @a sm is well-formed
+ */
+static int
+check_client_start_search (void *cls,
+ const struct SearchMessage *sm)
+{
+ uint16_t msize;
+
+ msize = ntohs (sm->header.size) - sizeof (struct SearchMessage);
+ if (0 != msize % sizeof (struct GNUNET_HashCode))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
* 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
+ * Responsible for creating the request entry itself and setting
+ * up reply callback and cancellation on client disconnect.
+ *
+ * @param cls identification of the client
+ * @param sm the actual message
*/
static void
-handle_start_search (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_client_start_search (void *cls,
+ const struct SearchMessage *sm)
{
- struct GSF_PendingRequest *pr;
- int ret;
-
- pr = NULL;
- ret = GSF_local_client_start_search_handler_ (client,
- message,
- &pr);
- switch (ret)
- {
- case GNUNET_SYSERR:
- GNUNET_SERVER_receive_done (client,
- GNUNET_SYSERR);
- break;
- case GNUNET_NO:
- 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);
- break;
- default:
- GNUNET_assert (0);
+ static struct GNUNET_PeerIdentity all_zeros;
+ struct GSF_LocalClient *lc = cls;
+ struct ClientRequest *cr;
+ struct GSF_PendingRequestData *prd;
+ uint16_t msize;
+ unsigned int sc;
+ enum GNUNET_BLOCK_Type type;
+ enum GSF_PendingRequestOptions options;
+
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# client searches received"),
+ 1,
+ GNUNET_NO);
+ msize = ntohs (sm->header.size) - sizeof (struct SearchMessage);
+ sc = msize / sizeof (struct GNUNET_HashCode);
+ type = ntohl (sm->type);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received request for `%s' of type %u from local client\n",
+ GNUNET_h2s (&sm->query),
+ (unsigned int) type);
+ cr = NULL;
+ /* detect duplicate UBLOCK requests */
+ if ((type == GNUNET_BLOCK_TYPE_FS_UBLOCK) ||
+ (type == GNUNET_BLOCK_TYPE_ANY))
+ {
+ cr = lc->cr_head;
+ while (NULL != cr)
+ {
+ prd = GSF_pending_request_get_data_ (cr->pr);
+ /* only unify with queries that hae not yet started local processing
+ (SEARCH_MESSAGE_OPTION_CONTINUED was always set) and that have a
+ matching query and type */
+ if ((GNUNET_YES != prd->has_started) &&
+ (0 != memcmp (&prd->query,
+ &sm->query,
+ sizeof (struct GNUNET_HashCode))) &&
+ (prd->type == type))
+ break;
+ cr = cr->next;
+ }
+ }
+ if (NULL != cr)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Have existing request, merging content-seen lists.\n");
+ GSF_pending_request_update_ (cr->pr,
+ (const struct GNUNET_HashCode *) &sm[1],
+ sc);
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# client searches updated (merged content seen list)"),
+ 1,
+ GNUNET_NO);
+ }
+ else
+ {
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# client searches active"),
+ 1,
+ GNUNET_NO);
+ cr = GNUNET_new (struct ClientRequest);
+ cr->lc = lc;
+ GNUNET_CONTAINER_DLL_insert (lc->cr_head,
+ lc->cr_tail,
+ cr);
+ options = GSF_PRO_LOCAL_REQUEST;
+ if (0 != (SEARCH_MESSAGE_OPTION_LOOPBACK_ONLY & ntohl (sm->options)))
+ options |= GSF_PRO_LOCAL_ONLY;
+ cr->pr = GSF_pending_request_create_ (options, type,
+ &sm->query,
+ (0 !=
+ memcmp (&sm->target,
+ &all_zeros,
+ sizeof (struct GNUNET_PeerIdentity)))
+ ? &sm->target : NULL, NULL, 0,
+ 0 /* bf */ ,
+ ntohl (sm->anonymity_level),
+ 0 /* priority */ ,
+ 0 /* ttl */ ,
+ 0 /* sender PID */ ,
+ 0 /* origin PID */ ,
+ (const struct GNUNET_HashCode *) &sm[1], sc,
+ &client_response_handler,
+ cr);
}
+ if (0 != (SEARCH_MESSAGE_OPTION_CONTINUED & ntohl (sm->options)))
+ {
+ GNUNET_SERVICE_client_continue (lc->client);
+ return;
+ }
+ GSF_pending_request_get_data_ (cr->pr)->has_started = GNUNET_YES;
+ GSF_local_lookup_ (cr->pr,
+ &start_p2p_processing,
+ lc);
}
/**
* Handle request to sign a LOC URI (from client).
*
- * @param cls closure (NULL)
- * @param client identification of the client
- * @param message the actual message
+ * @param cls identification of the client
+ * @param msg the actual message
*/
static void
-handle_loc_sign (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+handle_client_loc_sign (void *cls,
+ const struct RequestLocSignatureMessage *msg)
{
- const struct RequestLocSignatureMessage *msg;
+ struct GSF_LocalClient *lc = cls;
struct GNUNET_FS_Uri base;
struct GNUNET_FS_Uri *loc;
- struct ResponseLocSignatureMessage resp;
- struct GSF_LocalClient *lc;
+ struct GNUNET_MQ_Envelope *env;
+ struct ResponseLocSignatureMessage *resp;
- msg = (const struct RequestLocSignatureMessage *) message;
GNUNET_break (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT ==
ntohl (msg->purpose));
base.type = GNUNET_FS_URI_CHK;
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;
+ env = GNUNET_MQ_msg (resp,
+ 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);
+ GNUNET_MQ_send (lc->mq,
+ env);
+ GNUNET_SERVICE_client_continue (lc->client);
+}
+
+
+/**
+ * Check INDEX_START-message.
+ *
+ * @param cls identification of the client
+ * @param ism the actual message
+ * @return #GNUNET_OK if @a ism is well-formed
+ */
+static int
+check_client_index_start (void *cls,
+ const struct IndexStartMessage *ism)
+{
+ uint16_t msize;
+ char *fn;
+
+ msize = ntohs (ism->header.size);
+ if (((const char *) ism)[msize - 1] != '\0')
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (0 != ism->reserved)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ fn = GNUNET_STRINGS_filename_expand ((const char *) &ism[1]);
+ if (NULL == fn)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_free (fn);
+ return GNUNET_OK;
+}
+
+
+/**
+ * We've validated the hash of the file we're about to index. Signal
+ * success to the client and update our internal data structures.
+ *
+ * @param isc the data about the index info entry for the request
+ */
+static void
+signal_index_ok (struct IndexStartContext *isc)
+{
+ struct GSF_LocalClient *lc = isc->lc;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+
+ GNUNET_FS_add_to_index (isc->filename,
+ &isc->file_id);
+ env = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_FS_INDEX_START_OK);
+ GNUNET_MQ_send (lc->mq,
+ env);
+ GNUNET_free (isc->filename);
+ GNUNET_free (isc);
+ GNUNET_SERVICE_client_continue (lc->client);
+}
+
+
+/**
+ * Function called once the hash computation over an
+ * indexed file has completed.
+ *
+ * @param cls closure, our publishing context
+ * @param res resulting hash, NULL on error
+ */
+static void
+hash_for_index_val (void *cls,
+ const struct GNUNET_HashCode *res)
+{
+ struct IndexStartContext *isc = cls;
+ struct GSF_LocalClient *lc = isc->lc;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+
+ GNUNET_CONTAINER_DLL_remove (lc->isc_head,
+ lc->isc_tail,
+ isc);
+ isc->fhc = NULL;
+ if ( (NULL == res) ||
+ (0 != memcmp (res,
+ &isc->file_id,
+ sizeof (struct GNUNET_HashCode))))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Hash mismatch trying to index file `%s' which does not have hash `%s'\n"),
+ isc->filename,
+ GNUNET_h2s (&isc->file_id));
+ env = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_FS_INDEX_START_FAILED);
+ GNUNET_MQ_send (lc->mq,
+ env);
+ GNUNET_SERVICE_client_continue (lc->client);
+ GNUNET_free (isc);
+ return;
+ }
+ signal_index_ok (isc);
+}
+
+
+/**
+ * Handle INDEX_START-message.
+ *
+ * @param cls identification of the client
+ * @param message the actual message
+ */
+static void
+handle_client_index_start (void *cls,
+ const struct IndexStartMessage *ism)
+{
+ struct GSF_LocalClient *lc = cls;
+ struct IndexStartContext *isc;
+ char *fn;
+ uint64_t dev;
+ uint64_t ino;
+ uint64_t mydev;
+ uint64_t myino;
+
+ fn = GNUNET_STRINGS_filename_expand ((const char *) &ism[1]);
+ GNUNET_assert (NULL != fn);
+ dev = GNUNET_ntohll (ism->device);
+ ino = GNUNET_ntohll (ism->inode);
+ isc = GNUNET_new (struct IndexStartContext);
+ isc->filename = fn;
+ isc->file_id = ism->file_id;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received START_INDEX message for file `%s'\n",
+ isc->filename);
+ isc->lc = lc;
+ mydev = 0;
+ myino = 0;
+ if ( ( (dev != 0) ||
+ (ino != 0) ) &&
+ (GNUNET_OK == GNUNET_DISK_file_get_identifiers (fn,
+ &mydev,
+ &myino)) &&
+ (dev == mydev) &&
+ (ino == myino) )
+ {
+ /* fast validation OK! */
+ signal_index_ok (isc);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Mismatch in file identifiers (%llu != %llu or %u != %u), need to hash.\n",
+ (unsigned long long) ino,
+ (unsigned long long) myino,
+ (unsigned int) dev,
+ (unsigned int) mydev);
+ /* slow validation, need to hash full file (again) */
+ GNUNET_CONTAINER_DLL_insert (lc->isc_head,
+ lc->isc_tail,
+ isc);
+ isc->fhc = GNUNET_CRYPTO_hash_file (GNUNET_SCHEDULER_PRIORITY_IDLE,
+ isc->filename,
+ HASHING_BLOCKSIZE,
+ &hash_for_index_val,
+ isc);
+ if (NULL == isc->fhc)
+ hash_for_index_val (isc,
+ NULL);
+}
+
+
+/**
+ * Handle INDEX_LIST_GET-message.
+ *
+ * @param cls closure
+ * @param message the actual message
+ */
+static void
+handle_client_index_list_get (void *cls,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct GSF_LocalClient *lc = cls;
+
+ GNUNET_FS_indexing_send_list (lc->mq);
+ GNUNET_SERVICE_client_continue (lc->client);
+}
+
+
+/**
+ * Handle UNINDEX-message.
+ *
+ * @param cls identification of the client
+ * @param message the actual message
+ */
+static void
+handle_client_unindex (void *cls,
+ const struct UnindexMessage *um)
+{
+ struct GSF_LocalClient *lc = cls;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+ int found;
+
+ GNUNET_break (0 == um->reserved);
+ found = GNUNET_FS_indexing_do_unindex (&um->file_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client requested unindexing of file `%s': %s\n",
+ GNUNET_h2s (&um->file_id),
+ found ? "found" : "not found");
+ env = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_FS_UNINDEX_OK);
+ GNUNET_MQ_send (lc->mq,
+ env);
+ GNUNET_SERVICE_client_continue (lc->client);
}
static void
shutdown_task (void *cls)
{
- GSF_cadet_stop_client ();
GSF_cadet_stop_server ();
if (NULL != GSF_core)
{
- GNUNET_CORE_disconnecT (GSF_core);
+ GNUNET_CORE_disconnect (GSF_core);
GSF_core = NULL;
}
if (NULL != GSF_ats)
GSF_pending_request_done_ ();
GSF_plan_done ();
GSF_connected_peer_done_ ();
- GNUNET_DATASTORE_disconnect (GSF_dsh, GNUNET_NO);
+ GNUNET_DATASTORE_disconnect (GSF_dsh,
+ GNUNET_NO);
GSF_dsh = NULL;
GNUNET_DHT_disconnect (GSF_dht);
GSF_dht = NULL;
/**
- * Function called after GNUNET_CORE_connecT has succeeded
+ * Function called after GNUNET_CORE_connect has succeeded
* (or failed for good). Note that the private key of the
* peer is intentionally not exposed here; if you need it,
* your process should try to read the private key file
/**
* Process fs requests.
*
- * @param server the initialized server
* @param c configuration to use
*/
static int
-main_init (struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
+main_init (const struct GNUNET_CONFIGURATION_Handle *c)
{
struct GNUNET_MQ_MessageHandler no_p2p_handlers[] = {
GNUNET_MQ_handler_end ()
NULL),
GNUNET_MQ_handler_end ()
};
- 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 },
- { &handle_loc_sign, NULL,
- GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGN,
- sizeof (struct RequestLocSignatureMessage) },
- {NULL, NULL, 0, 0}
- };
int anon_p2p_off;
char *keyfile;
"I am peer %s\n",
GNUNET_i2s (&GSF_my_id));
GSF_core
- = GNUNET_CORE_connecT (GSF_cfg,
+ = GNUNET_CORE_connect (GSF_cfg,
NULL,
&peer_init_handler,
&GSF_peer_connect_handler,
"core");
return GNUNET_SYSERR;
}
- GNUNET_SERVER_disconnect_notify (server,
- &GSF_client_disconnect_handler_,
- NULL);
- GNUNET_SERVER_add_handlers (server, handlers);
cover_age_task =
GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY,
&age_cover_counters,
NULL);
datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE);
GSF_cadet_start_server ();
- GSF_cadet_start_client ();
GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
NULL);
return GNUNET_OK;
* Process fs requests.
*
* @param cls closure
- * @param server the initialized server
* @param cfg configuration to use
+ * @param service the initialized service
*/
static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_SERVICE_Handle *service)
{
unsigned long long dqs;
GSF_cfg = cfg;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "fs", "DATASTORE_QUEUE_SIZE",
+ GNUNET_CONFIGURATION_get_value_size (GSF_cfg,
+ "fs",
+ "DATASTORE_QUEUE_SIZE",
&dqs))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_INFO,
- "fs", "DATASTORE_QUEUE_SIZE");
- dqs = 1024;
+ "fs",
+ "DATASTORE_QUEUE_SIZE");
+ dqs = 32;
}
GSF_datastore_queue_size = (unsigned int) dqs;
GSF_enable_randomized_delays =
GSF_plan_init ();
GSF_pending_request_init_ ();
GSF_connected_peer_init_ ();
- GSF_ats = GNUNET_ATS_performance_init (GSF_cfg, &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)) ||
- (GNUNET_OK != main_init (server, cfg)))
+ if ( (GNUNET_OK != GNUNET_FS_indexing_init (cfg,
+ GSF_dsh)) ||
+ (GNUNET_OK != main_init (cfg)) )
{
GNUNET_SCHEDULER_shutdown ();
shutdown_task (NULL);
/**
- * The main function for the fs service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * Define "main" method using service macro.
*/
-int
-main (int argc, char *const *argv)
-{
- return (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "fs", GNUNET_SERVICE_OPTION_NONE,
- &run, NULL)) ? 0 : 1;
-}
+GNUNET_SERVICE_MAIN
+("fs",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_var_size (client_index_start,
+ GNUNET_MESSAGE_TYPE_FS_INDEX_START,
+ struct IndexStartMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (client_index_list_get,
+ GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (client_unindex,
+ GNUNET_MESSAGE_TYPE_FS_UNINDEX,
+ struct UnindexMessage,
+ NULL),
+ GNUNET_MQ_hd_var_size (client_start_search,
+ GNUNET_MESSAGE_TYPE_FS_START_SEARCH,
+ struct SearchMessage,
+ NULL),
+ GNUNET_MQ_hd_fixed_size (client_loc_sign,
+ GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGN,
+ struct RequestLocSignatureMessage,
+ NULL),
+ GNUNET_MQ_handler_end ());
+
/* end of gnunet-service-fs.c */
projects / oweals / gnunet.git / blobdiff