* Iterator callback to go over all addresses.
*
* @param cls closure
- * @param tname name of the transport
+ * @param address the address
* @param expiration expiration time
- * @param addr the address
- * @param addrlen length of the address
* @return GNUNET_OK to keep the address and continue
*/
static int
-count_address (void *cls, const char *tname,
- struct GNUNET_TIME_Absolute expiration, const void *addr,
- uint16_t addrlen)
+count_address (void *cls, const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute expiration)
{
struct PrintContext *pc = cls;
* Iterator callback to go over all addresses.
*
* @param cls closure
- * @param tname name of the transport
+ * @param address the address
* @param expiration expiration time
- * @param addr the address
- * @param addrlen length of the address
* @return GNUNET_OK to keep the address and continue
*/
static int
-print_address (void *cls, const char *tname,
- struct GNUNET_TIME_Absolute expiration, const void *addr,
- uint16_t addrlen)
+print_address (void *cls, const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute expiration)
{
struct PrintContext *pc = cls;
- GNUNET_TRANSPORT_address_lookup (cfg, addr, addrlen, no_resolve, tname,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 10),
- &process_resolved_address, pc);
+ GNUNET_TRANSPORT_address_to_string (cfg, address, no_resolve,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 10),
+ &process_resolved_address, pc);
return GNUNET_OK;
}
if (peer == NULL)
{
if (err_msg != NULL)
- fprintf (stderr, _("Error in communication with PEERINFO service\n"));
+ FPRINTF (stderr, "%s", _("Error in communication with PEERINFO service\n"));
GNUNET_PEERINFO_disconnect (peerinfo);
return;
}
- if (be_quiet)
+ if ((be_quiet) || (NULL == hello))
{
GNUNET_CRYPTO_hash_to_enc (&peer->hashPubKey, &enc);
printf ("%s\n", (const char *) &enc);
cfg = c;
if (args[0] != NULL)
{
- fprintf (stderr, _("Invalid command line argument `%s'\n"), args[0]);
+ FPRINTF (stderr, _("Invalid command line argument `%s'\n"), args[0]);
return;
}
if (get_self != GNUNET_YES)
peerinfo = GNUNET_PEERINFO_connect (cfg);
if (peerinfo == NULL)
{
- fprintf (stderr, _("Could not access PEERINFO service. Exiting.\n"));
+ FPRINTF (stderr, "%s", _("Could not access PEERINFO service. Exiting.\n"));
return;
}
GNUNET_PEERINFO_iterate (peerinfo, NULL,
GNUNET_CONFIGURATION_get_value_filename (cfg, "GNUNETD", "HOSTKEY",
&fn))
{
- fprintf (stderr, _("Could not find option `%s:%s' in configuration.\n"),
+ FPRINTF (stderr, _("Could not find option `%s:%s' in configuration.\n"),
"GNUNETD", "HOSTKEYFILE");
return;
}
priv = GNUNET_CRYPTO_rsa_key_create_from_file (fn);
if (priv == NULL)
{
- fprintf (stderr, _("Loading hostkey from `%s' failed.\n"), fn);
+ FPRINTF (stderr, _("Loading hostkey from `%s' failed.\n"), fn);
GNUNET_free (fn);
return;
}