GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
*
* @param cls closure (user-defined)
* @param plugin_name name of the plugin that produced this value;
- * special values can be used (i.e. '<zlib>' for zlib being
+ * special values can be used (i.e. '<zlib>' for zlib being
* used in the main libextractor library and yielding
* meta data).
* @param type libextractor-type describing the meta data
* @param offset offset of data in the directory
* @param dep function to call on each entry
* @param dep_cls closure for dep
+ * @return GNUNET_OK if this could be a block in a directory,
+ * GNUNET_NO if this could be part of a directory (but not 100% OK)
+ * GNUNET_SYSERR if 'data' does not represent a directory
*/
-void
+int
GNUNET_FS_directory_list_contents (size_t size,
const void *data,
uint64_t offset,
{
struct GetFullDataClosure full_data;
const char *cdata = data;
- char *file_data;
char *emsg;
uint64_t pos;
uint64_t align;
struct GNUNET_CONTAINER_MetaData *md;
char *filename;
+ if ( (offset == 0) &&
+ ( (size < 8 + sizeof (uint32_t)) ||
+ (0 != memcmp (cdata, GNUNET_FS_DIRECTORY_MAGIC, 8)) ) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("MAGIC mismatch. This is not a GNUnet directory.\n"));
+ return GNUNET_SYSERR;
+ }
pos = offset;
- if ( (pos == 0) &&
- (size >= 8 + sizeof (uint32_t)) &&
- (0 == memcmp (cdata, GNUNET_FS_DIRECTORY_MAGIC, 8)) )
+ if (offset == 0)
{
memcpy (&mdSize, &cdata[8], sizeof (uint32_t));
mdSize = ntohl (mdSize);
{
/* invalid size */
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Not a GNUnet directory.\n"));
- return;
+ _("MAGIC mismatch. This is not a GNUnet directory.\n"));
+ return GNUNET_SYSERR;
}
md = GNUNET_CONTAINER_meta_data_deserialize (&cdata[8 +
sizeof (uint32_t)],
mdSize);
if (md == NULL)
{
- GNUNET_break (0);
- return; /* malformed ! */
+ GNUNET_break (0);
+ return GNUNET_SYSERR; /* malformed ! */
}
dep (dep_cls,
NULL,
while ((epos < size) && (cdata[epos] != '\0'))
epos++;
if (epos >= size)
- return; /* malformed - or partial download */
+ return GNUNET_NO; /* malformed - or partial download */
uri = GNUNET_FS_uri_parse (&cdata[pos], &emsg);
pos = epos + 1;
{
GNUNET_FS_uri_destroy (uri);
GNUNET_break (0);
- return; /* illegal in directory! */
+ return GNUNET_NO; /* illegal in directory! */
}
memcpy (&mdSize, &cdata[pos], sizeof (uint32_t));
if (pos + mdSize > size)
{
GNUNET_FS_uri_destroy (uri);
- return; /* malformed - or partial download */
+ return GNUNET_NO; /* malformed - or partial download */
}
md = GNUNET_CONTAINER_meta_data_deserialize (&cdata[pos], mdSize);
{
GNUNET_FS_uri_destroy (uri);
GNUNET_break (0);
- return; /* malformed ! */
+ return GNUNET_NO; /* malformed ! */
}
pos += mdSize;
filename = GNUNET_CONTAINER_meta_data_get_by_type (md,
filename,
uri,
md,
- full_data.data,
- full_data.size);
+ full_data.size,
+ full_data.data);
}
- GNUNET_free_non_null (full_data.file_data);
+ GNUNET_free_non_null (full_data.data);
GNUNET_free_non_null (filename);
GNUNET_CONTAINER_meta_data_destroy (md);
GNUNET_FS_uri_destroy (uri);
}
+ return GNUNET_OK;
}
/**
GNUNET_assert (! GNUNET_FS_uri_test_ksk (uri));
if (NULL != data)
- if (GNUNET_FS_uri_test_chk (uri))
- fsize = GNUNET_FS_uri_chk_get_file_size (uri);
- else
- {
- curi = GNUNET_FS_uri_loc_get_uri (uri);
- fsize = GNUNET_FS_uri_chk_get_file_size (curi);
- GNUNET_FS_uri_destroy (curi);
- }
+ {
+ GNUNET_assert (! GNUNET_FS_uri_test_sks (uri));
+ if (GNUNET_FS_uri_test_chk (uri))
+ {
+ fsize = GNUNET_FS_uri_chk_get_file_size (uri);
+ }
+ else
+ {
+ curi = GNUNET_FS_uri_loc_get_uri (uri);
+ GNUNET_assert (NULL != curi);
+ fsize = GNUNET_FS_uri_chk_get_file_size (curi);
+ GNUNET_FS_uri_destroy (curi);
+ }
+ }
else
- fsize = 0; /* not given */
+ {
+ fsize = 0; /* not given */
+ }
if (fsize > MAX_INLINE_SIZE)
fsize = 0; /* too large */
uris = GNUNET_FS_uri_to_string (uri);
badness = cbad;
}
}
+ GNUNET_assert (best != -1);
tmp = perm[i];
perm[i] = perm[best];
perm[best] = tmp;
ssize_t ret;
uint32_t big;
- size = 8 + sizeof (uint32_t);
+ size = strlen (GNUNET_DIRECTORY_MAGIC) + sizeof (uint32_t);
size += GNUNET_CONTAINER_meta_data_get_serialized_size (bld->meta);
sizes = NULL;
perm = NULL;
"malloc");
*rsize = 0;
*rdata = NULL;
+ GNUNET_free_non_null (sizes);
+ GNUNET_free_non_null (perm);
+ GNUNET_free_non_null (bes);
return GNUNET_SYSERR;
}
*rdata = data;
- memcpy (data, GNUNET_DIRECTORY_MAGIC, 8);
- off = 8;
+ memcpy (data, GNUNET_DIRECTORY_MAGIC, strlen (GNUNET_DIRECTORY_MAGIC));
+ off = strlen (GNUNET_DIRECTORY_MAGIC);
sptr = &data[off + sizeof (uint32_t)];
ret = GNUNET_CONTAINER_meta_data_serialize (bld->meta,
GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
GNUNET_assert (ret != -1);
big = htonl (ret);
- memcpy (&data[8], &big, sizeof (uint32_t));
+ memcpy (&data[off], &big, sizeof (uint32_t));
off += sizeof (uint32_t) + ret;
for (j = 0; j < bld->count; j++)
{