#include "gnunet_gns_service.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "gns-api",__VA_ARGS__)
+
/**
* Handle to a lookup request
*/
* DLL
*/
struct GNUNET_GNS_LookupRequest *next;
-
+
/**
* DLL
*/
struct GNUNET_GNS_LookupRequest *prev;
-
+
/**
- * handle to gns
+ * handle to gns
*/
struct GNUNET_GNS_Handle *gns_handle;
-
+
/**
- * processor to call on lookup result
+ * processor to call on lookup result
*/
GNUNET_GNS_LookupResultProcessor lookup_proc;
/**
- * processor closure
+ * processor closure
*/
void *proc_cls;
-
+
/**
- * request id
+ * request id
*/
uint32_t r_id;
-
+
};
* Currently pending transmission request (or NULL).
*/
struct GNUNET_CLIENT_TransmitHandle *th;
-
+
/**
* Head of linked list of shorten messages we would like to transmit.
*/
* Tail of linked list of shorten messages we would like to transmit.
*/
struct PendingMessage *pending_tail;
-
+
/**
* Head of linked list of lookup messages we would like to transmit.
*/
* Reconnect task
*/
GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
-
+
/**
* How long do we wait until we try to reconnect?
*/
* Request Id generator. Incremented by one for each request.
*/
uint32_t r_id_gen;
-
+
/**
* Did we start our receive loop yet?
*/
reconnect (struct GNUNET_GNS_Handle *handle)
{
GNUNET_assert (NULL == handle->client);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to connect to GNS\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to connect to GNS\n");
handle->client = GNUNET_CLIENT_connect ("gns", handle->cfg);
GNUNET_assert (NULL != handle->client);
process_pending_messages (handle);
p->transmitted = GNUNET_NO;
GNUNET_CONTAINER_DLL_insert (handle->pending_head,
handle->pending_tail,
- p);
+ p);
}
handle->reconnect_backoff = GNUNET_TIME_STD_BACKOFF (handle->reconnect_backoff);
handle->reconnect_task = GNUNET_SCHEDULER_add_delayed (handle->reconnect_backoff,
struct PendingMessage *p = handle->pending_head;
if (NULL == handle->client)
- return; /* wait for reconnect */
+ return; /* wait for reconnect */
if (NULL != handle->th)
- return; /* transmission request already pending */
+ return; /* transmission request already pending */
while ((NULL != p) && (p->transmitted == GNUNET_YES))
p = p->next;
if (NULL == p)
return; /* no messages pending */
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to transmit %u bytes\n",
- (unsigned int) p->size);
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to transmit %u bytes\n",
+ (unsigned int) p->size);
handle->th =
GNUNET_CLIENT_notify_transmit_ready (handle->client,
p->size,
handle->th = NULL;
if ((0 == size) || (NULL == buf))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmission to GNS service failed!\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmission to GNS service failed!\n");
force_reconnect (handle);
return 0;
- }
+ }
if (NULL == (p = handle->pending_head))
return 0;
handle->in_receive = GNUNET_YES;
}
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending %u bytes\n",
- (unsigned int) tsize);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending %u bytes\n",
+ (unsigned int) tsize);
process_pending_messages (handle);
return tsize;
}
rd_count,
rd))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to serialize lookup reply from GNS service!\n"));
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to serialize lookup reply from GNS service!\n"));
qe->lookup_proc (qe->proc_cls, 0, NULL);
}
else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received lookup reply from GNS service (%u records)\n",
- (unsigned int) rd_count);
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received lookup reply from GNS service (%u records)\n",
+ (unsigned int) rd_count);
qe->lookup_proc (qe->proc_cls, rd_count, rd);
}
GNUNET_CONTAINER_DLL_remove (handle->lookup_head, handle->lookup_tail, qe);
struct GNUNET_GNS_LookupRequest *lr;
const struct GNUNET_GNS_ClientLookupResultMessage *lookup_msg;
uint32_t r_id;
-
+
if (NULL == msg)
{
force_reconnect (handle);
switch (ntohs (msg->type))
{
case GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got LOOKUP_RESULT msg\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got LOOKUP_RESULT msg\n");
if (ntohs (msg->size) < sizeof (struct GNUNET_GNS_ClientLookupResultMessage))
{
GNUNET_break (0);
return;
}
lookup_msg = (const struct GNUNET_GNS_ClientLookupResultMessage *) msg;
- r_id = ntohl (lookup_msg->id);
- for (lr = handle->lookup_head; NULL != lr; lr = lr->next)
+ r_id = ntohl (lookup_msg->id);
+ for (lr = handle->lookup_head; NULL != lr; lr = lr->next)
if (lr->r_id == r_id)
{
- process_lookup_reply(lr, lookup_msg);
+ process_lookup_reply(lr, lookup_msg);
break;
}
break;
void
GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
{
- GNUNET_CLIENT_disconnect (handle->client);
+ if (NULL != handle->client)
+ {
+ GNUNET_CLIENT_disconnect (handle->client);
+ handle->client = NULL;
+ }
if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task)
{
GNUNET_SCHEDULER_cancel (handle->reconnect_task);
{
struct PendingMessage *p = (struct PendingMessage*) &lr[1];
- GNUNET_assert (NULL != lr->gns_handle);
+ GNUNET_assert (NULL != lr->gns_handle);
if (GNUNET_NO == p->transmitted)
GNUNET_CONTAINER_DLL_remove (lr->gns_handle->pending_head,
lr->gns_handle->pending_tail,
struct GNUNET_GNS_LookupRequest*
GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
const char *name,
- const struct GNUNET_CRYPTO_EccPublicSignKey *zone,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *zone,
int type,
int only_cached,
- const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone_key,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_zone_key,
GNUNET_GNS_LookupResultProcessor proc,
void *proc_cls)
{
{
GNUNET_break (0);
return NULL;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to lookup `%s' in GNS\n",
- name);
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to lookup `%s' in GNS\n",
+ name);
msize = sizeof (struct GNUNET_GNS_ClientLookupMessage)
+ strlen (name) + 1;
if (msize > UINT16_MAX)
lookup_msg->type = htonl (type);
if (NULL != shorten_zone_key)
{
- lookup_msg->have_key = htonl (GNUNET_YES);
+ lookup_msg->have_key = htons (GNUNET_YES);
lookup_msg->shorten_key = *shorten_zone_key;
}
memcpy (&lookup_msg[1], name, strlen (name) + 1);