* @file hello/hello.c
* @brief helper library for handling HELLOs
* @author Christian Grothoff
+ * @author Matthias Wachs
*/
#include "platform.h"
#include "gnunet_hello_lib.h"
*/
int ret;
+ /**
+ * Counter
+ */
+ unsigned int counter_total;
+
+ /**
+ * Counter skipped addresses
+ */
+ unsigned int counter_added;
+
+
/**
* Function for finding transport plugins by name.
*/
used = 0;
if (addrgen != NULL)
{
- while (0 != (ret = addrgen (addrgen_cls, max, &buffer[used])))
+ while (GNUNET_SYSERR != (ret = addrgen (addrgen_cls, max, &buffer[used])))
{
max -= ret;
used += ret;
address.address = &inptr[esize - alen];
address.address_length = alen;
address.transport_name = inptr;
+ address.local_info = GNUNET_HELLO_ADDRESS_INFO_NONE;
iret = it (it_cls, &address, GNUNET_TIME_absolute_ntoh (expire));
if (iret == GNUNET_SYSERR)
{
}
-static size_t
+static ssize_t
merge_addr (void *cls, size_t max, void *buf)
{
struct MergeContext *mc = cls;
if (mc->h1 == NULL)
- return 0;
+ return GNUNET_SYSERR; /* Stop iteration */
mc->ret = 0;
mc->max = max;
mc->buf = buf;
int friend_only;
if (h1->friend_only != h2->friend_only)
- friend_only = GNUNET_YES; /* One of the HELLOs is friend only */
+ friend_only = GNUNET_YES; /* One of the HELLOs is friend only */
else
- friend_only = ntohl (h1->friend_only); /* Both HELLO's have the same type */
+ friend_only = ntohl (h1->friend_only); /* Both HELLO's have the same type */
- return GNUNET_HELLO_create (&h1->publicKey, &merge_addr, &mc, friend_only);
+ return GNUNET_HELLO_create (&h1->publicKey, &merge_addr, &mc, friend_only);
}
static int
-find_min_expire (void *cls, const struct GNUNET_HELLO_Address *address,
+find_max_expire (void *cls, const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute expiration)
{
- struct GNUNET_TIME_Absolute *min = cls;
+ struct GNUNET_TIME_Absolute *max = cls;
- *min = GNUNET_TIME_absolute_min (*min, expiration);
+ *max = GNUNET_TIME_absolute_max (*max, expiration);
return GNUNET_OK;
}
struct GNUNET_TIME_Absolute ret;
ret.abs_value_us = 0;
- GNUNET_HELLO_iterate_addresses (msg, GNUNET_NO, &find_min_expire, &ret);
+ GNUNET_HELLO_iterate_addresses (msg, GNUNET_NO, &find_max_expire, &ret);
return ret;
}
* @param cls the 'struct GNUNET_HELLO_AddressParsingContext'
* @param max number of bytes available for HELLO construction
* @param buffer where to copy the next address (in binary format)
- * @return number of bytes added to buffer
+ * @return number of bytes added to buffer, GNUNET_SYSERR on error
*/
-static size_t
+static ssize_t
add_address_to_hello (void *cls, size_t max, void *buffer)
{
struct GNUNET_HELLO_ParseUriContext *ctx = cls;
void *addr;
size_t addr_len;
struct GNUNET_HELLO_Address haddr;
- size_t ret;
+ ssize_t ret;
+
if (NULL == ctx->pos)
- return 0;
+ return GNUNET_SYSERR;
if ('!' != ctx->pos[0])
{
ctx->ret = GNUNET_SYSERR;
GNUNET_break (0);
- return 0;
+ return GNUNET_SYSERR;
}
ctx->pos++;
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to parse HELLO message: missing expiration time\n"));
GNUNET_break (0);
- return 0;
+ return GNUNET_SYSERR;
}
expiration_seconds = mktime (&expiration_time);
_("Failed to parse HELLO message: invalid expiration time\n"));
ctx->ret = GNUNET_SYSERR;
GNUNET_break (0);
- return 0;
+ return GNUNET_SYSERR;
}
expire.abs_value_us = expiration_seconds * 1000LL * 1000LL;
}
_("Failed to parse HELLO message: malformed\n"));
ctx->ret = GNUNET_SYSERR;
GNUNET_break (0);
- return 0;
+ return GNUNET_SYSERR;
}
tname++;
address = strchr (tname, (int) '!');
_("Failed to parse HELLO message: missing transport plugin\n"));
ctx->ret = GNUNET_SYSERR;
GNUNET_break (0);
- return 0;
+ return GNUNET_SYSERR;
}
address++;
end = strchr (address, (int) '!');
ctx->pos = end;
+ ctx->counter_total ++;
plugin_name = GNUNET_strndup (tname, address - (tname+1));
papi = ctx->plugins_find (plugin_name);
if (NULL == papi)
* Skip this part, advance to the next one and recurse.
* But only if this is not the end of string.
*/
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin `%s' not found\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Plugin `%s' not found, skipping address\n"),
plugin_name);
GNUNET_free (plugin_name);
- GNUNET_break (0);
return 0;
}
if (NULL == papi->string_to_address)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Plugin `%s' does not support URIs yet\n"),
plugin_name);
GNUNET_free (plugin_name);
haddr.address = addr;
haddr.transport_name = plugin_name;
ret = GNUNET_HELLO_add_address (&haddr, expire, buffer, max);
+ ctx->counter_added ++;
GNUNET_free (addr);
GNUNET_free (plugin_name);
return ret;
ctx.pos = exc;
ctx.ret = GNUNET_OK;
+ ctx.counter_total = 0;
+ ctx.counter_added = 0;
ctx.plugins_find = plugins_find;
*hello = GNUNET_HELLO_create (pubkey, &add_address_to_hello, &ctx, friend_only);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("HELLO URI contained %u addresses, added %u addresses\n"),
+ ctx.counter_total, ctx.counter_added);
+
return ctx.ret;
}