[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22346 - gnunet/src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22346 - gnunet/src/namestore |
|
Date: |
Wed, 27 Jun 2012 15:32:10 +0200 |
Author: grothoff
Date: 2012-06-27 15:32:10 +0200 (Wed, 27 Jun 2012)
New Revision: 22346
Modified:
gnunet/src/namestore/namestore_api.c
Log:
-major cleanup and various minor bugfixes for namestore_api
Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c 2012-06-27 12:24:26 UTC (rev
22345)
+++ gnunet/src/namestore/namestore_api.c 2012-06-27 13:32:10 UTC (rev
22346)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ (C) 2010, 2011, 2012 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
@@ -23,6 +23,7 @@
* @brief API to access the NAMESTORE service
* @author Martin Schanzenbach
* @author Matthias Wachs
+ * @author Christian Grothoff
*/
#include "platform.h"
@@ -39,6 +40,12 @@
#define LOG(kind,...) GNUNET_log_from (kind, "gns-api",__VA_ARGS__)
/**
+ * Maximum length of any name, including 0-termination.
+ */
+#define MAX_NAME_LEN 256
+
+
+/**
* An QueueEntry used to store information for a pending
* NAMESTORE record operation
*/
@@ -253,83 +260,70 @@
* @param qe the respective entry in the message queue
* @param msg the message we received
* @param size the message size
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error and we did NOT notify
the client
*/
-static void
+static int
handle_lookup_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- struct LookupNameResponseMessage * msg,
+ const struct LookupNameResponseMessage * msg,
size_t size)
{
- struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
- char *name;
- char * rd_tmp;
- struct GNUNET_CRYPTO_RsaSignature *signature = NULL;
+ const char *name;
+ const char * rd_tmp;
+ const struct GNUNET_CRYPTO_RsaSignature *signature;
struct GNUNET_TIME_Absolute expire;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key_tmp;
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key_tmp;
size_t exp_msg_len;
- size_t msg_len = 0;
- size_t name_len = 0;
- size_t rd_len = 0;
- int contains_sig = GNUNET_NO;
- int rd_count = 0;
+ size_t msg_len;
+ size_t name_len;
+ size_t rd_len;
+ int contains_sig;
+ int rd_count;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
- "LOOKUP_NAME_RESPONSE");
- /* Operation done, remove */
- GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n", "LOOKUP_NAME_RESPONSE");
rd_len = ntohs (msg->rd_len);
rd_count = ntohs (msg->rd_count);
msg_len = ntohs (msg->gns_header.header.size);
name_len = ntohs (msg->name_len);
contains_sig = ntohs (msg->contains_sig);
- expire = GNUNET_TIME_absolute_ntoh(msg->expire);
-
+ expire = GNUNET_TIME_absolute_ntoh (msg->expire);
exp_msg_len = sizeof (struct LookupNameResponseMessage) +
sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
name_len + rd_len;
-
if (msg_len != exp_msg_len)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Message size describes with `%u' bytes but
calculated size is %u bytes \n",
- msg_len, exp_msg_len);
- GNUNET_break_op (0);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
-
- name = (char *) &msg[1];
- if (name_len > 0)
+ name = (const char *) &msg[1];
+ if ( (name_len > 0) &&
+ ('\0' != name[name_len -1]) )
{
- GNUNET_assert ('\0' == name[name_len -1]);
- GNUNET_assert ((name_len - 1) == strlen(name));
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
rd_tmp = &name[name_len];
-
- /* deserialize records */
{
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+
if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize(rd_len, rd_tmp,
rd_count, rd))
{
- GNUNET_break_op (0);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
-
-
- /* reset values if values not contained */
if (GNUNET_NO == contains_sig)
signature = NULL;
else
signature = &msg->signature;
if (0 == name_len)
name = NULL;
-
if (NULL != name)
- public_key_tmp = &msg->public_key;
+ public_key_tmp = &msg->public_key;
else
- public_key_tmp = NULL;
-
+ public_key_tmp = NULL;
if (NULL != qe->proc)
qe->proc (qe->proc_cls, public_key_tmp, expire, name, rd_count,
(rd_count > 0) ? rd : NULL, signature);
}
- GNUNET_free (qe);
+ return GNUNET_OK;
}
@@ -339,43 +333,22 @@
* @param qe the respective entry in the message queue
* @param msg the message we received
* @param size the message size
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error and we did NOT notify
the client
*/
-static void
+static int
handle_record_put_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- struct RecordPutResponseMessage* msg,
- size_t size)
+ const struct RecordPutResponseMessage* msg,
+ size_t size)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
- "RECORD_PUT_RESPONSE");
+ int res;
- struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
- /* Operation done, remove */
- GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
-
- int res = ntohl (msg->op_result);
-
- if (res == GNUNET_OK)
- {
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, res, _("Namestore added record successfully"));
- }
-
- }
- else if (res == GNUNET_SYSERR)
- {
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, res, _("Namestore failed to add record"));
- }
- }
- else
- {
- GNUNET_break_op (0);
- return;
- }
-
- GNUNET_free (qe);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
+ "RECORD_PUT_RESPONSE");
+ res = ntohl (msg->op_result);
+ /* TODO: add actual error message from namestore to response... */
+ if (NULL != qe->cont)
+ qe->cont (qe->cont_cls, res, (GNUNET_OK == res) ? NULL : _("Namestore
failed to add record"));
+ return GNUNET_OK;
}
@@ -385,44 +358,27 @@
* @param qe the respective entry in the message queue
* @param msg the message we received
* @param size the message size
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error and we did NOT notify
the client
*/
-static void
+static int
handle_record_create_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- struct RecordCreateResponseMessage* msg,
- size_t size)
+ const struct RecordCreateResponseMessage* msg,
+ size_t size)
{
- struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ int res;
+ const char *emsg;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
"RECORD_CREATE_RESPONSE");
- /* Operation done, remove */
- GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
-
- int res = ntohl (msg->op_result);
- if (res == GNUNET_YES)
- {
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, res, _("Namestore added record successfully"));
- }
-
- }
- else if (res == GNUNET_NO)
- {
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, res, _("Namestore record already existed"));
- }
- }
+ /* TODO: add actual error message from namestore to response... */
+ res = ntohl (msg->op_result);
+ if (GNUNET_SYSERR == res)
+ emsg = _("Namestore failed to add record\n");
else
- {
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, GNUNET_SYSERR, _("Namestore failed to add
record\n"));
- }
- }
-
- GNUNET_free (qe);
+ emsg = NULL;
+ if (NULL != qe->cont)
+ qe->cont (qe->cont_cls, res, emsg);
+ return GNUNET_OK;
}
@@ -432,70 +388,62 @@
* @param qe the respective entry in the message queue
* @param msg the message we received
* @param size the message size
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error and we did NOT notify
the client
*/
-static void
+static int
handle_record_remove_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- struct RecordRemoveResponseMessage* msg,
- size_t size)
+ const struct RecordRemoveResponseMessage* msg,
+ size_t size)
{
+ int res;
+ int ret;
+ const char *emsg;
- struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
-
/* Operation done, remove */
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
"RECORD_REMOVE_RESPONSE");
- GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
-
- int res = ntohl (msg->op_result);
- /**
- * result:
+ /*
+ * results:
* 0 : successful
* 1 : No records for entry
* 2 : Could not find record to remove
* 3 : Failed to create new signature
* 4 : Failed to put new set of records in database
*/
- switch (res) {
- case 0:
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, GNUNET_YES, _("Namestore removed record
successfully"));
- }
-
- break;
- case 1:
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, GNUNET_NO, _("No records for entry"));
- }
-
- break;
- case 2:
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, GNUNET_NO, _("Could not find record to
remove"));
- }
-
- break;
- case 3:
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, GNUNET_SYSERR, _("Failed to create new
signature"));
- }
-
- break;
- case 4:
- if (qe->cont != NULL)
- {
- qe->cont (qe->cont_cls, GNUNET_SYSERR, _("Failed to put new set of
records in database"));
- }
- break;
- default:
- GNUNET_break_op (0);
- break;
+ res = ntohl (msg->op_result);
+ switch (res)
+ {
+ case 0:
+ ret = GNUNET_OK;
+ emsg = NULL;
+ break;
+ case 1:
+ ret = GNUNET_NO;
+ emsg = NULL;
+ break;
+ case 2:
+ ret = GNUNET_NO;
+ emsg = NULL;
+ break;
+ case 3:
+ ret = GNUNET_SYSERR;
+ emsg = _("Failed to create new signature");
+ break;
+ case 4:
+ ret = GNUNET_SYSERR;
+ emsg = _("Failed to put new set of records in database");
+ break;
+ default:
+ GNUNET_break (0);
+ ret = GNUNET_SYSERR;
+ emsg = _("Protocol error");
+ if (NULL != qe->cont)
+ qe->cont (qe->cont_cls, GNUNET_SYSERR, _("Protocol error"));
+ return GNUNET_NO;
}
-
- GNUNET_free (qe);
+ if (NULL != qe->cont)
+ qe->cont (qe->cont_cls, ret, emsg);
+ return GNUNET_OK;
}
@@ -505,69 +453,69 @@
* @param qe the respective entry in the message queue
* @param msg the message we received
* @param size the message size
+ * @return GNUNET_OK on success, GNUNET_NO if we notified the client about
+ * the error, GNUNET_SYSERR on error and we did NOT notify the client
*/
-static void
+static int
handle_zone_to_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
- struct ZoneToNameResponseMessage* msg,
- size_t size)
+ const struct ZoneToNameResponseMessage* msg,
+ size_t size)
{
- struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
- int res = ntohs (msg->res);
+ int res;
struct GNUNET_TIME_Absolute expire;
size_t name_len;
size_t rd_ser_len;
unsigned int rd_count;
+ const char * name_tmp;
+ const char * rd_tmp;
- char * name_tmp;
- char * rd_tmp;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s'\n",
"ZONE_TO_NAME_RESPONSE");
- /* Operation done, remove */
- GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
- if (res == GNUNET_SYSERR)
+ res = ntohs (msg->res);
+ switch (res)
{
+ case GNUNET_SYSERR:
LOG (GNUNET_ERROR_TYPE_DEBUG, "An error occured during zone to name
operation\n");
- if (qe->proc != NULL)
- qe->proc (qe->proc_cls, NULL, GNUNET_TIME_UNIT_ZERO_ABS, NULL, 0, NULL,
NULL);
- }
- else if (res == GNUNET_NO)
- {
+ break;
+ case GNUNET_NO:
LOG (GNUNET_ERROR_TYPE_DEBUG, "Namestore has no result for zone to name
mapping \n");
- if (qe->proc != NULL)
- qe->proc (qe->proc_cls, NULL, GNUNET_TIME_UNIT_ZERO_ABS, NULL, 0, NULL,
NULL);
- }
- else if (res == GNUNET_YES)
- {
+ break;
+ case GNUNET_YES:
LOG (GNUNET_ERROR_TYPE_DEBUG, "Namestore has result for zone to name
mapping \n");
-
name_len = ntohs (msg->name_len);
rd_count = ntohs (msg->rd_count);
rd_ser_len = ntohs (msg->rd_len);
expire = GNUNET_TIME_absolute_ntoh(msg->expire);
-
- name_tmp = (char *) &msg[1];
- if (name_len > 0)
+ name_tmp = (const char *) &msg[1];
+ if ( (name_len > 0) &&
+ ('\0' != name_tmp[name_len -1]) )
{
- GNUNET_assert ('\0' == name_tmp[name_len -1]);
- GNUNET_assert (name_len -1 == strlen(name_tmp));
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
rd_tmp = &name_tmp[name_len];
-
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_tmp,
rd_count, rd))
{
- GNUNET_break_op (0);
- return;
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize(rd_ser_len,
rd_tmp, rd_count, rd))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ /* normal end, call continuation with result */
+ if (NULL != qe->proc)
+ qe->proc (qe->proc_cls, &msg->zone_key, expire, name_tmp, rd_count, rd,
&msg->signature);
+ /* return is important here: break would call continuation with error! */
+ return GNUNET_OK;
}
-
- if (qe->proc != NULL)
- qe->proc (qe->proc_cls, &msg->zone_key, expire, name_tmp, rd_count, rd,
&msg->signature);
+ default:
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- else
- GNUNET_break_op (0);
-
- GNUNET_free (qe);
+ /* error case, call continuation with error */
+ if (NULL != qe->proc)
+ qe->proc (qe->proc_cls, NULL, GNUNET_TIME_UNIT_ZERO_ABS, NULL, 0, NULL,
NULL);
+ return GNUNET_OK;
}
@@ -578,58 +526,56 @@
* @param msg the message we received
* @param type the message type in HBO
* @param size the message size
+ * @return GNUNET_OK on success, GNUNET_NO if we notified the client about
+ * the error, GNUNET_SYSERR on error and we did NOT notify the client
*/
-static void
+static int
manage_record_operations (struct GNUNET_NAMESTORE_QueueEntry *qe,
const struct GNUNET_MessageHeader *msg,
- int type, size_t size)
+ uint16_t type,
+ size_t size)
{
-
/* handle different message type */
- switch (type) {
- case GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE:
- if (size < sizeof (struct LookupNameResponseMessage))
- {
- GNUNET_break_op (0);
- break;
- }
- handle_lookup_name_response (qe, (struct LookupNameResponseMessage *)
msg, size);
- break;
- case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE:
- if (size != sizeof (struct RecordPutResponseMessage))
- {
- GNUNET_break_op (0);
- break;
- }
- handle_record_put_response (qe, (struct RecordPutResponseMessage *)
msg, size);
- break;
- case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE:
- if (size != sizeof (struct RecordCreateResponseMessage))
- {
- GNUNET_break_op (0);
- break;
- }
- handle_record_create_response (qe, (struct RecordCreateResponseMessage
*) msg, size);
- break;
- case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE:
- if (size != sizeof (struct RecordRemoveResponseMessage))
- {
- GNUNET_break_op (0);
- break;
- }
- handle_record_remove_response (qe, (struct RecordRemoveResponseMessage
*) msg, size);
- break;
- case GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE:
- if (size < sizeof (struct ZoneToNameResponseMessage))
- {
- GNUNET_break_op (0);
- break;
- }
- handle_zone_to_name_response (qe, (struct ZoneToNameResponseMessage *)
msg, size);
- break;
- default:
- GNUNET_break_op (0);
- break;
+ switch (type)
+ {
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE:
+ if (size < sizeof (struct LookupNameResponseMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return handle_lookup_name_response (qe, (const struct
LookupNameResponseMessage *) msg, size);
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE:
+ if (size != sizeof (struct RecordPutResponseMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return handle_record_put_response (qe, (const struct
RecordPutResponseMessage *) msg, size);
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE:
+ if (size != sizeof (struct RecordCreateResponseMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return handle_record_create_response (qe, (const struct
RecordCreateResponseMessage *) msg, size);
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE:
+ if (size != sizeof (struct RecordRemoveResponseMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return handle_record_remove_response (qe, (const struct
RecordRemoveResponseMessage *) msg, size);
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE:
+ if (size < sizeof (struct ZoneToNameResponseMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return handle_zone_to_name_response (qe, (const struct
ZoneToNameResponseMessage *) msg, size);
+ default:
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
}
@@ -640,74 +586,65 @@
* @param ze the respective iterator for this operation
* @param msg the message containing the respoonse
* @param size the message size
+ * @return GNUNET_YES on success, 'ze' should be kept, GNUNET_NO on success if
'ze' should
+ * not be kept any longer, GNUNET_SYSERR on error (disconnect) and
'ze' should be kept
*/
-static void
+static int
handle_zone_iteration_response (struct GNUNET_NAMESTORE_ZoneIterator *ze,
- struct ZoneIterationResponseMessage *msg,
+ const struct ZoneIterationResponseMessage *msg,
size_t size)
{
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubdummy;
- size_t msg_len = 0;
- size_t exp_msg_len = 0;
- size_t name_len = 0;
- size_t rd_len = 0;
- unsigned rd_count = 0;
- char *name_tmp;
- char *rd_ser_tmp;
+ size_t msg_len;
+ size_t exp_msg_len;
+ size_t name_len;
+ size_t rd_len;
+ unsigned rd_count;
+ const char *name_tmp;
+ const char *rd_ser_tmp;
struct GNUNET_TIME_Absolute expire;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received `%s'\n",
"ZONE_ITERATION_RESPONSE");
msg_len = ntohs (msg->gns_header.header.size);
rd_len = ntohs (msg->rd_len);
rd_count = ntohs (msg->rd_count);
name_len = ntohs (msg->name_len);
expire = GNUNET_TIME_absolute_ntoh (msg->expire);
-
exp_msg_len = sizeof (struct ZoneIterationResponseMessage) + name_len +
rd_len;
if (msg_len != exp_msg_len)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Message size describes with `%u' bytes but
calculated size is %u bytes \n",
- msg_len, exp_msg_len);
- GNUNET_break_op (0);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- if (0 != ntohs (msg->reserved))
- {
- GNUNET_break_op (0);
- return;
- }
-
+ GNUNET_break (0 == ntohs (msg->reserved));
memset (&pubdummy, '\0', sizeof (pubdummy));
if ((0 == name_len) && (0 == (memcmp (&msg->public_key, &pubdummy, sizeof
(pubdummy)))))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Zone iteration is completed!\n");
-
- GNUNET_CONTAINER_DLL_remove(ze->h->z_head, ze->h->z_tail, ze);
-
- if (ze->proc != NULL)
+ if (NULL != ze->proc)
ze->proc(ze->proc_cls, NULL, GNUNET_TIME_UNIT_ZERO_ABS, NULL , 0, NULL,
NULL);
-
- GNUNET_free (ze);
- return;
+ return GNUNET_NO;
}
-
- name_tmp = (char *) &msg[1];
- if ((name_tmp[name_len -1] != '\0') || (name_len > 256))
+ name_tmp = (const char *) &msg[1];
+ if ((name_tmp[name_len -1] != '\0') || (name_len > MAX_NAME_LEN))
{
- GNUNET_break_op (0);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- rd_ser_tmp = (char *) &name_tmp[name_len];
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize (rd_len, rd_ser_tmp,
rd_count, rd))
+ rd_ser_tmp = (const char *) &name_tmp[name_len];
{
- GNUNET_break_op (0);
- return;
- }
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- if (ze->proc != NULL)
- ze->proc(ze->proc_cls, &msg->public_key, expire, name_tmp, rd_count, rd,
&msg->signature);
+ if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize (rd_len, rd_ser_tmp,
rd_count, rd))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (NULL != ze->proc)
+ ze->proc(ze->proc_cls, &msg->public_key, expire, name_tmp, rd_count, rd,
&msg->signature);
+ return GNUNET_YES;
+ }
}
@@ -718,26 +655,27 @@
* @param msg the message we received
* @param type the message type in HBO
* @param size the message size
+ * @return GNUNET_YES on success, 'ze' should be kept, GNUNET_NO on success if
'ze' should
+ * not be kept any longer, GNUNET_SYSERR on error (disconnect) and
'ze' should be kept
*/
-static void
+static int
manage_zone_operations (struct GNUNET_NAMESTORE_ZoneIterator *ze,
const struct GNUNET_MessageHeader *msg,
int type, size_t size)
{
-
/* handle different message type */
- switch (type) {
- case GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE:
- if (size < sizeof (struct ZoneIterationResponseMessage))
- {
- GNUNET_break_op (0);
- break;
- }
- handle_zone_iteration_response (ze, (struct
ZoneIterationResponseMessage *) msg, size);
- break;
- default:
- GNUNET_break_op (0);
- break;
+ switch (type)
+ {
+ case GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE:
+ if (size < sizeof (struct ZoneIterationResponseMessage))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return handle_zone_iteration_response (ze, (const struct
ZoneIterationResponseMessage *) msg, size);
+ default:
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
}
@@ -753,22 +691,21 @@
process_namestore_message (void *cls, const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_NAMESTORE_Handle *h = cls;
- struct GNUNET_NAMESTORE_Header * gm;
+ const struct GNUNET_NAMESTORE_Header *gm;
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct GNUNET_NAMESTORE_ZoneIterator *ze;
uint16_t size;
uint16_t type;
- uint32_t r_id = UINT32_MAX;
+ uint32_t r_id;
+ int ret;
if (NULL == msg)
{
force_reconnect (h);
return;
}
-
size = ntohs (msg->size);
type = ntohs (msg->type);
-
if (size < sizeof (struct GNUNET_NAMESTORE_Header))
{
GNUNET_break_op (0);
@@ -776,50 +713,64 @@
GNUNET_TIME_UNIT_FOREVER_REL);
return;
}
-
- gm = (struct GNUNET_NAMESTORE_Header *) msg;
+ gm = (const struct GNUNET_NAMESTORE_Header *) msg;
r_id = ntohl (gm->r_id);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received message type %i size %i op %u\n",
type, size, r_id);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received message type %u size %u op %u\n",
+ (unsigned int) type,
+ (unsigned int) size,
+ (unsigned int) r_id);
- /* Find matching operation */
- if (r_id > h->last_op_id_used)
- {
- /* No matching pending operation found */
- GNUNET_break_op (0);
- GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
- GNUNET_TIME_UNIT_FOREVER_REL);
- return;
- }
-
/* Is it a record related operation ? */
for (qe = h->op_head; qe != NULL; qe = qe->next)
- {
if (qe->op_id == r_id)
break;
- }
- if (qe != NULL)
+ if (NULL != qe)
{
- manage_record_operations (qe, msg, type, size);
+ ret = manage_record_operations (qe, msg, type, size);
+ if (GNUNET_OK != ret)
+ {
+ /* protocol error, need to reconnect */
+ h->reconnect = GNUNET_YES;
+ }
+ if (GNUNET_SYSERR != ret)
+ {
+ /* client was notified about success or failure, clean up 'qe' */
+ GNUNET_CONTAINER_DLL_remove (h->op_head,
+ h->op_tail,
+ qe);
+ GNUNET_free (qe);
+ }
}
/* Is it a zone iteration operation ? */
for (ze = h->z_head; ze != NULL; ze = ze->next)
- {
if (ze->op_id == r_id)
break;
+ if (NULL != ze)
+ {
+ ret = manage_zone_operations (ze, msg, type, size);
+ if (GNUNET_NO == ret)
+ {
+ /* end of iteration, clean up 'ze' */
+ GNUNET_CONTAINER_DLL_remove (h->z_head,
+ h->z_tail,
+ ze);
+ GNUNET_free (ze);
+ }
+ if (GNUNET_SYSERR == ret)
+ {
+ /* protocol error, need to reconnect */
+ h->reconnect = GNUNET_YES;
+ }
}
- if (ze != NULL)
+ if (GNUNET_YES == h->reconnect)
{
- manage_zone_operations (ze, msg, type, size);
+ force_reconnect (h);
+ return;
}
-
GNUNET_CLIENT_receive (h->client, &process_namestore_message, h,
GNUNET_TIME_UNIT_FOREVER_REL);
-
- if (GNUNET_YES == h->reconnect)
- force_reconnect (h);
-
}
@@ -850,7 +801,7 @@
char *cbuf;
h->th = NULL;
- if ((size == 0) || (buf == NULL))
+ if ((0 == size) || (NULL == buf))
{
force_reconnect (h);
return 0;
@@ -885,12 +836,11 @@
struct PendingMessage *p;
if (NULL != h->th)
- return;
+ return; /* transmission request already pending */
if (NULL == (p = h->pending_head))
- return;
+ return; /* transmission queue empty */
if (NULL == h->client)
return; /* currently reconnecting */
-
h->th = GNUNET_CLIENT_notify_transmit_ready (h->client, p->size,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_NO,
&transmit_message_to_namestore,
@@ -912,7 +862,6 @@
GNUNET_assert (NULL == h->client);
h->client = GNUNET_CLIENT_connect ("namestore", h->cfg);
GNUNET_assert (NULL != h->client);
-
if ((NULL == (p = h->pending_head)) || (GNUNET_YES != p->is_init))
{
p = GNUNET_malloc (sizeof (struct PendingMessage) +
@@ -927,6 +876,7 @@
do_transmit (h);
}
+
/**
* Re-establish the connection to the service.
*
@@ -955,22 +905,21 @@
GNUNET_CLIENT_disconnect (h->client);
h->client = NULL;
h->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
- &reconnect_task,
- h);
+ &reconnect_task,
+ h);
}
/**
- * Get an unused operation id to distinguish between namestore requests
+ * Get a fresh operation id to distinguish between namestore requests
+ *
* @param h the namestore handle
- * @return operation id
+ * @return next operation id to use
*/
static uint32_t
get_op_id (struct GNUNET_NAMESTORE_Handle *h)
{
- uint32_t op_id = h->last_op_id_used;
- h->last_op_id_used ++;
- return op_id;
+ return h->last_op_id_used++;
}
@@ -993,26 +942,33 @@
}
-static void
-clean_up_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+/**
+ * Disconnect from the namestore service (and free associated
+ * resources).
+ *
+ * @param h handle to the namestore
+ */
+void
+GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h)
{
- struct GNUNET_NAMESTORE_Handle *h = cls;
struct PendingMessage *p;
struct GNUNET_NAMESTORE_QueueEntry *q;
struct GNUNET_NAMESTORE_ZoneIterator *z;
- GNUNET_assert (h != NULL);
LOG (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
+ GNUNET_assert (NULL != h);
while (NULL != (p = h->pending_head))
{
GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, p);
GNUNET_free (p);
}
+ GNUNET_break (NULL == h->op_head);
while (NULL != (q = h->op_head))
{
GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, q);
GNUNET_free (q);
}
+ GNUNET_break (NULL == h->z_head);
while (NULL != (z = h->z_head))
{
GNUNET_CONTAINER_DLL_remove (h->z_head, h->z_tail, z);
@@ -1028,26 +984,11 @@
GNUNET_SCHEDULER_cancel (h->reconnect_task);
h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_free(h);
- h = NULL;
+ GNUNET_free (h);
}
/**
- * Disconnect from the namestore service (and free associated
- * resources).
- *
- * @param h handle to the namestore
- */
-void
-GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h)
-{
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from namestore service\n");
- GNUNET_SCHEDULER_add_now (&clean_up_task, h);
-}
-
-
-/**
* Store an item in the namestore. If the item is already present,
* the expiration time is updated to the max of the existing time and
* the new time. This API is used when we cache signatures from other
@@ -1078,14 +1019,13 @@
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
-
- /* pointer to elements */
- char * rd_tmp;
+ struct RecordPutMessage * msg;
+ char * rd_ser;
char * name_tmp;
- size_t msg_size = 0;
- size_t name_len = 0;
- size_t rd_ser_len = 0;
- uint32_t rid = 0;
+ size_t msg_size;
+ size_t name_len;
+ size_t rd_ser_len;
+ uint32_t rid;
GNUNET_assert (NULL != h);
GNUNET_assert (NULL != zone_key);
@@ -1097,36 +1037,26 @@
rd_count,
name);
name_len = strlen(name) + 1;
- if (name_len > 256)
+ if (name_len > MAX_NAME_LEN)
{
GNUNET_break (0);
return NULL;
}
-
- rid = get_op_id(h);
+ rid = get_op_id (h);
qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
qe->nsh = h;
qe->cont = cont;
qe->cont_cls = cont_cls;
qe->op_id = rid;
- GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
- /* set msg_size*/
+ /* setup msg */
rd_ser_len = GNUNET_NAMESTORE_records_get_size(rd_count, rd);
- char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(rd_count, rd, rd_ser_len, rd_ser);
-
- struct RecordPutMessage * msg;
msg_size = sizeof (struct RecordPutMessage) + name_len + rd_ser_len;
-
- /* create msg here */
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct RecordPutMessage *) &pe[1];
- name_tmp = (char *) &msg[1];
- rd_tmp = &name_tmp[name_len];
-
msg->gns_header.header.type = htons
(GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (rid);
@@ -1135,16 +1065,17 @@
msg->expire = GNUNET_TIME_absolute_hton (freshness);
msg->rd_len = htons (rd_ser_len);
msg->rd_count = htons (rd_count);
-
msg->public_key = *zone_key;
+ name_tmp = (char *) &msg[1];
memcpy (name_tmp, name, name_len);
- memcpy (rd_tmp, rd_ser, rd_ser_len);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for name `%s' with size
%u\n", "NAMESTORE_RECORD_PUT", name, msg_size);
-
+ rd_ser = &name_tmp[name_len];
+ GNUNET_NAMESTORE_records_serialize(rd_count, rd, rd_ser_len, rd_ser);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message for name `%s' with size %u\n",
+ "NAMESTORE_RECORD_PUT",
+ name, msg_size);
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
-
return qe;
}
@@ -1169,11 +1100,10 @@
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature
*signature)
{
- int res;
size_t rd_ser_len;
size_t name_len;
char * name_tmp;
- char * rd_tmp;
+ char * rd_ser;
struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose;
struct GNUNET_TIME_AbsoluteNBO *expire_tmp;
struct GNUNET_TIME_AbsoluteNBO expire_nbo = GNUNET_TIME_absolute_hton
(freshness);
@@ -1184,35 +1114,31 @@
GNUNET_assert (NULL != rd);
GNUNET_assert (NULL != signature);
name_len = strlen (name) + 1;
- if (name_len > 256)
+ if (name_len > MAX_NAME_LEN)
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ sig_len = sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + sizeof (struct
GNUNET_TIME_AbsoluteNBO) + rd_ser_len + name_len;
{
- char rd_ser[rd_ser_len];
+ char sig_buf[rd_ser_len] GNUNET_ALIGN;
- GNUNET_assert (rd_ser_len ==
- GNUNET_NAMESTORE_records_serialize (rd_count, rd,
rd_ser_len, rd_ser));
- sig_len = sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + sizeof
(struct GNUNET_TIME_AbsoluteNBO) + rd_ser_len + name_len;
- sig_purpose = GNUNET_malloc (sig_len);
+ sig_purpose = (struct GNUNET_CRYPTO_RsaSignaturePurpose *) sig_buf;
sig_purpose->size = htonl (sig_len);
sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
expire_tmp = (struct GNUNET_TIME_AbsoluteNBO *) &sig_purpose[1];
memcpy (expire_tmp, &expire_nbo, sizeof (struct GNUNET_TIME_AbsoluteNBO));
name_tmp = (char *) &expire_tmp[1];
memcpy (name_tmp, name, name_len);
- rd_tmp = &name_tmp[name_len];
- memcpy (rd_tmp, rd_ser, rd_ser_len);
- res = GNUNET_CRYPTO_rsa_verify(GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN,
sig_purpose, signature, public_key);
-
+ rd_ser = &name_tmp[name_len];
+ GNUNET_assert (rd_ser_len ==
+ GNUNET_NAMESTORE_records_serialize (rd_count, rd,
rd_ser_len, rd_ser));
+ return GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN,
sig_purpose, signature, public_key);
}
- GNUNET_free (sig_purpose);
-
- return res;
}
+
/**
* Store an item in the namestore. If the item is already present,
* the expiration time is updated to the max of the existing time and
@@ -1238,12 +1164,14 @@
struct PendingMessage *pe;
char * name_tmp;
char * pkey_tmp;
- char * rd_tmp;
- size_t rd_ser_len = 0;
- size_t msg_size = 0;
- size_t name_len = 0;
- size_t key_len = 0;
- uint32_t rid = 0;
+ char * rd_ser;
+ size_t rd_ser_len;
+ size_t msg_size;
+ size_t name_len;
+ size_t key_len;
+ uint32_t rid;
+ struct RecordCreateMessage * msg;
+ struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc;
GNUNET_assert (NULL != h);
GNUNET_assert (NULL != pkey);
@@ -1254,42 +1182,30 @@
rd->record_type,
name);
name_len = strlen(name) + 1;
- if (name_len > 256)
+ if (name_len > MAX_NAME_LEN)
{
GNUNET_break (0);
return NULL;
}
-
rid = get_op_id(h);
qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
qe->nsh = h;
qe->cont = cont;
qe->cont_cls = cont_cls;
qe->op_id = rid;
- GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
- /* set msg_size*/
- struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc =
GNUNET_CRYPTO_rsa_encode_key (pkey);
- GNUNET_assert (pkey_enc != NULL);
- key_len = ntohs (pkey_enc->len);
+ pkey_enc = GNUNET_CRYPTO_rsa_encode_key (pkey);
+ GNUNET_assert (NULL != pkey_enc);
+ /* setup msg */
+ key_len = ntohs (pkey_enc->len);
rd_ser_len = GNUNET_NAMESTORE_records_get_size(1, rd);
- char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(1, rd, rd_ser_len, rd_ser);
-
- struct RecordCreateMessage * msg;
msg_size = sizeof (struct RecordCreateMessage) + key_len + name_len +
rd_ser_len;
-
- /* create msg here */
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct RecordCreateMessage *) &pe[1];
-
- pkey_tmp = (char *) &msg[1];
- name_tmp = &pkey_tmp[key_len];
- rd_tmp = &name_tmp[name_len];
-
msg->gns_header.header.type = htons
(GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (rid);
@@ -1298,9 +1214,13 @@
msg->rd_len = htons (rd_ser_len);
msg->pkey_len = htons (key_len);
msg->expire = GNUNET_TIME_absolute_hton(GNUNET_TIME_UNIT_FOREVER_ABS);
+ pkey_tmp = (char *) &msg[1];
memcpy (pkey_tmp, pkey_enc, key_len);
+ name_tmp = &pkey_tmp[key_len];
memcpy (name_tmp, name, name_len);
- memcpy (rd_tmp, rd_ser, rd_ser_len);
+ rd_ser = &name_tmp[name_len];
+ GNUNET_NAMESTORE_records_serialize(1, rd, rd_ser_len, rd_ser);
+
GNUNET_free (pkey_enc);
LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -1336,16 +1256,18 @@
void *cont_cls)
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
+ struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc;
struct PendingMessage *pe;
+ struct RecordRemoveMessage * msg;
char *pkey_tmp;
- char *rd_tmp;
+ char *rd_ser;
char *name_tmp;
- size_t rd_ser_len = 0;
- size_t msg_size = 0;
- size_t name_len = 0;
- size_t key_len = 0;
- uint32_t rid = 0;
- uint16_t rd_count = 1;
+ size_t rd_ser_len;
+ size_t msg_size;
+ size_t name_len;
+ size_t key_len;
+ uint32_t rid;
+ uint16_t rd_count;
GNUNET_assert (NULL != h);
if (NULL != rd)
@@ -1363,36 +1285,20 @@
qe->cont = cont;
qe->cont_cls = cont_cls;
qe->op_id = rid;
- GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
- /* set msg_size*/
- struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded * pkey_enc =
GNUNET_CRYPTO_rsa_encode_key (pkey);
- GNUNET_assert (pkey_enc != NULL);
+ pkey_enc = GNUNET_CRYPTO_rsa_encode_key (pkey);
+ GNUNET_assert (NULL != pkey_enc);
key_len = ntohs (pkey_enc->len);
- if (NULL == rd)
- rd_count = 0;
- else
- rd_count = 1;
+ rd_count = (NULL == rd) ? 0 : 1;
rd_ser_len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser);
-
name_len = strlen (name) + 1;
-
- struct RecordRemoveMessage * msg;
msg_size = sizeof (struct RecordRemoveMessage) + key_len + name_len +
rd_ser_len;
-
- /* create msg here */
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct RecordRemoveMessage *) &pe[1];
-
- pkey_tmp = (char *) &msg[1];
- name_tmp = &pkey_tmp[key_len];
- rd_tmp = &name_tmp[name_len];
-
msg->gns_header.header.type = htons
(GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (rid);
@@ -1400,16 +1306,18 @@
msg->rd_len = htons (rd_ser_len);
msg->rd_count = htons (rd_count);
msg->pkey_len = htons (key_len);
+ pkey_tmp = (char *) &msg[1];
memcpy (pkey_tmp, pkey_enc, key_len);
+ name_tmp = &pkey_tmp[key_len];
memcpy (name_tmp, name, name_len);
- memcpy (rd_tmp, rd_ser, rd_ser_len);
+ rd_ser = &name_tmp[name_len];
+ GNUNET_NAMESTORE_records_serialize (rd_count, rd, rd_ser_len, rd_ser);
GNUNET_free (pkey_enc);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Sending `%s' message for name `%s' with size %u\n",
"NAMESTORE_RECORD_REMOVE", name, msg_size);
-
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
return qe;
@@ -1439,9 +1347,10 @@
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
- size_t msg_size = 0;
- size_t name_len = 0;
- uint32_t rid = 0;
+ struct LookupNameMessage * msg;
+ size_t msg_size;
+ size_t name_len;
+ uint32_t rid;
GNUNET_assert (NULL != h);
GNUNET_assert (NULL != zone);
@@ -1450,9 +1359,8 @@
"Looking for record of type %u under name `%s'\n",
record_type,
name);
-
name_len = strlen (name) + 1;
- if ((name_len == 0) || (name_len > 256))
+ if ((name_len == 0) || (name_len > MAX_NAME_LEN))
{
GNUNET_break (0);
return NULL;
@@ -1464,14 +1372,10 @@
qe->proc = proc;
qe->proc_cls = proc_cls;
qe->op_id = rid;
- GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
- /* set msg_size*/
msg_size = sizeof (struct LookupNameMessage) + name_len;
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
-
- /* create msg here */
- struct LookupNameMessage * msg;
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct LookupNameMessage *) &pe[1];
@@ -1485,11 +1389,8 @@
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Sending `%s' message for name `%s'\n", "NAMESTORE_LOOKUP_NAME", name);
-
- /* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
-
return qe;
}
@@ -1515,27 +1416,23 @@
{
struct GNUNET_NAMESTORE_QueueEntry *qe;
struct PendingMessage *pe;
- size_t msg_size = 0;
- uint32_t rid = 0;
+ struct ZoneToNameMessage * msg;
+ size_t msg_size;
+ uint32_t rid;
GNUNET_assert (NULL != h);
GNUNET_assert (NULL != zone);
GNUNET_assert (NULL != value_zone);
-
rid = get_op_id(h);
qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
qe->nsh = h;
qe->proc = proc;
qe->proc_cls = proc_cls;
qe->op_id = rid;
- GNUNET_CONTAINER_DLL_insert_tail(h->op_head, h->op_tail, qe);
+ GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, qe);
- /* set msg_size*/
msg_size = sizeof (struct ZoneToNameMessage);
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
-
- /* create msg here */
- struct ZoneToNameMessage * msg;
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct ZoneToNameMessage *) &pe[1];
@@ -1545,23 +1442,13 @@
msg->zone = *zone;
msg->value_zone = *value_zone;
- char * z_tmp = GNUNET_strdup (GNUNET_short_h2s (zone));
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Sending `%s' message for zone `%s' in zone `%s'\n",
- "NAMESTORE_ZONE_TO_NAME",
- z_tmp,
- GNUNET_short_h2s (value_zone));
- GNUNET_free (z_tmp);
-
/* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
-
return qe;
}
-
/**
* Starts a new zone iteration (used to periodically PUT all of our
* records into our DHT). This MUST lock the GNUNET_NAMESTORE_Handle
@@ -1590,8 +1477,9 @@
{
struct GNUNET_NAMESTORE_ZoneIterator *it;
struct PendingMessage *pe;
- size_t msg_size = 0;
- uint32_t rid = 0;
+ struct ZoneIterationStartMessage * msg;
+ size_t msg_size;
+ uint32_t rid;
GNUNET_assert (NULL != h);
rid = get_op_id(h);
@@ -1600,7 +1488,6 @@
it->proc = proc;
it->proc_cls = proc_cls;
it->op_id = rid;
-
if (NULL != zone)
{
it->zone = *zone;
@@ -1611,14 +1498,10 @@
memset (&it->zone, '\0', sizeof (it->zone));
it->has_zone = GNUNET_NO;
}
- GNUNET_CONTAINER_DLL_insert_tail(h->z_head, h->z_tail, it);
+ GNUNET_CONTAINER_DLL_insert_tail (h->z_head, h->z_tail, it);
- /* set msg_size*/
msg_size = sizeof (struct ZoneIterationStartMessage);
- pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
-
- /* create msg here */
- struct ZoneIterationStartMessage * msg;
+ pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct ZoneIterationStartMessage *) &pe[1];
@@ -1640,11 +1523,8 @@
}
msg->must_have_flags = ntohs (must_have_flags);
msg->must_not_have_flags = ntohs (must_not_have_flags);
-
- /* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
-
return it;
}
@@ -1659,37 +1539,21 @@
GNUNET_NAMESTORE_zone_iterator_next (struct GNUNET_NAMESTORE_ZoneIterator *it)
{
struct GNUNET_NAMESTORE_Handle *h;
+ struct ZoneIterationNextMessage * msg;
struct PendingMessage *pe;
- size_t msg_size = 0;
+ size_t msg_size;
GNUNET_assert (NULL != it);
h = it->h;
- struct GNUNET_NAMESTORE_ZoneIterator *tmp = it->h->z_head;
-
- while (tmp != NULL)
- {
- if (tmp == it)
- break;
- tmp = tmp->next;
- }
- GNUNET_assert (NULL != tmp);
-
- /* set msg_size*/
msg_size = sizeof (struct ZoneIterationNextMessage);
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
-
- /* create msg here */
- struct ZoneIterationNextMessage * msg;
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct ZoneIterationNextMessage *) &pe[1];
msg->gns_header.header.type = htons
(GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (it->op_id);
-
LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n",
"ZONE_ITERATION_NEXT");
-
- /* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
}
@@ -1703,41 +1567,33 @@
void
GNUNET_NAMESTORE_zone_iteration_stop (struct GNUNET_NAMESTORE_ZoneIterator *it)
{
- GNUNET_assert (NULL != it);
+ struct GNUNET_NAMESTORE_Handle *h;
struct PendingMessage *pe;
- size_t msg_size = 0;
- struct GNUNET_NAMESTORE_Handle *h = it->h;
- struct GNUNET_NAMESTORE_ZoneIterator *tmp = it->h->z_head;
+ size_t msg_size;
+ struct ZoneIterationStopMessage * msg;
- while (tmp != NULL)
- {
- if (tmp == it)
- break;
- tmp = tmp->next;
- }
- GNUNET_assert (NULL != tmp);
-
- /* set msg_size*/
+ GNUNET_assert (NULL != it);
+ h = it->h;
+ GNUNET_CONTAINER_DLL_remove (h->z_head,
+ h->z_tail,
+ it);
msg_size = sizeof (struct ZoneIterationStopMessage);
pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
-
- /* create msg here */
- struct ZoneIterationStopMessage * msg;
pe->size = msg_size;
pe->is_init = GNUNET_NO;
msg = (struct ZoneIterationStopMessage *) &pe[1];
msg->gns_header.header.type = htons
(GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (it->op_id);
-
if (GNUNET_YES == it->has_zone)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for zone
`%s'\n", "ZONE_ITERATION_STOP", GNUNET_short_h2s(&it->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message for zone `%s'\n", "ZONE_ITERATION_STOP",
GNUNET_short_h2s(&it->zone));
else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for all
zones\n", "ZONE_ITERATION_STOP");
-
- /* transmit message */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message for all zones\n", "ZONE_ITERATION_STOP");
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
do_transmit(h);
+ GNUNET_free (it);
}
@@ -1752,7 +1608,7 @@
{
struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
- GNUNET_assert (qe != NULL);
+ GNUNET_assert (NULL != qe);
GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
GNUNET_free(qe);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22346 - gnunet/src/namestore,
gnunet <=