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
/**
* Context for the address lookup.
- */
+ */
struct AddressLookupCtx
{
/**
* message with the human-readable address
*/
static void
-address_response_processor (void *cls,
+address_response_processor (void *cls,
const struct GNUNET_MessageHeader *msg)
{
struct AddressLookupCtx *alucb = cls;
GNUNET_CLIENT_receive (alucb->client,
&address_response_processor, alucb,
GNUNET_TIME_absolute_get_remaining
- (alucb->timeout));
+ (alucb->timeout));
alucb->cb (alucb->cb_cls, address);
}
/**
* Convert a binary address into a human readable address.
*
- * @param sched scheduler to use
* @param cfg configuration to use
* @param address address to convert (binary format)
* @param addressLen number of bytes in address
- * @param numeric should (IP) addresses be displayed in numeric form
+ * @param numeric should (IP) addresses be displayed in numeric form
* (otherwise do reverse DNS lookup)
* @param nameTrans name of the transport to which the address belongs
* @param timeout how long is the lookup allowed to take at most
* @param aluc_cls closure for aluc
*/
void
-GNUNET_TRANSPORT_address_lookup (struct GNUNET_SCHEDULER_Handle *sched,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- const char *address,
+GNUNET_TRANSPORT_address_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const char *address,
size_t addressLen,
int numeric,
const char *nameTrans,
size_t slen;
size_t len;
struct AddressLookupMessage *msg;
- struct GNUNET_TIME_Absolute abs_timeout;
struct AddressLookupCtx *aluCB;
struct GNUNET_CLIENT_Connection *client;
char *addrbuf;
aluc (aluc_cls, NULL);
return;
}
- client = GNUNET_CLIENT_connect (sched, "transport", cfg);
+ client = GNUNET_CLIENT_connect ("transport", cfg);
if (client == NULL)
{
aluc (aluc_cls, NULL);
return;
}
- abs_timeout = GNUNET_TIME_relative_to_absolute (timeout);
msg = GNUNET_malloc (len);
msg->header.size = htons (len);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_LOOKUP);
msg->numeric_only = htonl (numeric);
- msg->timeout = GNUNET_TIME_absolute_hton (abs_timeout);
+ msg->timeout = GNUNET_TIME_relative_hton (timeout);
msg->addrlen = htonl (addressLen);
addrbuf = (char *) &msg[1];
memcpy (addrbuf, address, addressLen);
aluCB = GNUNET_malloc (sizeof (struct AddressLookupCtx));
aluCB->cb = aluc;
aluCB->cb_cls = aluc_cls;
- aluCB->timeout = abs_timeout;
+ aluCB->timeout = GNUNET_TIME_relative_to_absolute (timeout);
aluCB->client = client;
GNUNET_assert (GNUNET_OK ==
- GNUNET_CLIENT_transmit_and_get_response (client,
- &msg->header,
+ GNUNET_CLIENT_transmit_and_get_response (client,
+ &msg->header,
timeout,
GNUNET_YES,
&address_response_processor,