#include "gnunet_service_lib.h"
#include "gnunet_namestore_service.h"
#include "gnunet_namestore_plugin.h"
+#include "gnunet_signatures.h"
#include "namestore.h"
GNUNET_HashCode zone;
- uint64_t op_id;
+ uint64_t request_id;
uint32_t offset;
};
struct GNUNET_NAMESTORE_Client * nc;
struct GNUNET_NAMESTORE_Client * next;
+ GNUNET_SERVER_notification_context_destroy (snc);
+ snc = NULL;
+
for (nc = client_head; nc != NULL; nc = next)
{
next = nc->next;
for (no = nc->op_head; no != NULL; no = tmp)
{
+ GNUNET_break (0);
GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, no);
tmp = no->next;
GNUNET_free (no);
}
-
+ GNUNET_SERVER_client_drop(nc->client);
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
GNUNET_free (nc);
-
}
- GNUNET_SERVER_notification_context_destroy (snc);
- snc = NULL;
-
GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));
GNUNET_free (db_lib_name);
}
return nc;
}
-
/**
* Called whenever a client is disconnected. Frees our
* resources associated with that client.
GNUNET_free (no);
}
+ GNUNET_SERVER_client_drop(nc->client);
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
GNUNET_free (nc);
}
+
+
static void handle_start (void *cls,
struct GNUNET_SERVER_Client * client,
const struct GNUNET_MessageHeader * message)
nc->client = client;
GNUNET_SERVER_notification_context_add (snc, client);
GNUNET_CONTAINER_DLL_insert(client_head, client_tail, nc);
-
+ GNUNET_SERVER_client_keep (client);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
struct LookupNameContext
{
struct GNUNET_NAMESTORE_Client *nc;
- uint32_t id;
+ uint32_t request_id;
uint32_t record_type;
+ GNUNET_HashCode *zone;
+ char * name;
};
+void drop_iterator (void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+ struct GNUNET_TIME_Absolute expire,
+ const char *name,
+ unsigned int rd_len,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+ GNUNET_HashCode zone_hash;
+ int * stop = cls;
+ if (NULL != zone_key)
+ {
+ GNUNET_CRYPTO_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting zone `%s'\n", GNUNET_h2s (&zone_hash));
+ GSN_database->delete_zone (GSN_database->cls, &zone_hash);
+ }
+ else
+ {
+ (*stop) = GNUNET_YES;
+ }
+}
+
+
+/**
+ * Called whenever a client is disconnected. Frees our
+ * resources associated with that client.
+ *
+ * @param cls closure
+ * @param client identification of the client
+ * @param message the stop message
+ */
+static void handle_stop (void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_REMOVE");
+ struct DisconnectMessage * msg = (struct DisconnectMessage *) message;
+ struct GNUNET_NAMESTORE_ZoneIteration * no;
+ struct GNUNET_NAMESTORE_Client * nc;
+ int drop;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p disconnected \n", client);
+
+ nc = client_lookup (client);
+ if (nc == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ for (no = nc->op_head; no != NULL; no = no->next)
+ {
+ GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, no);
+ GNUNET_free (no);
+ }
+
+ drop = ntohl(msg->drop);
+ if (GNUNET_YES == drop)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Dropping namestore content\n");
+ int stop = GNUNET_NO;
+ int offset = 0;
+ while (stop == GNUNET_NO)
+ {
+ GSN_database->iterate_records (GSN_database->cls, NULL, NULL, offset, &drop_iterator, &stop);
+ offset ++;
+ }
+ }
+
+ GNUNET_SERVER_client_drop(nc->client);
+ GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
+ GNUNET_free (nc);
+}
static void
handle_lookup_name_it (void *cls,
struct LookupNameResponseMessage *lnr_msg;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key_tmp;
- struct GNUNET_NAMESTORE_RecordData * rd_tmp;
+ struct GNUNET_NAMESTORE_RecordData *rd_selected = NULL;
+ char *rd_tmp;
char *name_tmp;
+ size_t rd_ser_len;
struct GNUNET_CRYPTO_RsaSignature *signature_tmp;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "NAMESTORE_LOOKUP_NAME_RESPONSE");
-
size_t r_size = 0;
size_t name_len = 0;
for (c = 0; c < rd_count; c ++)
if (rd[c].record_type == lnc->record_type)
copied_elements++; /* found matching record */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u records with type %u for name `%s' in zone `%s'\n",
+ copied_elements, lnc->record_type, lnc->name, GNUNET_h2s(lnc->zone));
+ rd_selected = GNUNET_malloc (copied_elements * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ copied_elements = 0;
+ for (c = 0; c < rd_count; c ++)
+ {
+ if (rd[c].record_type == lnc->record_type)
+ {
+ /* found matching record */
+ memcpy (&rd_selected[copied_elements], &rd[c], sizeof (struct GNUNET_NAMESTORE_RecordData));
+ copied_elements++;
+ }
+ }
}
else
+ {
copied_elements = rd_count;
+ rd_selected = (struct GNUNET_NAMESTORE_RecordData *) rd;
+ }
+ }
+ else
+ {
+ /* No results */
+ copied_elements = 0;
+ rd_selected = NULL;
+ expire = GNUNET_TIME_UNIT_ZERO_ABS;
}
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(copied_elements, rd_selected);
+ char rd_ser[rd_ser_len];
+ GNUNET_NAMESTORE_records_serialize(copied_elements, rd_selected, rd_ser_len, rd_ser);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u records for name `%s' in zone `%s'\n",
+ copied_elements, lnc->name, GNUNET_h2s(lnc->zone));
+
if ((copied_elements == rd_count) && (signature != NULL))
contains_signature = GNUNET_YES;
+ if (rd_selected != rd)
+ GNUNET_free (rd_selected);
+
r_size = sizeof (struct LookupNameResponseMessage) +
sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
name_len +
- copied_elements * sizeof (struct GNUNET_NAMESTORE_RecordData) +
+ rd_ser_len +
contains_signature * sizeof (struct GNUNET_CRYPTO_RsaSignature);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "NAMESTORE_LOOKUP_NAME_RESPONSE");
+
lnr_msg = GNUNET_malloc (r_size);
- lnr_msg->header.type = ntohs (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE);
- lnr_msg->header.size = ntohs (r_size);
- lnr_msg->op_id = htonl (lnc->id);
- lnr_msg->rc_count = htonl (copied_elements);
+ lnr_msg->gns_header.header.type = ntohs (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE);
+ lnr_msg->gns_header.header.size = ntohs (r_size);
+ lnr_msg->gns_header.r_id = htonl (lnc->request_id);
+ lnr_msg->rd_count = htons (copied_elements);
+ lnr_msg->rd_len = htons (rd_ser_len);
lnr_msg->name_len = htons (name_len);
lnr_msg->expire = GNUNET_TIME_absolute_hton(expire);
lnr_msg->contains_sig = htons (contains_signature);
-
zone_key_tmp = (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *) &lnr_msg[1];
name_tmp = (char *) &zone_key_tmp[1];
- rd_tmp = (struct GNUNET_NAMESTORE_RecordData *) &name_tmp[name_len];
- signature_tmp = (struct GNUNET_CRYPTO_RsaSignature *) &rd_tmp[copied_elements];
+ rd_tmp = &name_tmp[name_len];
+ signature_tmp = (struct GNUNET_CRYPTO_RsaSignature *) &rd_tmp[rd_ser_len];
if (zone_key != NULL)
memcpy (zone_key_tmp, zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
memcpy (zone_key_tmp, &dummy, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
}
memcpy (name_tmp, name, name_len);
- /* copy records */
- copied_elements = 0;
- if (rd_count != 0)
- {
- if (lnc->record_type != 0)
- {
- /* special record type needed */
- for (c = 0; c < rd_count; c ++)
- if (rd[c].record_type == lnc->record_type)
- {
- /* found matching record */
- memcpy (&rd_tmp[copied_elements], &rd[c], rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
- copied_elements++;
- }
- }
- else
- memcpy (rd_tmp, rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
- }
+ memcpy (rd_tmp, rd_ser, rd_ser_len);
if (GNUNET_YES == contains_signature)
memcpy (signature_tmp, signature, sizeof (struct GNUNET_CRYPTO_RsaSignature));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_LOOKUP_NAME");
struct LookupNameContext lnc;
struct GNUNET_NAMESTORE_Client *nc;
- GNUNET_HashCode name_hash;
size_t name_len;
char * name;
- uint32_t id = 0;
+ uint32_t rid = 0;
uint32_t type = 0;
-
+ int res;
if (ntohs (message->size) < sizeof (struct LookupNameMessage))
{
}
struct LookupNameMessage * ln_msg = (struct LookupNameMessage *) message;
- id = ntohl (ln_msg->op_id);
+ rid = ntohl (ln_msg->gns_header.r_id);
name_len = ntohl (ln_msg->name_len);
type = ntohl (ln_msg->record_type);
return;
}
- name = GNUNET_malloc (name_len);
- memcpy (name, &ln_msg[1], name_len);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up record for name `%s'\n", name);
- GNUNET_CRYPTO_hash(name, name_len-1, &name_hash);
- GNUNET_free (name);
+ name = (char *) &ln_msg[1];
+ if (name[name_len -1] != '\0')
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ if (0 == type)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up all records for name `%s' in zone `%s'\n", name, GNUNET_h2s(&ln_msg->zone));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up records with type %u for name `%s' in zone `%s'\n", type, name, GNUNET_h2s(&ln_msg->zone));
/* do the actual lookup */
- lnc.id = id;
+ lnc.request_id = rid;
lnc.nc = nc;
lnc.record_type = type;
- GSN_database->iterate_records(GSN_database->cls, &ln_msg->zone, &ln_msg->zone, 0, &handle_lookup_name_it, &lnc);
+ lnc.name = name;
+ lnc.zone = &ln_msg->zone;
+ res = GSN_database->iterate_records(GSN_database->cls, &ln_msg->zone, name, 0, &handle_lookup_name_it, &lnc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_TIME_Absolute expire;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key;
- struct GNUNET_NAMESTORE_RecordData *rd;
struct GNUNET_CRYPTO_RsaSignature *signature;
struct RecordPutResponseMessage rpr_msg;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
+ size_t key_len;
char * name;
- uint32_t id = 0;
+ char * rd_ser;
+ uint32_t rid = 0;
+ uint32_t rd_ser_len;
uint32_t rd_count;
int res = GNUNET_SYSERR;
}
struct RecordPutMessage * rp_msg = (struct RecordPutMessage *) message;
- id = ntohl (rp_msg->op_id);
+
+ rid = ntohl (rp_msg->gns_header.r_id);
+ msg_size = ntohs (rp_msg->gns_header.header.size);
+ key_len = ntohs (rp_msg->key_len);
name_len = ntohs (rp_msg->name_len);
- rd_count = ntohl(rp_msg->rd_count);
- msg_size = ntohs (message->size);
- msg_size_exp = sizeof (struct RecordPutMessage) + sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) + name_len + rd_count * (sizeof (struct GNUNET_NAMESTORE_RecordData));
+ rd_count = ntohs (rp_msg->rd_count);
+ rd_ser_len = ntohs(rp_msg->rd_len);
- if (msg_size != msg_size_exp)
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Expected message %u size but message size is %u \n", msg_size_exp, msg_size);
GNUNET_break_op (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
+ if ((rd_count < 1) || (rd_ser_len < 1) || (name_len >=256) || (name_len == 0))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ msg_size_exp = sizeof (struct RecordPutMessage) + key_len + name_len + rd_ser_len;
+ if (msg_size != msg_size_exp)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Expected message %u size but message size is %u \n", msg_size_exp, msg_size);
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
if ((name_len == 0) || (name_len > 256))
{
GNUNET_break_op (0);
}
zone_key = (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *) &rp_msg[1];
- name = (char *) &zone_key[1];
+ name = &((char *)zone_key)[key_len];
+
+ if (name[name_len -1] != '\0')
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
expire = GNUNET_TIME_absolute_ntoh(rp_msg->expire);
signature = (struct GNUNET_CRYPTO_RsaSignature *) &rp_msg->signature;
- rd = (struct GNUNET_NAMESTORE_RecordData *) &name[name_len];
+
+ rd_ser = &name[name_len];
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ res = GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_ser, rd_count, rd);
+ if (res != GNUNET_OK)
+ {
+ GNUNET_break_op (0);
+ goto send;
+ }
+
+
+ GNUNET_HashCode zone_hash;
+ GNUNET_CRYPTO_hash (zone_key, key_len, &zone_hash);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Putting %u record for name `%s' in zone `%s'\n", rd_count, name, GNUNET_h2s(&zone_hash));
/* Database operation */
res = GSN_database->put_records(GSN_database->cls,
name, (res == GNUNET_OK) ? "OK" : "FAIL");
/* Send response */
-
+send:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "RECORD_PUT_RESPONSE");
rpr_msg.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE);
- rpr_msg.op_id = rp_msg->op_id;
+ rpr_msg.op_id = rp_msg->gns_header.r_id;
rpr_msg.header.size = htons (sizeof (struct RecordPutResponseMessage));
if (GNUNET_OK == res)
rpr_msg.op_result = htons (GNUNET_OK);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+struct CreateRecordContext
+{
+ struct GNUNET_NAMESTORE_RecordData *rd;
+ struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey;
+ struct GNUNET_TIME_Absolute expire;
+ char *name;
+ int res;
+};
+
+
+static void
+handle_create_record_it (void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey,
+ struct GNUNET_TIME_Absolute expire,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+ struct CreateRecordContext * crc = cls;
+ struct GNUNET_CRYPTO_RsaSignature *signature_new = NULL;
+ struct GNUNET_NAMESTORE_RecordData *rd_new = NULL;
+ int res;
+ int exist = GNUNET_SYSERR;
+ int update = GNUNET_NO;
+ int c;
+ int rd_count_new = 0;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u existing records for `%s'\n", rd_count, crc->name);
+
+ for (c = 0; c < rd_count; c++)
+ {
+
+ if ((crc->rd->record_type == rd[c].record_type) &&
+ (crc->rd->data_size == rd[c].data_size) &&
+ (0 == memcmp (crc->rd->data, rd[c].data, rd[c].data_size)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found existing records for `%s' to update expiration date!\n", crc->name);
+ exist = c;
+ if (crc->rd->expiration.abs_value != rd[c].expiration.abs_value)
+ update = GNUNET_YES;
+ break;
+ }
+ }
+
+ if (exist == GNUNET_SYSERR)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "NO existing records for `%s' to update!\n", crc->name);
+
+ if (exist == GNUNET_SYSERR)
+ {
+ rd_new = GNUNET_malloc ((rd_count+1) * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ memcpy (rd_new, rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ rd_count_new = rd_count + 1;
+ rd_new[rd_count] = *(crc->rd);
+ signature_new = GNUNET_NAMESTORE_create_signature (crc->pkey, crc->name, rd_new, rd_count+1);
+
+ if (NULL == signature_new)
+ {
+ GNUNET_break (0);
+ res = GNUNET_SYSERR;
+ goto end;
+ }
+ }
+ else if (update == GNUNET_NO)
+ {
+ /* Exact same record already exists */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No update for %s' record required!\n", crc->name);
+ res = GNUNET_NO;
+ goto end;
+ }
+ else if (update == GNUNET_YES)
+ {
+ /* Update record */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating existing records for `%s'!\n", crc->name);
+ rd_new = GNUNET_malloc ((rd_count) * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ memcpy (rd_new, rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ rd_count_new = rd_count;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating expiration from %llu to %llu!\n", rd_new[exist].expiration.abs_value, crc->rd->expiration.abs_value);
+ rd_new[exist].expiration = crc->rd->expiration;
+ signature_new = GNUNET_NAMESTORE_create_signature (crc->pkey, crc->name, rd_new, rd_count_new);
+ if (NULL == signature_new)
+ {
+ GNUNET_break (0);
+ res = GNUNET_SYSERR;
+ goto end;
+ }
+ }
+
+ /* Database operation */
+ GNUNET_assert ((rd_new != NULL) && (rd_count_new > 0));
+ res = GSN_database->put_records(GSN_database->cls,
+ (const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *) crc->pubkey,
+ crc->expire,
+ crc->name,
+ rd_count_new, rd_new,
+ signature_new);
+ GNUNET_break (GNUNET_OK == res);
+ res = GNUNET_YES;
+
+end:
+ GNUNET_free_non_null (rd_new);
+ GNUNET_free_non_null (signature_new);
+
+ switch (res) {
+ case GNUNET_SYSERR:
+ /* failed to create the record */
+ crc->res = GNUNET_SYSERR;
+ break;
+ case GNUNET_YES:
+ /* database operations OK */
+ if (GNUNET_YES == update)
+ /* we updated an existing record */
+ crc->res = GNUNET_NO;
+ else
+ /* we created a new record */
+ crc->res = GNUNET_YES;
+ break;
+ case GNUNET_NO:
+ /* identical entry existed, so we did nothing */
+ crc->res = GNUNET_NO;
+ break;
+ default:
+ break;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Update result for name `%s' %u\n", crc->name, res);
+
+}
static void handle_record_create (void *cls,
struct GNUNET_SERVER_Client * client,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_CREATE");
struct GNUNET_NAMESTORE_Client *nc;
+ struct CreateRecordContext crc;
+ struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
struct RecordCreateResponseMessage rcr_msg;
+ GNUNET_HashCode pubkey_hash;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
- uint32_t id = 0;
+ size_t rd_ser_len;
+ size_t key_len;
+ uint32_t rid = 0;
+ char *pkey_tmp;
+ char *name_tmp;
+ char *rd_ser;
+ int rd_count;
int res = GNUNET_SYSERR;
}
struct RecordCreateMessage * rp_msg = (struct RecordCreateMessage *) message;
- id = ntohl (rp_msg->op_id);
+ rid = ntohl (rp_msg->gns_header.r_id);
name_len = ntohs (rp_msg->name_len);
msg_size = ntohs (message->size);
- msg_size_exp = sizeof (struct RecordCreateMessage) + name_len + sizeof (struct GNUNET_NAMESTORE_RecordData);
+ rd_count = ntohs (rp_msg->rd_count);
+ rd_ser_len = ntohs (rp_msg->rd_len);
+ key_len = ntohs (rp_msg->pkey_len);
+ msg_size_exp = sizeof (struct RecordCreateMessage) + key_len + name_len + rd_ser_len;
if (msg_size != msg_size_exp)
{
return;
}
-
if ((name_len == 0) || (name_len > 256))
{
GNUNET_break_op (0);
return;
}
- /* DO WORK HERE */
+ pkey_tmp = (char *) &rp_msg[1];
+ name_tmp = &pkey_tmp[key_len];
+ rd_ser = &name_tmp[name_len];
- /* Send response */
+ if (name_tmp[name_len -1] != '\0')
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ res = GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_ser, rd_count, rd);
+ if ((res != GNUNET_OK) || (rd_count != 1))
+ {
+ GNUNET_break_op (0);
+ goto send;
+ }
+
+ /* Extracting and converting private key */
+ pkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
+ GNUNET_assert (pkey != NULL);
+ GNUNET_CRYPTO_rsa_key_get_public(pkey, &pub);
+ GNUNET_CRYPTO_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+
+ crc.pkey = pkey;
+ crc.pubkey = &pub;
+ crc.rd = rd;
+ crc.name = name_tmp;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating record for name `%s' in zone `%s'\n", name_tmp, GNUNET_h2s(&pubkey_hash));
+ /* Get existing records for name */
+ res = GSN_database->iterate_records(GSN_database->cls, &pubkey_hash, name_tmp, 0, &handle_create_record_it, &crc);
+ if (res != GNUNET_SYSERR)
+ res = GNUNET_OK;
+ GNUNET_CRYPTO_rsa_key_free(pkey);
+
+ /* Send response */
+send:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "RECORD_CREATE_RESPONSE");
- rcr_msg.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE);
- rcr_msg.op_id = rp_msg->op_id;
- rcr_msg.header.size = htons (sizeof (struct RecordCreateResponseMessage));
- if (GNUNET_OK == res)
- rcr_msg.op_result = htons (GNUNET_OK);
- else
+ rcr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE);
+ rcr_msg.gns_header.r_id = htonl (rid);
+ rcr_msg.gns_header.header.size = htons (sizeof (struct RecordCreateResponseMessage));
+ if ((GNUNET_OK == res) && (crc.res == GNUNET_YES))
+ rcr_msg.op_result = htons (GNUNET_YES);
+ else if ((GNUNET_OK == res) && (crc.res == GNUNET_NO))
rcr_msg.op_result = htons (GNUNET_NO);
+ else
+ rcr_msg.op_result = htons (GNUNET_SYSERR);
GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) &rcr_msg, GNUNET_NO);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+
+struct RemoveRecordContext
+{
+ struct GNUNET_NAMESTORE_RecordData *rd;
+ struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+ uint16_t op_res;
+};
+
+static void
+handle_record_remove_it (void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+ struct GNUNET_TIME_Absolute expire,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+ struct RemoveRecordContext *rrc = cls;
+ unsigned int rd_count_new = rd_count -1;
+ struct GNUNET_NAMESTORE_RecordData rd_new[rd_count_new];
+ unsigned int c;
+ int res;
+ int found = GNUNET_NO;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name `%s 'currently has %u records\n", name, rd_count);
+
+ if (rd_count == 0)
+ {
+ /* Could not find record to remove */
+ rrc->op_res = 1;
+ return;
+ }
+
+ /* Find record to remove */
+ unsigned int c2 = 0;
+ for (c = 0; c < rd_count; c++)
+ {
+ if ((rd[c].expiration.abs_value == rrc->rd->expiration.abs_value) &&
+ (rd[c].flags == rrc->rd->flags) &&
+ (rd[c].record_type == rrc->rd->record_type) &&
+ (rd[c].data_size == rrc->rd->data_size) &&
+ (0 == memcmp (rd[c].data, rrc->rd->data, rrc->rd->data_size)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found record to remove!\n", rd_count);
+ found = GNUNET_YES;
+ continue;
+ }
+ else
+ {
+ rd_new[c2] = rd[c];
+ c2 ++;
+ }
+ }
+ if ((c2 != rd_count_new) || (found == GNUNET_NO))
+ {
+ /* Could not find record to remove */
+ rrc->op_res = 2;
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name `%s' now has %u records\n", name, rd_count_new);
+
+ /* Create new signature */
+ struct GNUNET_CRYPTO_RsaSignature * new_signature;
+ new_signature = GNUNET_NAMESTORE_create_signature (rrc->pkey, name, rd_new, rd_count_new);
+
+ if (new_signature == NULL)
+ {
+ /* Signature failed */
+ rrc->op_res = 3;
+ return;
+ }
+
+ /* Put records */
+ res = GSN_database->put_records(GSN_database->cls,
+ zone_key,
+ expire,
+ name,
+ rd_count_new, rd_new,
+ new_signature);
+ GNUNET_free (new_signature);
+
+ if (GNUNET_OK != res)
+ {
+ /* Could put records into database */
+ rrc->op_res = 4;
+ return;
+ }
+
+ rrc->op_res = 0;
+}
+
static void handle_record_remove (void *cls,
struct GNUNET_SERVER_Client * client,
const struct GNUNET_MessageHeader * message)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_REMOVE");
struct GNUNET_NAMESTORE_Client *nc;
struct RecordRemoveResponseMessage rrr_msg;
- size_t name_len;
- size_t msg_size;
- size_t msg_size_exp;
- uint32_t id = 0;
+ struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
+ GNUNET_HashCode pubkey_hash;
+ char * pkey_tmp = NULL;
+ char * name_tmp = NULL;
+ char * rd_ser = NULL;
+ size_t key_len = 0;
+ size_t name_len = 0;
+ size_t rd_ser_len = 0;
+ size_t msg_size = 0;
+ size_t msg_size_exp = 0;
+ uint32_t rd_count;
+ uint32_t rid = 0;
int res = GNUNET_SYSERR;
return;
}
- struct RecordRemoveMessage * rp_msg = (struct RecordRemoveMessage *) message;
- id = ntohl (rp_msg->op_id);
- name_len = ntohs (rp_msg->name_len);
+ struct RecordRemoveMessage * rr_msg = (struct RecordRemoveMessage *) message;
+ rid = ntohl (rr_msg->gns_header.r_id);
+ name_len = ntohs (rr_msg->name_len);
+ rd_ser_len = ntohs (rr_msg->rd_len);
+ rd_count = ntohs (rr_msg->rd_count);
+ key_len = ntohs (rr_msg->key_len);
msg_size = ntohs (message->size);
- msg_size_exp = sizeof (struct RecordRemoveMessage) + name_len + sizeof (struct GNUNET_NAMESTORE_RecordData);
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ if ((rd_count != 1) || (rd_ser_len < 1) || (name_len >=256) || (name_len == 0))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ msg_size_exp = sizeof (struct RecordRemoveMessage) + key_len + name_len + rd_ser_len;
if (msg_size != msg_size_exp)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Expected message %u size but message size is %u \n", msg_size_exp, msg_size);
return;
}
+ if ((rd_count != 1) || (rd_ser_len < 1) || (name_len >=256) || (name_len == 0))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ pkey_tmp = (char *) &rr_msg[1];
+ name_tmp = &pkey_tmp[key_len];
+ rd_ser = &name_tmp[name_len];
+
if ((name_len == 0) || (name_len > 256))
{
return;
}
- /* DO WORK HERE */
+ if (name_tmp[name_len -1] != '\0')
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
- /* Send response */
+ /* Extracting and converting private key */
+ pkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
+ GNUNET_assert (pkey != NULL);
+ GNUNET_CRYPTO_rsa_key_get_public(pkey, &pub);
+ GNUNET_CRYPTO_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ res = GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_ser, rd_count, rd);
+ if ((res != GNUNET_OK) || (rd_count != 1))
+ {
+ GNUNET_break_op (0);
+ goto send;
+ }
+
+ struct RemoveRecordContext rrc;
+ rrc.rd = rd;
+ rrc.pkey = pkey;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for name `%s' in zone `%s'\n", name_tmp, GNUNET_h2s(&pubkey_hash));
+
+ /* Database operation */
+ res = GSN_database->iterate_records (GSN_database->cls,
+ &pubkey_hash,
+ name_tmp,
+ 0,
+ handle_record_remove_it, &rrc);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for name `%s': %s\n",
+ name_tmp, (rrc.op_res == 0) ? "OK" : "FAIL");
+ res = rrc.op_res;
+ /* Send response */
+send:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "RECORD_REMOVE_RESPONSE");
- rrr_msg.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE);
- rrr_msg.op_id = rp_msg->op_id;
- rrr_msg.header.size = htons (sizeof (struct RecordRemoveResponseMessage));
- if (GNUNET_OK == res)
- rrr_msg.op_result = htons (GNUNET_OK);
- else
- rrr_msg.op_result = htons (GNUNET_NO);
+ rrr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE);
+ rrr_msg.gns_header.r_id = rr_msg->gns_header.r_id;
+ rrr_msg.gns_header.header.size = htons (sizeof (struct RecordRemoveResponseMessage));
+ rrr_msg.op_result = htons (res);
GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) &rrr_msg, GNUNET_NO);
+ GNUNET_CRYPTO_rsa_key_free (pkey);
+
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+struct ZoneIterationProcResult
+{
+ int have_zone_key;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key;
+
+ int have_signature;
+ struct GNUNET_CRYPTO_RsaSignature signature;
+ struct GNUNET_TIME_Absolute expire;
+
+ int have_name;
+ char name[256];
+
+ size_t rd_ser_len;
+ char *rd_ser;
+};
+
void zone_iteration_proc (void *cls,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct ZoneIterationResponseMessage zir_msg;
- struct GNUNET_NAMESTORE_ZoneIteration * zi = cls;
+ struct ZoneIterationProcResult *zipr = cls;
+ size_t len;
+ if (zone_key != NULL)
+ {
+ zipr->zone_key = *zone_key;
+ zipr->have_zone_key = GNUNET_YES;
+ }
+ else
+ zipr->have_zone_key = GNUNET_NO;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "ZONE_ITERATION_RESPONSE");
- zir_msg.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
- zir_msg.op_id = htonl(zi->op_id);
- zir_msg.header.size = htons (sizeof (struct ZoneIterationResponseMessage));
+ zipr->expire = expire;
- GNUNET_SERVER_notification_context_unicast (snc, zi->client->client, (const struct GNUNET_MessageHeader *) &zir_msg, GNUNET_NO);
+ if (name != NULL)
+ {
+ memcpy (zipr->name, name, strlen(name) + 1);
+ zipr->have_name = GNUNET_YES;
+ }
+ else
+ zipr->have_name = GNUNET_NO;
+
+ if (signature != NULL)
+ {
+ zipr->signature = *signature;
+ zipr->have_signature = GNUNET_YES;
+ }
+ else
+ zipr->have_signature = GNUNET_NO;
+
+ if ((rd_count > 0) && (rd != NULL))
+ {
+ len = GNUNET_NAMESTORE_records_get_size(rd_count, rd);
+ zipr->rd_ser = GNUNET_malloc (len);
+ GNUNET_NAMESTORE_records_serialize(rd_count, rd, len, zipr->rd_ser);
+ zipr->rd_ser_len = len;
+ }
}
static void handle_iteration_start (void *cls,
struct ZoneIterationStartMessage * zis_msg = (struct ZoneIterationStartMessage *) message;
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_NAMESTORE_ZoneIteration *zi;
+ struct ZoneIterationResponseMessage zir_msg;
+ struct ZoneIterationProcResult zipr;
int res;
nc = client_lookup(client);
}
zi = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_ZoneIteration));
- zi->op_id = ntohl (zis_msg->op_id);
+ zi->request_id = ntohl (zis_msg->gns_header.r_id);
zi->offset = 0;
zi->client = nc;
zi->zone = zis_msg->zone;
GNUNET_CONTAINER_DLL_insert (nc->op_head, nc->op_tail, zi);
- res = GSN_database->iterate_records (GSN_database->cls, &zis_msg->zone, NULL, zi->offset , &zone_iteration_proc, zi);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "iterate_records: %i\n", res);
+ res = GSN_database->iterate_records (GSN_database->cls, &zis_msg->zone, NULL, zi->offset , &zone_iteration_proc, &zipr);
+ switch (res) {
+ case GNUNET_OK:
+ /* GNUNET_OK on success */
+
+ break;
+ case GNUNET_SYSERR:
+ /* GNUNET_SYSERR on error */
+ break;
+ case GNUNET_NO:
+ /* GNUNET_NO if there were no results, */
+ break;
+ default:
+ break;
+ }
+
+
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "ZONE_ITERATION_RESPONSE");
+ zir_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
+ zir_msg.gns_header.r_id = htonl(zi->request_id);
+ zir_msg.gns_header.header.size = htons (sizeof (struct ZoneIterationResponseMessage));
+
+
+ GNUNET_SERVER_notification_context_unicast (snc, zi->client->client, (const struct GNUNET_MessageHeader *) &zir_msg, GNUNET_NO);
+
+
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_NAMESTORE_ZoneIteration *zi;
struct ZoneIterationStopMessage * zis_msg = (struct ZoneIterationStopMessage *) message;
- uint32_t id;
+ uint32_t rid;
nc = client_lookup(client);
if (nc == NULL)
return;
}
- id = ntohl (zis_msg->op_id);
+ rid = ntohl (zis_msg->gns_header.r_id);
for (zi = nc->op_head; zi != NULL; zi = zi->next)
{
- if (zi->op_id == id)
+ if (zi->request_id == rid)
break;
}
if (zi == NULL)
const struct GNUNET_MessageHeader * message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_NEXT");
+
+ struct GNUNET_NAMESTORE_Client *nc;
+ struct GNUNET_NAMESTORE_ZoneIteration *zi;
+ struct ZoneIterationStopMessage * zis_msg = (struct ZoneIterationStopMessage *) message;
+ uint32_t rid;
+ int res;
+
+ nc = client_lookup(client);
+ if (nc == NULL)
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ rid = ntohl (zis_msg->gns_header.r_id);
+ for (zi = nc->op_head; zi != NULL; zi = zi->next)
+ {
+ if (zi->request_id == rid)
+ break;
+ }
+ if (zi == NULL)
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ zi->offset++;
+ res = GSN_database->iterate_records (GSN_database->cls, &zi->zone, NULL, zi->offset , &zone_iteration_proc, zi);
}
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
{&handle_start, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_START, sizeof (struct StartMessage)},
+ {&handle_stop, NULL,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_DISCONNECT, sizeof (struct DisconnectMessage)},
{&handle_lookup_name, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME, 0},
{&handle_record_put, NULL,
}
/* end of gnunet-service-namestore.c */
+
projects / oweals / gnunet.git / blobdiff