* Process a given reply that might match the given
* request.
*
- * @param cls the 'struct GNUNET_GNS_ClientResultMessage'
- * @param key query of the request
- * @param value the 'struct GNUNET_GNS_LookupHandle' of a request matching the same key
+ * @param qe a queue entry
+ * @param msg the shorten msg received
*/
static void
process_shorten_reply (struct GNUNET_GNS_QueueEntry *qe,
{
GNUNET_break (0);
force_reconnect (h);
+ GNUNET_free(qe);
return;
}
"Received shortened reply `%s' from GNS service\n",
short_name);
+ GNUNET_CLIENT_receive (h->client, &process_message, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
qe->shorten_proc(qe->proc_cls, short_name);
+ GNUNET_free(qe);
}
if (ntohs (((struct GNUNET_MessageHeader*)msg)->size) <
sizeof (struct GNUNET_GNS_ClientGetAuthResultMessage))
{
+ GNUNET_free(qe);
GNUNET_break (0);
force_reconnect (h);
return;
"Received GET_AUTH reply `%s' from GNS service\n",
auth_name);
+ GNUNET_CLIENT_receive (h->client, &process_message, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
qe->auth_proc(qe->proc_cls, auth_name);
+ GNUNET_free(qe);
}
/**
* Process a given reply to the lookup request
*
- * @param cls the 'struct GNUNET_GNS_ClientResultMessage'
- * @param key query of the request
- * @param value the 'struct GNUNET_GNS_LookupHandle' of a request matching the same key
- * @return GNUNET_YES to continue to iterate over all results,
- * GNUNET_NO if the reply is malformed
+ * @param qe a queue entry
+ * @param msg the lookup message received
*/
static void
process_lookup_reply (struct GNUNET_GNS_QueueEntry *qe,
if (len < sizeof (struct GNUNET_GNS_ClientLookupResultMessage))
{
+ GNUNET_free(qe);
GNUNET_break (0);
force_reconnect (h);
return;
len -= sizeof(struct GNUNET_GNS_ClientLookupResultMessage);
- GNUNET_NAMESTORE_records_deserialize (len, (char*)&msg[1],
- rd_count,
- rd);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received lookup reply from GNS service (count=%d)\n",
- ntohl(msg->rd_count));
+ GNUNET_CLIENT_receive (h->client, &process_message, h,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (len,
+ (char*)&msg[1],
+ rd_count,
+ rd))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to serialize lookup reply from GNS service!\n");
+ qe->lookup_proc(qe->proc_cls, 0, NULL);
+ }
+ else
+ {
- qe->lookup_proc(qe->proc_cls, rd_count, rd);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received lookup reply from GNS service (count=%d)\n",
+ ntohl(msg->rd_count));
+ qe->lookup_proc(qe->proc_cls, rd_count, rd);
+ }
+ GNUNET_free(qe);
}
/**
const struct GNUNET_GNS_ClientLookupResultMessage *lookup_msg;
const struct GNUNET_GNS_ClientShortenResultMessage *shorten_msg;
const struct GNUNET_GNS_ClientGetAuthResultMessage *get_auth_msg;
- uint16_t size;
uint16_t type;
uint32_t r_id;
"Got message\n");
if (msg == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Error receiving data from GNS service, reconnecting\n");
force_reconnect (handle);
return;
}
- size = ntohs (msg->size);
type = ntohs (msg->type);
if (type == GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT)
GNUNET_break_op (0);
GNUNET_CLIENT_receive (handle->client, &process_message, handle,
GNUNET_TIME_UNIT_FOREVER_REL);
+ return;
}
for (qe = handle->lookup_head; qe != NULL; qe = qe->next)
}
if (qe)
process_lookup_reply(qe, lookup_msg);
-
+
+ return;
}
else if (type == GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT)
GNUNET_break_op (0);
GNUNET_CLIENT_receive (handle->client, &process_message, handle,
GNUNET_TIME_UNIT_FOREVER_REL);
+ return;
}
for (qe = handle->shorten_head; qe != NULL; qe = qe->next)
}
if (qe)
process_shorten_reply(qe, shorten_msg);
+ return;
}
else if (type == GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT)
{
GNUNET_break_op (0);
GNUNET_CLIENT_receive (handle->client, &process_message, handle,
GNUNET_TIME_UNIT_FOREVER_REL);
+ return;
}
for (qe = handle->get_auth_head; qe != NULL; qe = qe->next)
}
if (qe)
process_get_auth_reply(qe, get_auth_msg);
+ return;
}
- GNUNET_CLIENT_receive (handle->client, &process_message, handle,
- GNUNET_TIME_UNIT_FOREVER_REL);
if (GNUNET_YES == handle->reconnect)
force_reconnect (handle);
* Initialize the connection with the GNS service.
*
* @param cfg configuration to use
- * @param ht_len size of the internal hash table to use for parallel requests
* @return handle to the GNS service, or NULL on error
*/
struct GNUNET_GNS_Handle *
struct GNUNET_GNS_Handle *handle;
handle = GNUNET_malloc (sizeof (struct GNUNET_GNS_Handle));
+ handle->reconnect = GNUNET_NO;
handle->cfg = cfg;
reconnect (handle);
//handle->reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect_task, handle);
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
handle->r_id = 0;
handle->in_receive = GNUNET_NO;
return handle;
void
GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
{
+ GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
+ if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (handle->reconnect_task);
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_free(handle);
/* disco from GNS */
}
*
* @param handle handle to the GNS service
* @param name the name to look up
- * @param iter function to call on each result
- * @param iter_cls closure for iter
- * @return handle to stop the async get
+ * @param type the record type to look up
+ * @param proc processor to call on result
+ * @param proc_cls closure for processor
+ * @return handle to the get
*/
struct GNUNET_GNS_QueueEntry *
GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
memcpy(&lookup_msg[1], name, strlen(name));
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail,
pending);
process_pending_messages (handle);
memcpy(&shorten_msg[1], name, strlen(name));
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail,
pending);
process_pending_messages (handle);
memcpy(&get_auth_msg[1], name, strlen(name));
- GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail,
pending);
process_pending_messages (handle);