projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #3704
[oweals/gnunet.git]
/
src
/
fs
/
fs_unindex.c
diff --git
a/src/fs/fs_unindex.c
b/src/fs/fs_unindex.c
index bb3accb8239a224fbf90558b71b7c36b71884fba..c87c4e4e9ae342ccaf06fab28fb2051b636eb4e3 100644
(file)
--- a/
src/fs/fs_unindex.c
+++ b/
src/fs/fs_unindex.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2003--2013 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2003--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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-271,15
+271,12
@@
static void
unindex_finish (struct GNUNET_FS_UnindexContext *uc)
{
char *emsg;
unindex_finish (struct GNUNET_FS_UnindexContext *uc)
{
char *emsg;
- struct GNUNET_FS_Uri *uri;
struct UnindexMessage req;
/* generate final progress message */
unindex_progress (uc, uc->file_size, NULL, 0, 0);
struct UnindexMessage req;
/* generate final progress message */
unindex_progress (uc, uc->file_size, NULL, 0, 0);
- GNUNET_FS_tree_encoder_finish (uc->tc, &
uri, &
emsg);
+ GNUNET_FS_tree_encoder_finish (uc->tc, &emsg);
uc->tc = NULL;
uc->tc = NULL;
- if (uri != NULL)
- GNUNET_FS_uri_destroy (uri);
GNUNET_DISK_file_close (uc->fh);
uc->fh = NULL;
GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
GNUNET_DISK_file_close (uc->fh);
uc->fh = NULL;
GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
@@
-325,8
+322,8
@@
unindex_finish (struct GNUNET_FS_UnindexContext *uc)
* @param reason kind of progress we are making
*/
static void
* @param reason kind of progress we are making
*/
static void
-unindex_directory_scan_cb (void *cls,
- const char *filename,
+unindex_directory_scan_cb (void *cls,
+ const char *filename,
int is_directory,
enum GNUNET_FS_DirScannerProgressUpdateReason reason)
{
int is_directory,
enum GNUNET_FS_DirScannerProgressUpdateReason reason)
{
@@
-384,7
+381,7
@@
GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc)
ex = NULL;
uc->dscan = GNUNET_FS_directory_scan_start (uc->filename,
GNUNET_NO, ex,
ex = NULL;
uc->dscan = GNUNET_FS_directory_scan_start (uc->filename,
GNUNET_NO, ex,
- &unindex_directory_scan_cb,
+ &unindex_directory_scan_cb,
uc);
GNUNET_free_non_null (ex);
}
uc);
GNUNET_free_non_null (ex);
}
@@
-394,7
+391,7
@@
GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc)
* Continuation called to notify client about result of the remove
* operation for the UBlock.
*
* Continuation called to notify client about result of the remove
* operation for the UBlock.
*
- * @param cls the 'struct GNUNET_FS_UnindexContext *'
+ * @param cls the 'struct GNUNET_FS_UnindexContext *'
* @param success GNUNET_SYSERR on failure (including timeout/queue drop)
* GNUNET_NO if content was already there
* GNUNET_YES (or other positive value) on success
* @param success GNUNET_SYSERR on failure (including timeout/queue drop)
* GNUNET_NO if content was already there
* GNUNET_YES (or other positive value) on success
@@
-412,10
+409,10
@@
continue_after_remove (void *cls,
struct GNUNET_FS_UnindexContext *uc = cls;
uc->dqe = NULL;
struct GNUNET_FS_UnindexContext *uc = cls;
uc->dqe = NULL;
- if (success != GNUNET_YES)
+ if (success != GNUNET_YES)
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failed to remove UBlock: %s\n"),
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failed to remove UBlock: %s\n"),
- msg);
+ msg);
uc->ksk_offset++;
GNUNET_FS_unindex_do_remove_kblocks_ (uc);
}
uc->ksk_offset++;
GNUNET_FS_unindex_do_remove_kblocks_ (uc);
}
@@
-467,14
+464,14
@@
process_kblock_for_unindex (void *cls,
if (0 == uc->first_uid)
{
/* remember UID of first result to detect cycles */
if (0 == uc->first_uid)
{
/* remember UID of first result to detect cycles */
- uc->first_uid = uid;
+ uc->first_uid = uid;
}
else if (uid == uc->first_uid)
{
/* no more additional results */
uc->ksk_offset++;
GNUNET_FS_unindex_do_remove_kblocks_ (uc);
}
else if (uid == uc->first_uid)
{
/* no more additional results */
uc->ksk_offset++;
GNUNET_FS_unindex_do_remove_kblocks_ (uc);
- return;
+ return;
}
GNUNET_assert (GNUNET_BLOCK_TYPE_FS_UBLOCK == type);
if (size < sizeof (struct UBlock))
}
GNUNET_assert (GNUNET_BLOCK_TYPE_FS_UBLOCK == type);
if (size < sizeof (struct UBlock))
@@
-492,11
+489,11
@@
process_kblock_for_unindex (void *cls,
goto get_next;
}
{
goto get_next;
}
{
- char pt[size - sizeof (struct UBlock)];
- struct GNUNET_CRYPTO_Ec
cPublicSign
Key anon_pub;
+ char pt[size - sizeof (struct UBlock)];
+ struct GNUNET_CRYPTO_Ec
dsaPublic
Key anon_pub;
const char *keyword;
const char *keyword;
-
- GNUNET_CRYPTO_ec
c_key_get_public_for_signature (GNUNET_CRYPTO_ecc
_key_get_anonymous (),
+
+ GNUNET_CRYPTO_ec
dsa_key_get_public (GNUNET_CRYPTO_ecdsa
_key_get_anonymous (),
&anon_pub);
keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1];
GNUNET_FS_ublock_decrypt_ (&ub[1], size - sizeof (struct UBlock),
&anon_pub);
keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1];
GNUNET_FS_ublock_decrypt_ (&ub[1], size - sizeof (struct UBlock),
@@
-553,9
+550,9
@@
void
GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc)
{
const char *keyword;
GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc)
{
const char *keyword;
- const struct GNUNET_CRYPTO_Ec
c
PrivateKey *anon;
- struct GNUNET_CRYPTO_Ec
cPublicSign
Key anon_pub;
- struct GNUNET_CRYPTO_Ec
cPublicSign
Key dpub;
+ const struct GNUNET_CRYPTO_Ec
dsa
PrivateKey *anon;
+ struct GNUNET_CRYPTO_Ec
dsaPublic
Key anon_pub;
+ struct GNUNET_CRYPTO_Ec
dsaPublic
Key dpub;
if (NULL == uc->dsh)
uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg);
if (NULL == uc->dsh)
uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg);
@@
-573,10
+570,10
@@
GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc)
unindex_finish (uc);
return;
}
unindex_finish (uc);
return;
}
- anon = GNUNET_CRYPTO_ec
c
_key_get_anonymous ();
- GNUNET_CRYPTO_ec
c_key_get_public_for_signature
(anon, &anon_pub);
+ anon = GNUNET_CRYPTO_ec
dsa
_key_get_anonymous ();
+ GNUNET_CRYPTO_ec
dsa_key_get_public
(anon, &anon_pub);
keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1];
keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1];
- GNUNET_CRYPTO_ec
c
_public_key_derive (&anon_pub,
+ GNUNET_CRYPTO_ec
dsa
_public_key_derive (&anon_pub,
keyword,
"fs-ublock",
&dpub);
keyword,
"fs-ublock",
&dpub);
@@
-730,7
+727,7
@@
GNUNET_FS_unindex_signal_suspend_ (void *cls)
}
if (NULL != uc->tc)
{
}
if (NULL != uc->tc)
{
- GNUNET_FS_tree_encoder_finish (uc->tc, NULL
, NULL
);
+ GNUNET_FS_tree_encoder_finish (uc->tc, NULL);
uc->tc = NULL;
}
if (uc->fh != NULL)
uc->tc = NULL;
}
if (uc->fh != NULL)
@@
-760,7
+757,7
@@
GNUNET_FS_unindex_signal_suspend_ (void *cls)
* @return NULL on error, otherwise handle
*/
struct GNUNET_FS_UnindexContext *
* @return NULL on error, otherwise handle
*/
struct GNUNET_FS_UnindexContext *
-GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
+GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
const char *filename,
void *cctx)
{
const char *filename,
void *cctx)
{
@@
-770,7
+767,7
@@
GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
if (GNUNET_OK != GNUNET_DISK_file_size (filename, &size, GNUNET_YES, GNUNET_YES))
return NULL;
if (GNUNET_OK != GNUNET_DISK_file_size (filename, &size, GNUNET_YES, GNUNET_YES))
return NULL;
- ret = GNUNET_
malloc (sizeof (struct GNUNET_FS_UnindexContext)
);
+ ret = GNUNET_
new (struct GNUNET_FS_UnindexContext
);
ret->h = h;
ret->filename = GNUNET_strdup (filename);
ret->start_time = GNUNET_TIME_absolute_get ();
ret->h = h;
ret->filename = GNUNET_strdup (filename);
ret->start_time = GNUNET_TIME_absolute_get ();
@@
-831,7
+828,7
@@
GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc)
}
if (NULL != uc->tc)
{
}
if (NULL != uc->tc)
{
- GNUNET_FS_tree_encoder_finish (uc->tc, NULL
, NULL
);
+ GNUNET_FS_tree_encoder_finish (uc->tc, NULL);
uc->tc = NULL;
}
if (uc->fh != NULL)
uc->tc = NULL;
}
if (uc->fh != NULL)