X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fgnunet-publish.c;h=c353be3012485af34a5ce1754febcf545d23bd83;hb=26d1b687ca01be01505b69ff48ae5d3e0cd4186e;hp=7f7423ae5e670d6b7ff7d729b2fb0c1c82a3aca3;hpb=9351b1e9bdf2b067b6db06562c26ba658cff42b8;p=oweals%2Fgnunet.git diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index 7f7423ae5..c353be301 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2001-2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2001-2013 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -127,7 +127,7 @@ static int do_disable_creation_time; /** * Task run on CTRL-C to kill everything nicely. */ -static GNUNET_SCHEDULER_TaskIdentifier kill_task; +static struct GNUNET_SCHEDULER_Task * kill_task; /** * Handle to the directory scanner (for recursive insertions). @@ -154,11 +154,17 @@ static struct GNUNET_IDENTITY_Handle *identity; * @param tc scheduler context */ static void -do_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +do_stop_task (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_FS_PublishContext *p; - kill_task = GNUNET_SCHEDULER_NO_TASK; + kill_task = NULL; + if (NULL != identity) + { + GNUNET_IDENTITY_disconnect (identity); + identity = NULL; + } if (NULL != pc) { p = pc; @@ -182,7 +188,7 @@ do_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void stop_scanner_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - kill_task = GNUNET_SCHEDULER_NO_TASK; + kill_task = NULL; if (NULL != ds) { GNUNET_FS_directory_scan_abort (ds); @@ -213,7 +219,8 @@ stop_scanner_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * field in the GNUNET_FS_ProgressInfo struct. */ static void * -progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) +progress_cb (void *cls, + const struct GNUNET_FS_ProgressInfo *info) { const char *s; char *suri; @@ -227,36 +234,58 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) { s = GNUNET_STRINGS_relative_time_to_string (info->value.publish.eta, GNUNET_YES); - FPRINTF (stdout, _("Publishing `%s' at %llu/%llu (%s remaining)\n"), + FPRINTF (stdout, + _("Publishing `%s' at %llu/%llu (%s remaining)\n"), info->value.publish.filename, (unsigned long long) info->value.publish.completed, (unsigned long long) info->value.publish.size, s); } break; + case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY: + if (verbose) + { + s = GNUNET_STRINGS_relative_time_to_string (info->value.publish.specifics.progress_directory.eta, + GNUNET_YES); + FPRINTF (stdout, + _("Publishing `%s' at %llu/%llu (%s remaining)\n"), + info->value.publish.filename, + (unsigned long long) info->value.publish.specifics.progress_directory.completed, + (unsigned long long) info->value.publish.specifics.progress_directory.total, s); + } + break; case GNUNET_FS_STATUS_PUBLISH_ERROR: FPRINTF (stderr, _("Error publishing: %s.\n"), info->value.publish.specifics.error.message); - if (kill_task != GNUNET_SCHEDULER_NO_TASK) + if (kill_task != NULL) { GNUNET_SCHEDULER_cancel (kill_task); - kill_task = GNUNET_SCHEDULER_NO_TASK; + kill_task = NULL; } kill_task = GNUNET_SCHEDULER_add_now (&do_stop_task, NULL); break; case GNUNET_FS_STATUS_PUBLISH_COMPLETED: - FPRINTF (stdout, _("Publishing `%s' done.\n"), + FPRINTF (stdout, + _("Publishing `%s' done.\n"), info->value.publish.filename); suri = GNUNET_FS_uri_to_string (info->value.publish.specifics. - completed.chk_uri); - FPRINTF (stdout, _("URI is `%s'.\n"), suri); + completed.chk_uri); + FPRINTF (stdout, + _("URI is `%s'.\n"), + suri); GNUNET_free (suri); + if (NULL != info->value.publish.specifics.completed.sks_uri) + { + suri = GNUNET_FS_uri_to_string (info->value.publish.specifics. + completed.sks_uri); + FPRINTF (stdout, + _("Namespace URI is `%s'.\n"), + suri); + GNUNET_free (suri); + } if (NULL == info->value.publish.pctx) { - if (GNUNET_SCHEDULER_NO_TASK != kill_task) - { + if (NULL != kill_task) GNUNET_SCHEDULER_cancel (kill_task); - kill_task = GNUNET_SCHEDULER_NO_TASK; - } kill_task = GNUNET_SCHEDULER_add_now (&do_stop_task, NULL); } ret = 0; @@ -264,13 +293,31 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) case GNUNET_FS_STATUS_PUBLISH_STOPPED: GNUNET_break (NULL == pc); return NULL; + case GNUNET_FS_STATUS_UNINDEX_START: + FPRINTF (stderr, + "%s", + _("Starting cleanup after abort\n")); + return NULL; case GNUNET_FS_STATUS_UNINDEX_PROGRESS: return NULL; case GNUNET_FS_STATUS_UNINDEX_COMPLETED: - FPRINTF (stderr, "%s", _("Cleanup after abort complete.\n")); + FPRINTF (stderr, + "%s", + _("Cleanup after abort completed.\n")); + GNUNET_FS_unindex_stop (info->value.unindex.uc); + return NULL; + case GNUNET_FS_STATUS_UNINDEX_ERROR: + FPRINTF (stderr, + "%s", + _("Cleanup after abort failed.\n")); + GNUNET_FS_unindex_stop (info->value.unindex.uc); + return NULL; + case GNUNET_FS_STATUS_UNINDEX_STOPPED: return NULL; default: - FPRINTF (stderr, _("Unexpected status: %d\n"), info->status); + FPRINTF (stderr, + _("Unexpected status: %d\n"), + info->status); return NULL; } return ""; /* non-null */ @@ -285,14 +332,17 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) * @param plugin_name name of the plugin that generated the meta data * @param type type of the meta data * @param format format of data - * @param data_mime_type mime type of data + * @param data_mime_type mime type of @a data * @param data value of the meta data - * @param data_size number of bytes in data + * @param data_size number of bytes in @a data * @return always 0 */ static int -meta_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type, - enum EXTRACTOR_MetaFormat format, const char *data_mime_type, +meta_printer (void *cls, + const char *plugin_name, + enum EXTRACTOR_MetaType type, + enum EXTRACTOR_MetaFormat format, + const char *data_mime_type, const char *data, size_t data_size) { if ((EXTRACTOR_METAFORMAT_UTF8 != format) && @@ -300,7 +350,11 @@ meta_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type, return 0; if (EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME == type) return 0; +#if HAVE_LIBEXTRACTOR FPRINTF (stdout, "\t%s - %s\n", EXTRACTOR_metatype_to_string (type), data); +#else + FPRINTF (stdout, "\t%d - %s\n", type, data); +#endif return 0; } @@ -311,10 +365,12 @@ meta_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type, * @param cls closure * @param keyword the keyword * @param is_mandatory is the keyword mandatory (in a search) - * @return GNUNET_OK to continue to iterate, GNUNET_SYSERR to abort + * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to abort */ static int -keyword_printer (void *cls, const char *keyword, int is_mandatory) +keyword_printer (void *cls, + const char *keyword, + int is_mandatory) { FPRINTF (stdout, "\t%s\n", keyword); return GNUNET_OK; @@ -334,15 +390,18 @@ keyword_printer (void *cls, const char *keyword, int is_mandatory) * @param bo block options * @param do_index should we index? * @param client_info pointer to client context set upon creation (can be modified) - * @return GNUNET_OK to continue, GNUNET_NO to remove - * this entry from the directory, GNUNET_SYSERR + * @return #GNUNET_OK to continue, #GNUNET_NO to remove + * this entry from the directory, #GNUNET_SYSERR * to abort the iteration */ static int -publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi, - uint64_t length, struct GNUNET_CONTAINER_MetaData *m, +publish_inspector (void *cls, + struct GNUNET_FS_FileInformation *fi, + uint64_t length, + struct GNUNET_CONTAINER_MetaData *m, struct GNUNET_FS_Uri **uri, - struct GNUNET_FS_BlockOptions *bo, int *do_index, + struct GNUNET_FS_BlockOptions *bo, + int *do_index, void **client_info) { char *fn; @@ -410,7 +469,8 @@ publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi, * @param emsg error message, NULL on success */ static void -uri_sks_continuation (void *cls, const struct GNUNET_FS_Uri *sks_uri, +uri_sks_continuation (void *cls, + const struct GNUNET_FS_Uri *sks_uri, const char *emsg) { if (NULL != emsg) @@ -435,7 +495,8 @@ uri_sks_continuation (void *cls, const struct GNUNET_FS_Uri *sks_uri, * @param emsg error message, NULL on success */ static void -uri_ksk_continuation (void *cls, const struct GNUNET_FS_Uri *ksk_uri, +uri_ksk_continuation (void *cls, + const struct GNUNET_FS_Uri *ksk_uri, const char *emsg) { const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv; @@ -476,6 +537,8 @@ get_file_information (struct GNUNET_FS_ShareTreeItem *item) if (GNUNET_YES == item->is_directory) { + if (NULL == item->meta) + item->meta = GNUNET_CONTAINER_meta_data_create (); GNUNET_CONTAINER_meta_data_delete (item->meta, EXTRACTOR_METATYPE_MIMETYPE, NULL, 0); @@ -526,7 +589,9 @@ directory_trim_complete (struct GNUNET_FS_ShareTreeItem *directory_scan_result) GNUNET_FS_share_tree_free (directory_scan_result); if (NULL == fi) { - FPRINTF (stderr, "%s", _("Could not publish\n")); + FPRINTF (stderr, + "%s", + _("Could not publish\n")); GNUNET_SCHEDULER_shutdown (); ret = 1; return; @@ -549,7 +614,9 @@ directory_trim_complete (struct GNUNET_FS_ShareTreeItem *directory_scan_result) GNUNET_FS_PUBLISH_OPTION_NONE); if (NULL == pc) { - FPRINTF (stderr, "%s", _("Could not start publishing.\n")); + FPRINTF (stderr, + "%s", + _("Could not start publishing.\n")); GNUNET_SCHEDULER_shutdown (); ret = 1; return; @@ -563,9 +630,9 @@ directory_trim_complete (struct GNUNET_FS_ShareTreeItem *directory_scan_result) * * @param cls closure * @param filename which file we are making progress on - * @param is_directory GNUNET_YES if this is a directory, - * GNUNET_NO if this is a file - * GNUNET_SYSERR if it is neither (or unknown) + * @param is_directory #GNUNET_YES if this is a directory, + * #GNUNET_NO if this is a file + * #GNUNET_SYSERR if it is neither (or unknown) * @param reason kind of progress we are making */ static void @@ -582,9 +649,13 @@ directory_scan_cb (void *cls, if (verbose > 1) { if (is_directory == GNUNET_YES) - FPRINTF (stdout, _("Scanning directory `%s'.\n"), filename); + FPRINTF (stdout, + _("Scanning directory `%s'.\n"), + filename); else - FPRINTF (stdout, _("Scanning file `%s'.\n"), filename); + FPRINTF (stdout, + _("Scanning file `%s'.\n"), + filename); } break; case GNUNET_FS_DIRSCANNER_FILE_IGNORED: @@ -594,26 +665,34 @@ directory_scan_cb (void *cls, break; case GNUNET_FS_DIRSCANNER_ALL_COUNTED: if (verbose) - FPRINTF (stdout, "%s", _("Preprocessing complete.\n")); + FPRINTF (stdout, + "%s", + _("Preprocessing complete.\n")); break; case GNUNET_FS_DIRSCANNER_EXTRACT_FINISHED: if (verbose > 2) - FPRINTF (stdout, _("Extracting meta data from file `%s' complete.\n"), filename); + FPRINTF (stdout, + _("Extracting meta data from file `%s' complete.\n"), + filename); break; case GNUNET_FS_DIRSCANNER_FINISHED: if (verbose > 1) - FPRINTF (stdout, "%s", _("Meta data extraction has finished.\n")); + FPRINTF (stdout, + "%s", + _("Meta data extraction has finished.\n")); directory_scan_result = GNUNET_FS_directory_scan_get_result (ds); ds = NULL; GNUNET_FS_share_tree_trim (directory_scan_result); directory_trim_complete (directory_scan_result); break; case GNUNET_FS_DIRSCANNER_INTERNAL_ERROR: - FPRINTF (stdout, "%s", _("Internal error scanning directory.\n")); - if (kill_task != GNUNET_SCHEDULER_NO_TASK) + FPRINTF (stdout, + "%s", + _("Internal error scanning directory.\n")); + if (kill_task != NULL) { GNUNET_SCHEDULER_cancel (kill_task); - kill_task = GNUNET_SCHEDULER_NO_TASK; + kill_task = NULL; } kill_task = GNUNET_SCHEDULER_add_now (&stop_scanner_task, NULL); break; @@ -640,7 +719,9 @@ identity_continuation (const char *args0) if ( (NULL != pseudonym) && (NULL == namespace) ) { - FPRINTF (stderr, _("Selected pseudonym `%s' unknown\n"), pseudonym); + FPRINTF (stderr, + _("Selected pseudonym `%s' unknown\n"), + pseudonym); GNUNET_SCHEDULER_shutdown (); return; } @@ -649,14 +730,19 @@ identity_continuation (const char *args0) emsg = NULL; if (NULL == (uri = GNUNET_FS_uri_parse (uri_string, &emsg))) { - FPRINTF (stderr, _("Failed to parse URI: %s\n"), emsg); + FPRINTF (stderr, + _("Failed to parse URI: %s\n"), + emsg); GNUNET_free (emsg); GNUNET_SCHEDULER_shutdown (); ret = 1; return; } - GNUNET_FS_publish_ksk (ctx, topKeywords, meta, uri, &bo, - GNUNET_FS_PUBLISH_OPTION_NONE, &uri_ksk_continuation, + GNUNET_FS_publish_ksk (ctx, topKeywords, + meta, uri, + &bo, + GNUNET_FS_PUBLISH_OPTION_NONE, + &uri_ksk_continuation, NULL); return; } @@ -679,7 +765,8 @@ identity_continuation (const char *args0) if (NULL == ds) { FPRINTF (stderr, - "%s", _("Failed to start meta directory scanner. Is gnunet-helper-publish-fs installed?\n")); + "%s", + _("Failed to start meta directory scanner. Is gnunet-helper-publish-fs installed?\n")); GNUNET_free_non_null (ex); return; } @@ -711,6 +798,8 @@ identity_cb (void *cls, identity_continuation (args0); return; } + if (NULL == name) + return; if (0 == strcmp (name, pseudonym)) namespace = ego; } @@ -725,7 +814,9 @@ identity_cb (void *cls, * @param c configuration */ static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) { /* check arguments */ @@ -762,14 +853,16 @@ run (void *cls, char *const *args, const char *cfgfile, { /* ordinary insertion checks */ if (NULL != next_id) { - FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"), + FPRINTF (stderr, + _("Option `%s' makes no sense without option `%s'.\n"), "-N", "-P"); ret = -1; return; } if (NULL != this_id) { - FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"), + FPRINTF (stderr, + _("Option `%s' makes no sense without option `%s'.\n"), "-t", "-P"); ret = -1; return; @@ -781,16 +874,20 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); if (NULL == ctx) { - FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); + FPRINTF (stderr, + _("Could not initialize `%s' subsystem.\n"), + "FS"); ret = 1; return; } kill_task = - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_stop_task, - NULL); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, + &do_stop_task, + NULL); if (NULL != pseudonym) identity = GNUNET_IDENTITY_connect (cfg, - &identity_cb, args[0]); + &identity_cb, + args[0]); else identity_continuation (args[0]); }