/*
This file is part of GNUnet.
- (C) 2011-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2014 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
*/
struct ValidationResolutionContext *prev;
- /**
- * Peer identity
- */
- struct GNUNET_PeerIdentity id;
-
/**
* Address to resolve
*/
tc->name);
break;
default:
+ FPRINTF (stderr,
+ _("Configuration for plugin `%s' did not work!\n"),
+ tc->name);
break;
}
-
- if (GNUNET_YES != result)
- {
- FPRINTF (stderr,
- _("Configuration for plugin `%s' did not work!\n"),
- tc->name);
- }
- else
- {
- FPRINTF (stderr,
- _("Configuration for plugin `%s' is working!\n"),
- tc->name);
- }
if (NULL != tc->tsk)
{
GNUNET_SCHEDULER_cancel (tc->tsk);
/**
* Resolve address we got a validation state for to a string.
*
- * @param id peer identity the address is for
* @param address the address itself
* @param numeric #GNUNET_YES to disable DNS, #GNUNET_NO to try reverse lookup
* @param last_validation when was the address validated last
* @param state where are we in the validation state machine
*/
static void
-resolve_validation_address (const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_HELLO_Address *address,
+resolve_validation_address (const struct GNUNET_HELLO_Address *address,
int numeric,
struct GNUNET_TIME_Absolute last_validation,
struct GNUNET_TIME_Absolute valid_until,
{
FPRINTF (stderr,
"Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
- GNUNET_i2s (&vc->id),
+ GNUNET_i2s (&vc->addrcp->peer),
vc->addrcp->transport_name,
(unsigned int) vc->addrcp->address_length);
}
FPRINTF (stdout,
_("Peer `%s' %s %s\n\t%s%s\n\t%s%s\n\t%s%s\n"),
- GNUNET_i2s (&vc->id),
+ GNUNET_i2s (&vc->addrcp->peer),
(GNUNET_OK == res) ? address : "<invalid address>",
(monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "",
"Valid until : ", s_valid,
(note: this should be unnecessary, as
transport should fallback to numeric lookup
internally if DNS takes too long anyway) */
- resolve_validation_address (&vc->id,
- vc->addrcp,
+ resolve_validation_address (vc->addrcp,
GNUNET_NO,
vc->last_validation,
vc->valid_until,
{
FPRINTF (stdout,
_("Peer `%s' %s `%s' \n"),
- GNUNET_i2s (&vc->id),
+ GNUNET_i2s (&vc->addrcp->peer),
"<unable to resolve address>",
GNUNET_TRANSPORT_vs2s (vc->state));
}
/**
* Resolve address we got a validation state for to a string.
*
- * @param id peer identity the address is for
* @param address the address itself
* @param numeric #GNUNET_YES to disable DNS, #GNUNET_NO to try reverse lookup
* @param last_validation when was the address validated last
* @param state where are we in the validation state machine
*/
static void
-resolve_validation_address (const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_HELLO_Address *address,
+resolve_validation_address (const struct GNUNET_HELLO_Address *address,
int numeric,
struct GNUNET_TIME_Absolute last_validation,
struct GNUNET_TIME_Absolute valid_until,
GNUNET_CONTAINER_DLL_insert(vc_head, vc_tail, vc);
address_resolutions++;
- vc->id = (*id);
vc->transport = GNUNET_strdup(address->transport_name);
vc->addrcp = GNUNET_HELLO_address_copy (address);
vc->printed = GNUNET_NO;
* Resolve address we got a validation state for to a string.
*
* @param cls NULL
- * @param peer peer identity the address is for
* @param address the address itself
* @param last_validation when was the address validated last
* @param valid_until until when is the address valid
*/
static void
process_validation_cb (void *cls,
- const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute last_validation,
struct GNUNET_TIME_Absolute valid_until,
struct GNUNET_TIME_Absolute next_validation,
enum GNUNET_TRANSPORT_ValidationState state)
{
- if ((NULL == peer) && (NULL == address))
+ if (NULL == address)
{
if (monitor_validation)
{
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
- if ((NULL == peer) || (NULL == address))
+ if (NULL == address)
{
/* invalid response */
vic = NULL;
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
- resolve_validation_address (peer,
- address,
+ resolve_validation_address (address,
numeric,
last_validation,
valid_until,
GNUNET_CONTAINER_DLL_insert(rc_head, rc_tail, rc);
address_resolutions++;
- rc->id = (*id);
+ rc->id = *id;
rc->transport = GNUNET_strdup(address->transport_name);
rc->addrcp = GNUNET_HELLO_address_copy (address);
rc->printed = GNUNET_NO;