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);
return nc;
}
-
/**
* Called whenever a client is disconnected. Frees our
* resources associated with that client.
GNUNET_free (nc);
}
+
+
static void handle_start (void *cls,
struct GNUNET_SERVER_Client * client,
const struct GNUNET_MessageHeader * message)
struct GNUNET_NAMESTORE_Client *nc;
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,
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 ++)
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;
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->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 (rd_count);
+ 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);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up record for name `%s'\n", name);
-
+ 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.request_id = rid;
lnc.nc = nc;
lnc.record_type = type;
+ 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);
rd_ser = &name[name_len];
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_ser, rd_count, rd);
+ 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,
zone_key,
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->gns_header.r_id;
{
struct GNUNET_NAMESTORE_RecordData *rd;
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey;
struct GNUNET_TIME_Absolute expire;
- uint32_t op_id;
- struct GNUNET_NAMESTORE_Client *nc;
-};
-
-struct GNUNET_CRYPTO_RsaSignature *
-GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key, const char *name, struct GNUNET_NAMESTORE_RecordData *rd, unsigned int rd_count)
-{
- struct GNUNET_CRYPTO_RsaSignature *sig = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignature));
- struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose;
- size_t rd_ser_len;
- size_t name_len;
- char * name_tmp;
- char * rd_tmp;
+ char *name;
int res;
+};
- if (name == NULL)
- {
- GNUNET_break (0);
- GNUNET_free (sig);
- return NULL;
- }
- name_len = strlen (name) + 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);
-
- sig_purpose = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + rd_ser_len + name_len);
-
- sig_purpose->size = htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose)+ rd_ser_len + name_len);
- sig_purpose->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
- name_tmp = (char *) &sig_purpose[1];
- rd_tmp = &name_tmp[name_len];
- memcpy (name_tmp, name, name_len);
- memcpy (rd_tmp, rd_ser, rd_ser_len);
-
- res = GNUNET_CRYPTO_rsa_sign (key, sig_purpose, sig);
-
- GNUNET_free (sig_purpose);
-
- if (GNUNET_OK != res)
- {
- GNUNET_break (0);
- GNUNET_free (sig);
- return NULL;
- }
- return sig;
-}
static void
handle_create_record_it (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey,
struct GNUNET_TIME_Absolute expire,
const char *name,
unsigned int rd_count,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
struct CreateRecordContext * crc = cls;
- struct GNUNET_CRYPTO_RsaSignature *signature_new;
- struct RecordCreateResponseMessage rcr_msg;
+ 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, name);
- struct GNUNET_NAMESTORE_RecordData *rd_new = GNUNET_malloc ((rd_count+1) * sizeof (struct GNUNET_NAMESTORE_RecordData));
- memcpy (rd_new, rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u existing records for `%s'\n", rd_count, crc->name);
- rd_new[rd_count] = *(crc->rd);
+ 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);
- signature_new = GNUNET_NAMESTORE_create_signature (crc->pkey, 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,
- zone_key,
- expire,
- name,
- rd_count +1, rd_new,
+ (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;
- GNUNET_free (rd_new);
- GNUNET_free (signature_new);
+end:
+ GNUNET_free_non_null (rd_new);
+ GNUNET_free_non_null (signature_new);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Update result for name %u\n", res);
- /* Send response */
+ 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, "Sending `%s' message\n", "RECORD_CREATE_RESPONSE");
- rcr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE);
- rcr_msg.gns_header.r_id = htonl (crc->op_id);
- rcr_msg.gns_header.header.size = htons (sizeof (struct RecordCreateResponseMessage));
- if (GNUNET_OK == res)
- rcr_msg.op_result = htons (GNUNET_OK);
- else
- rcr_msg.op_result = htons (GNUNET_NO);
- GNUNET_SERVER_notification_context_unicast (snc, crc->nc->client, (const struct GNUNET_MessageHeader *) &rcr_msg, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Update result for name `%s' %u\n", crc->name, res);
}
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;
char *rd_ser;
int rd_count;
-
int res = GNUNET_SYSERR;
if (ntohs (message->size) < sizeof (struct RecordCreateMessage))
}
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_ser, rd_count, rd);
- GNUNET_assert (rd_count == 1);
+ 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_CRYPTO_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
crc.pkey = pkey;
+ crc.pubkey = &pub;
crc.rd = rd;
- crc.nc = nc;
- crc.op_id = rid;
+ 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.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);
}
GNUNET_CRYPTO_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_ser, rd_count, rd);
- GNUNET_assert (rd_count == 1);
+ 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,
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.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 (rrc.op_res);
+ 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);
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,
projects / oweals / gnunet.git / blobdiff