int has_zone;
- GNUNET_HashCode zone;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
uint64_t request_id;
uint32_t offset;
+ /**
+ * Which flags must be included
+ */
+ uint16_t must_have_flags;
-
+ /**
+ * Which flags must not be included
+ */
+ uint16_t must_not_have_flags;
};
{
char * filename;
- GNUNET_HashCode zone;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
struct GNUNET_CRYPTO_RsaPrivateKey *privkey;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey;
};
/**
* Write zonefile to disk
- * @param file where to write
- * @param ret the key
+ * @param filename where to write
+ * @param c the crypto container
*
* @return GNUNET_OK on success, GNUNET_SYSERR on fail
*/
-int write_key_to_file (const char *filename, struct GNUNET_NAMESTORE_CryptoContainer *c)
+int
+write_key_to_file (const char *filename, struct GNUNET_NAMESTORE_CryptoContainer *c)
{
struct GNUNET_CRYPTO_RsaPrivateKey *ret = c->privkey;
struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded *enc;
if (GNUNET_YES == GNUNET_DISK_file_test (filename))
{
- GNUNET_HashCode zone;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
if (privkey == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("File zone `%s' but corrupt content already exists, failed to write! \n"), GNUNET_h2s (&zone));
+ _("File zone `%s' but corrupt content already exists, failed to write! \n"), GNUNET_short_h2s (&zone));
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
- GNUNET_CRYPTO_hash(&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
- GNUNET_CRYPTO_rsa_key_free(privkey);
+ GNUNET_CRYPTO_rsa_key_get_public (privkey, &pubkey);
+ GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone);
+ GNUNET_CRYPTO_rsa_key_free (privkey);
if (0 == memcmp (&zone, &c->zone, sizeof(zone)))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("File zone `%s' containing this key already exists\n"), GNUNET_h2s (&zone));
+ _("File zone `%s' containing this key already exists\n"), GNUNET_short_h2s (&zone));
return GNUNET_OK;
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("File zone `%s' but different zone key already exists, failed to write! \n"), GNUNET_h2s (&zone));
+ _("File zone `%s' but different zone key already exists, failed to write! \n"), GNUNET_short_h2s (&zone));
return GNUNET_OK;
}
}
}
if (GNUNET_YES != GNUNET_DISK_file_lock (fd, 0, sizeof (struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded), GNUNET_YES))
+ {
+ GNUNET_assert (GNUNET_YES == GNUNET_DISK_file_close (fd));
return GNUNET_SYSERR;
+ }
enc = GNUNET_CRYPTO_rsa_encode_key (ret);
GNUNET_assert (enc != NULL);
GNUNET_assert (ntohs (enc->len) == GNUNET_DISK_file_write (fd, enc, ntohs (enc->len)));
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "fcntl", filename);
GNUNET_assert (GNUNET_YES == GNUNET_DISK_file_close (fd));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Stored zonekey for zone `%s' in file `%s'\n"),GNUNET_h2s(&c->zone), c->filename);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Stored zonekey for zone `%s' in file `%s'\n"), GNUNET_short_h2s(&c->zone), c->filename);
return GNUNET_OK;
}
int zone_to_disk_it (void *cls,
- const GNUNET_HashCode * key,
+ const GNUNET_HashCode *key,
void *value)
{
struct GNUNET_NAMESTORE_CryptoContainer * c = value;
-
if (c->filename != NULL)
write_key_to_file(c->filename, c);
else
{
- GNUNET_asprintf(&c->filename, "%s/%s.zkey", zonefile_directory, GNUNET_h2s_full (&c->zone));
+ GNUNET_asprintf(&c->filename, "%s/%s.zkey", zonefile_directory, GNUNET_short_h2s (&c->zone));
write_key_to_file(c->filename, c);
}
- GNUNET_CONTAINER_multihashmap_remove (zonekeys, key, value);;
- GNUNET_CRYPTO_rsa_key_free(c->privkey);
+
+ GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multihashmap_remove (zonekeys, key, value));
+ GNUNET_CRYPTO_rsa_key_free (c->privkey);
GNUNET_free (c->pubkey);
- GNUNET_free(c->filename);
+ GNUNET_free (c->filename);
GNUNET_free (c);
return GNUNET_OK;
GNUNET_SERVER_notification_context_destroy (snc);
snc = NULL;
-
GNUNET_CONTAINER_multihashmap_iterate(zonekeys, &zone_to_disk_it, NULL);
GNUNET_CONTAINER_multihashmap_destroy(zonekeys);
if ((NULL == client) || (NULL == nc))
return;
- for (no = nc->op_head; no != NULL; no = no->next)
+ no = nc->op_head;
+ while (NULL != no)
{
GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, no);
GNUNET_free (no);
+ no = nc->op_head;
}
-
GNUNET_SERVER_client_drop(nc->client);
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
GNUNET_free (nc);
struct GNUNET_NAMESTORE_Client *nc;
uint32_t request_id;
uint32_t record_type;
- GNUNET_HashCode *zone;
+ struct GNUNET_CRYPTO_ShortHashCode *zone;
char * name;
};
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- GNUNET_HashCode zone_hash;
+ struct GNUNET_CRYPTO_ShortHashCode 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));
+ GNUNET_CRYPTO_short_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting zone `%s'\n", GNUNET_short_h2s (&zone_hash));
GSN_database->delete_zone (GSN_database->cls, &zone_hash);
}
else
struct GNUNET_NAMESTORE_CryptoContainer *cc;
struct GNUNET_CRYPTO_RsaSignature *signature_new = NULL;
struct GNUNET_TIME_Absolute e;
- GNUNET_HashCode zone_key_hash;
+ struct GNUNET_CRYPTO_ShortHashCode zone_key_hash;
+ GNUNET_HashCode long_hash;
char *rd_tmp;
char *name_tmp;
size_t rd_ser_len;
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));
+ copied_elements, lnc->record_type, lnc->name, GNUNET_short_h2s(lnc->zone));
rd_selected = GNUNET_malloc (copied_elements * sizeof (struct GNUNET_NAMESTORE_RecordData));
copied_elements = 0;
for (c = 0; c < rd_count; c ++)
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));
+ copied_elements, lnc->name, GNUNET_short_h2s(lnc->zone));
if ((copied_elements == rd_count) && (NULL != signature))
contains_signature = GNUNET_YES; /* returning all records, so include signature */
if ((NULL != zone_key) && (copied_elements == rd_count))
{
- GNUNET_CRYPTO_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_key_hash);
- if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &zone_key_hash))
+ GNUNET_CRYPTO_short_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_key_hash);
+ GNUNET_CRYPTO_short_hash_double (&zone_key_hash, &long_hash);
+ if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
{
- cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &zone_key_hash);
+ cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &long_hash);
e = get_block_expiration_time(rd_count, rd);
signature_new = GNUNET_NAMESTORE_create_signature(cc->privkey, e, name, rd, rd_count);
GNUNET_assert (signature_new != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for name `%s' with %u records in zone `%s'\n",name, copied_elements, GNUNET_h2s(&zone_key_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for name `%s' with %u records in zone `%s'\n",name, copied_elements, GNUNET_short_h2s(&zone_key_hash));
authoritative = GNUNET_YES;
}
else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "I am not authoritative for name `%s' in zone `%s'\n",name, GNUNET_h2s(&zone_key_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "I am not authoritative for name `%s' in zone `%s'\n",name, GNUNET_short_h2s(&zone_key_hash));
}
r_size = sizeof (struct LookupNameResponseMessage) +
}
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));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up all records for name `%s' in zone `%s'\n", name, GNUNET_short_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));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up records with type %u for name `%s' in zone `%s'\n", type, name, GNUNET_short_h2s(&ln_msg->zone));
/* do the actual lookup */
lnc.request_id = rid;
goto send;
}
- GNUNET_HashCode zone_hash;
- GNUNET_CRYPTO_hash (&rp_msg->public_key, sizeof (rp_msg->public_key), &zone_hash);
+ struct GNUNET_CRYPTO_ShortHashCode zone_hash;
+ GNUNET_CRYPTO_short_hash (&rp_msg->public_key, sizeof (rp_msg->public_key), &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));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Putting %u record for name `%s' in zone `%s'\n", rd_count, name, GNUNET_short_h2s(&zone_hash));
/* Database operation */
res = GSN_database->put_records(GSN_database->cls,
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) &&
+ if ((crc->rd->record_type == GNUNET_NAMESTORE_TYPE_PKEY) && (rd[c].record_type == GNUNET_NAMESTORE_TYPE_PKEY))
+ {
+ /* Update unique PKEY */
+ exist = c;
+ update = GNUNET_YES;
+ break;
+ }
+ else if ((crc->rd->record_type == GNUNET_NAMESTORE_TYPE_PSEU) && (rd[c].record_type == GNUNET_NAMESTORE_TYPE_PSEU))
+ {
+ /* Update unique PSEU */
+ exist = c;
+ update = GNUNET_YES;
+ break;
+ }
+ else 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)))
{
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;
+ rd_new[exist] = *(crc->rd);
}
block_expiration = GNUNET_TIME_absolute_max(crc->expire, expire);
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 */
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
struct RecordCreateResponseMessage rcr_msg;
- GNUNET_HashCode pubkey_hash;
+ struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
+ GNUNET_HashCode long_hash;
size_t name_len;
size_t msg_size;
size_t msg_size_exp;
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);
+ GNUNET_CRYPTO_short_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ GNUNET_CRYPTO_short_hash_double (&pubkey_hash, &long_hash);
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &pubkey_hash))
+ if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received new private key for zone `%s'\n",GNUNET_h2s(&pubkey_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received new private key for zone `%s'\n",GNUNET_short_h2s(&pubkey_hash));
cc = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_CryptoContainer));
cc->privkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
cc->pubkey = GNUNET_malloc(sizeof (pub));
memcpy (cc->pubkey, &pub, sizeof(pub));
cc->zone = pubkey_hash;
-
- GNUNET_CONTAINER_multihashmap_put(zonekeys, &pubkey_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_CONTAINER_multihashmap_put(zonekeys, &long_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
crc.expire = GNUNET_TIME_absolute_ntoh(rp_msg->expire);
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));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating record for name `%s' in zone `%s'\n", name_tmp, GNUNET_short_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);
{
struct GNUNET_NAMESTORE_RecordData *rd;
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+ int remove_name;
uint16_t op_res;
};
found = GNUNET_SYSERR;
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 = c;
- break;
- }
+ /*
+ if (rd[c].flags != rrc->rd->flags)
+ continue;*/
+ if (rd[c].record_type != rrc->rd->record_type)
+ continue;
+ /*
+ if (rd[c].data_size != rrc->rd->data_size)
+ continue;
+ GNUNET_break(0);
+ if (0 != memcmp (rd[c].data, rrc->rd->data, rrc->rd->data_size))
+ continue;
+ GNUNET_break(0); */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found record to remove!\n", rd_count);
+ found = c;
+ break;
}
if (GNUNET_SYSERR == found)
{
return;
}
+ if (rd_count-1 == 0)
+ {
+ struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
+ GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ res = GSN_database->remove_records (GSN_database->cls,
+ &pubkey_hash,
+ name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No records left for name `%s', removing name\n",
+ name, res);
+ if (GNUNET_OK != res)
+ {
+ /* Could put records into database */
+ rrc->op_res = 4;
+ return;
+ }
+ rrc->op_res = 0;
+ return;
+ }
+
rd_count_new = rd_count -1;
struct GNUNET_NAMESTORE_RecordData rd_new[rd_count_new];
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
struct GNUNET_NAMESTORE_CryptoContainer *cc = NULL;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
- GNUNET_HashCode pubkey_hash;
+ struct GNUNET_CRYPTO_ShortHashCode pubkey_hash;
+ GNUNET_HashCode long_hash;
char * pkey_tmp = NULL;
char * name_tmp = NULL;
char * rd_ser = NULL;
return;
}
- if ((rd_count != 1) || (rd_ser_len < 1) || (name_len >=256) || (name_len == 0))
+ if ((name_len >=256) || (name_len == 0))
{
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;
- }
-
pkey_tmp = (char *) &rr_msg[1];
name_tmp = &pkey_tmp[key_len];
rd_ser = &name_tmp[name_len];
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);
+ GNUNET_CRYPTO_short_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ GNUNET_CRYPTO_short_hash_double (&pubkey_hash, &long_hash);
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &pubkey_hash))
+ if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received new private key for zone `%s'\n",GNUNET_h2s(&pubkey_hash));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received new private key for zone `%s'\n",GNUNET_short_h2s(&pubkey_hash));
cc = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_CryptoContainer));
cc->privkey = GNUNET_CRYPTO_rsa_decode_key((char *) pkey_tmp, key_len);
cc->pubkey = GNUNET_malloc(sizeof (pub));
memcpy (cc->pubkey, &pub, sizeof(pub));
cc->zone = pubkey_hash;
- GNUNET_CONTAINER_multihashmap_put(zonekeys, &pubkey_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_CONTAINER_multihashmap_put(zonekeys, &long_hash, cc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
+
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))
+ if ((res != GNUNET_OK) || (rd_count > 1))
{
GNUNET_break_op (0);
goto send;
}
- struct RemoveRecordContext rrc;
- rrc.rd = rd;
- rrc.pkey = pkey;
+ if (0 == rd_count)
+ {
+ /* remove the whole name and all records */
+ /* Database operation */
+ res = GSN_database->remove_records (GSN_database->cls,
+ &pubkey_hash,
+ name_tmp);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing name `%s': %s\n",
+ name_tmp, (GNUNET_OK == res) ? "OK" : "FAIL");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing record for name `%s' in zone `%s'\n", name_tmp, GNUNET_h2s(&pubkey_hash));
+ if (GNUNET_OK != res)
+ /* Could not remove entry from database */
+ res = 4;
+ else
+ res = 0;
+ }
+ else
+ {
+ /* remove a single record */
+ struct RemoveRecordContext rrc;
+ rrc.rd = rd;
+ rrc.pkey = pkey;
- /* 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' in zone `%s'\n", name_tmp, GNUNET_short_h2s(&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;
+ /* 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");
msg_size = sizeof (struct ZoneToNameResponseMessage) + name_len + rd_ser_len + contains_sig * sizeof (struct GNUNET_CRYPTO_RsaSignature);
ztnr_msg = GNUNET_malloc (msg_size);
- memset(ztnr_msg, 0, msg_size);
name_tmp = (char *) &ztnr_msg[1];
rd_tmp = &name_tmp[name_len];
ztn_ctx.rid = rid;
ztn_ctx.nc = nc;
- char * z_tmp = strdup (GNUNET_h2s (&ztn_msg->zone));
+ struct GNUNET_CRYPTO_ShortHashAsciiEncoded z_tmp;
+ GNUNET_CRYPTO_short_hash_to_enc(&ztn_msg->zone, &z_tmp);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up name for zone `%s' in zone `%s'\n",
- z_tmp,
- GNUNET_h2s (&ztn_msg->value_zone));
- GNUNET_free (z_tmp);
+ (char *) &z_tmp,
+ GNUNET_short_h2s (&ztn_msg->value_zone));
GSN_database->zone_to_name (GSN_database->cls, &ztn_msg->zone, &ztn_msg->value_zone, &handle_zone_to_name_it, &ztn_ctx);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+
+/**
+ * Copy record, data has to be free separetely
+ */
+void
+copy_record (const struct GNUNET_NAMESTORE_RecordData *src, struct GNUNET_NAMESTORE_RecordData *dest)
+{
+
+ memcpy (dest, src, sizeof (struct GNUNET_NAMESTORE_RecordData));
+ dest->data = GNUNET_malloc (src->data_size);
+ memcpy ((void *) dest->data, src->data, src->data_size);
+}
+
struct ZoneIterationProcResult
{
- int have_zone_key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key;
+ struct GNUNET_NAMESTORE_ZoneIteration *zi;
+
+ int res_iteration_finished;
+ int records_included;
+ int has_signature;
- int have_signature;
+ char *name;
+ struct GNUNET_CRYPTO_ShortHashCode zone_hash;
+ struct GNUNET_NAMESTORE_RecordData *rd;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key;
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,
+void zone_iteraterate_proc (void *cls,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
struct GNUNET_TIME_Absolute expire,
const char *name,
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct GNUNET_NAMESTORE_ZoneIteration *zi = cls;
- struct GNUNET_NAMESTORE_Client *nc = zi->client;
- struct GNUNET_NAMESTORE_CryptoContainer * cc;
- struct GNUNET_CRYPTO_RsaSignature *signature_new = NULL;
+ struct ZoneIterationProcResult *proc = cls;
+ struct GNUNET_NAMESTORE_RecordData *rd_filtered;
+ struct GNUNET_CRYPTO_RsaSignature * new_signature;
+ struct GNUNET_NAMESTORE_CryptoContainer *cc;
+ struct GNUNET_CRYPTO_ShortHashCode hash;
+ GNUNET_HashCode long_hash;
struct GNUNET_TIME_Absolute e;
- GNUNET_HashCode zone_key_hash;
- int authoritative = GNUNET_NO;
+ unsigned int rd_count_filtered = 0;
+ int include;
+ int c;
+
+ proc->res_iteration_finished = GNUNET_NO;
+ proc->records_included = 0;
if ((zone_key == NULL) && (name == NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Iteration done\n");
+ proc->res_iteration_finished = GNUNET_YES;
+ proc->rd = NULL;
+ proc->name = NULL;
+ }
+ else
+ {
+ rd_filtered = GNUNET_malloc (rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received result for zone iteration: `%s'\n", name);
+ for (c = 0; c < rd_count; c++)
+ {
+ include = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: 0x%x must have 0x%x \n",
+ c, rd[c].flags, proc->zi->must_have_flags);
+ /* Checking must have flags */
+ if ((rd[c].flags & proc->zi->must_have_flags) == proc->zi->must_have_flags)
+ {
+ /* Include */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Include \n", c);
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Not include \n", c);
+ include = GNUNET_NO;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: 0x%x must not have 0x%x\n",
+ c, rd[c].flags, proc->zi->must_not_have_flags);
+ if ((rd[c].flags & proc->zi->must_not_have_flags) != 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Not include \n", c);
+ include = GNUNET_NO;
+ }
+ else
+ {
+ /* Include */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %i has flags: Include \n", c);
+ }
+ if (GNUNET_YES == include)
+ {
+ copy_record (&rd[c], &rd_filtered[rd_count_filtered]);
+ rd_count_filtered++;
+ }
+
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Included %i of %i records \n", rd_count_filtered, rd_count);
+
+ proc->records_included = rd_count_filtered;
+ if (0 == rd_count_filtered)
+ {
+ GNUNET_free (rd_filtered);
+ rd_filtered = NULL;
+ }
+ proc->rd = rd_filtered;
+ proc->name = strdup(name);
+ memcpy (&proc->zone_key, zone_key, sizeof (proc->zone_key));
+
+ /* Signature */
+ proc->has_signature = GNUNET_NO;
+ GNUNET_CRYPTO_short_hash (zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &hash);
+ GNUNET_CRYPTO_short_hash_double(&hash, &long_hash);
+ proc->zone_hash = hash;
+
+ if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &long_hash))
+ {
+ cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &long_hash);
+ e = get_block_expiration_time(rd_count_filtered, rd_filtered);
+ proc->expire = e;
+ new_signature = GNUNET_NAMESTORE_create_signature(cc->privkey, e, name, rd_filtered, rd_count_filtered);
+ GNUNET_assert (signature != NULL);
+ proc->signature = (*new_signature);
+ GNUNET_free (new_signature);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for `%s' in zone `%s' with %u records and expiration %llu\n",
+ name, GNUNET_short_h2s(&hash), rd_count_filtered, e.abs_value);
+ proc->has_signature = GNUNET_YES;
+ }
+ else if (rd_count_filtered == rd_count)
+ {
+ proc->expire = expire;
+ if (NULL != signature)
+ {
+ proc->signature = (*signature);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using provided signature for `%s' in zone `%s' with %u records and expiration %llu\n",
+ name, GNUNET_short_h2s(&hash), rd_count_filtered, expire.abs_value);
+ proc->has_signature = GNUNET_YES;
+ }
+ else
+ {
+ memset (&proc->signature, '\0', sizeof (proc->signature));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No signature provided for `%s'\n", name);
+ }
+ }
+ }
+
+}
+
+void find_next_zone_iteration_result (struct ZoneIterationProcResult *proc)
+{
+
+ struct GNUNET_CRYPTO_ShortHashCode *zone;
+
+ if (GNUNET_YES == proc->zi->has_zone)
+ zone = &proc->zi->zone;
+ else
+ zone = NULL;
+
+ do
+ {
+ GSN_database->iterate_records (GSN_database->cls, zone , NULL, proc->zi->offset, &zone_iteraterate_proc, proc);
+ proc->zi->offset++;
+ }
+ while ((proc->records_included == 0) && (GNUNET_NO == proc->res_iteration_finished));
+}
+
+
+void send_zone_iteration_result (struct ZoneIterationProcResult *proc)
+{
+ struct GNUNET_NAMESTORE_ZoneIteration *zi = proc->zi;
+
+ if (GNUNET_YES == proc->res_iteration_finished)
{
struct ZoneIterationResponseMessage zir_msg;
if (zi->has_zone == GNUNET_YES)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No more results for zone `%s'\n", GNUNET_h2s(&zi->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No more results for zone `%s'\n", GNUNET_short_h2s(&zi->zone));
else
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No more results for all zones\n");
zir_msg.rd_len = htons (0);
memset (&zir_msg.public_key, '\0', sizeof (zir_msg.public_key));
memset (&zir_msg.signature, '\0', sizeof (zir_msg.signature));
- GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) &zir_msg, GNUNET_NO);
+ GNUNET_SERVER_notification_context_unicast (snc, zi->client->client, (const struct GNUNET_MessageHeader *) &zir_msg, GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing zone iterator\n");
- GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, zi);
+ GNUNET_CONTAINER_DLL_remove (zi->client->op_head, zi->client->op_tail, zi);
GNUNET_free (zi);
return;
}
else
{
+ GNUNET_assert (proc->records_included > 0);
+
struct ZoneIterationResponseMessage *zir_msg;
if (zi->has_zone == GNUNET_YES)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending name `%s' for iteration over zone `%s'\n",
- name, GNUNET_h2s(&zi->zone));
+ proc->name, GNUNET_short_h2s(&zi->zone));
if (zi->has_zone == GNUNET_NO)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending name `%s' for iteration over all zones\n",
- name);
+ proc->name);
size_t name_len;
size_t rd_ser_len;
size_t msg_size;
char *name_tmp;
char *rd_tmp;
- name_len = strlen (name) +1;
+ name_len = strlen (proc->name) +1;
- rd_ser_len = GNUNET_NAMESTORE_records_get_size(rd_count, rd);
+ rd_ser_len = GNUNET_NAMESTORE_records_get_size(proc->records_included, proc->rd);
char rd_ser[rd_ser_len];
- GNUNET_NAMESTORE_records_serialize(rd_count, rd, rd_ser_len, rd_ser);
+ GNUNET_NAMESTORE_records_serialize(proc->records_included, proc->rd, rd_ser_len, rd_ser);
msg_size = sizeof (struct ZoneIterationResponseMessage) + name_len + rd_ser_len;
zir_msg = GNUNET_malloc(msg_size);
name_tmp = (char *) &zir_msg[1];
rd_tmp = &name_tmp[name_len];
- GNUNET_CRYPTO_hash(zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_key_hash);
- if (GNUNET_CONTAINER_multihashmap_contains(zonekeys, &zone_key_hash))
- {
- cc = GNUNET_CONTAINER_multihashmap_get(zonekeys, &zone_key_hash);
- e = get_block_expiration_time(rd_count, rd);
- expire = e;
- signature_new = GNUNET_NAMESTORE_create_signature(cc->privkey, e, name, rd, rd_count);
- GNUNET_assert (signature_new != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating signature for `%s' in zone `%s' with %u records and expiration %llu\n", name, GNUNET_h2s(&zone_key_hash), rd_count, e.abs_value);
- authoritative = GNUNET_YES;
- }
-
-
zir_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
zir_msg->gns_header.header.size = htons (msg_size);
zir_msg->gns_header.r_id = htonl(zi->request_id);
- zir_msg->expire = GNUNET_TIME_absolute_hton(expire);
+ zir_msg->expire = GNUNET_TIME_absolute_hton(proc->expire);
zir_msg->reserved = htons (0);
zir_msg->name_len = htons (name_len);
- zir_msg->rd_count = htons (rd_count);
+ zir_msg->rd_count = htons (proc->records_included);
zir_msg->rd_len = htons (rd_ser_len);
- if ((GNUNET_YES == authoritative) && (NULL != signature_new))
- {
- zir_msg->signature = *signature_new;
- GNUNET_free (signature_new);
- }
- else
- zir_msg->signature = *signature;
- GNUNET_assert (NULL != zone_key);
- if (zone_key != NULL)
- zir_msg->public_key = *zone_key;
- memcpy (name_tmp, name, name_len);
+ zir_msg->signature = proc->signature;
+ zir_msg->public_key = proc->zone_key;
+ memcpy (name_tmp, proc->name, name_len);
memcpy (rd_tmp, rd_ser, rd_ser_len);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending empty `%s' message with size %u\n", "ZONE_ITERATION_RESPONSE", msg_size);
- GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) zir_msg, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with size %u\n", "ZONE_ITERATION_RESPONSE", msg_size);
+ GNUNET_SERVER_notification_context_unicast (snc, zi->client->client, (const struct GNUNET_MessageHeader *) zir_msg, GNUNET_NO);
GNUNET_free (zir_msg);
}
}
+void clean_up_zone_iteration_result (struct ZoneIterationProcResult *proc)
+{
+ int c;
+ GNUNET_free_non_null (proc->name);
+ for (c = 0; c < proc->records_included; c++)
+ {
+ GNUNET_free ((void *) proc->rd[c].data);
+ }
+ GNUNET_free_non_null (proc->rd);
+ proc->name = NULL;
+ proc->rd = NULL;
+}
+
static void handle_iteration_start (void *cls,
struct GNUNET_SERVER_Client * client,
const struct GNUNET_MessageHeader * message)
zi->offset = 0;
zi->client = nc;
zi->zone = zis_msg->zone;
+ zi->must_have_flags = ntohs (zis_msg->must_have_flags);
+ zi->must_not_have_flags = ntohs (zis_msg->must_not_have_flags);
- GNUNET_HashCode dummy;
- GNUNET_HashCode *zone_tmp;
+ struct GNUNET_CRYPTO_ShortHashCode dummy;
+ struct GNUNET_CRYPTO_ShortHashCode *zone_tmp;
memset (&dummy, '\0', sizeof (dummy));
if (0 == memcmp (&dummy, &zis_msg->zone, sizeof (dummy)))
{
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to iterate over zone `%s'\n", GNUNET_h2s (&zis_msg->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to iterate over zone `%s'\n", GNUNET_short_h2s (&zis_msg->zone));
zi->has_zone = GNUNET_YES;
zone_tmp = &zis_msg->zone;
}
GNUNET_CONTAINER_DLL_insert (nc->op_head, nc->op_tail, zi);
- GSN_database->iterate_records (GSN_database->cls, zone_tmp , NULL, zi->offset , &zone_iteration_proc, zi);
+ struct ZoneIterationProcResult proc;
+ proc.zi = zi;
+
+ find_next_zone_iteration_result (&proc);
+ if (GNUNET_YES == proc.res_iteration_finished)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone iteration done\n");
+ }
+ else if (proc.records_included != 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone iteration return %u records\n", proc.records_included);
+ }
+ send_zone_iteration_result (&proc);
+ clean_up_zone_iteration_result (&proc);
+
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
GNUNET_CONTAINER_DLL_remove(nc->op_head, nc->op_tail, zi);
if (GNUNET_YES == zi->has_zone)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration for zone `%s'\n", GNUNET_h2s (&zi->zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration for zone `%s'\n", GNUNET_short_h2s (&zi->zone));
else
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration all zones\n");
GNUNET_free (zi);
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_NAMESTORE_ZoneIteration *zi;
- GNUNET_HashCode *zone_tmp;
+ struct GNUNET_CRYPTO_ShortHashCode *zone_tmp;
struct ZoneIterationStopMessage * zis_msg = (struct ZoneIterationStopMessage *) message;
uint32_t rid;
else
zone_tmp = NULL;
- zi->offset++;
- GSN_database->iterate_records (GSN_database->cls, zone_tmp, NULL, zi->offset , &zone_iteration_proc, zi);
+
+ struct ZoneIterationProcResult proc;
+ proc.zi = zi;
+
+ find_next_zone_iteration_result (&proc);
+ if (GNUNET_YES == proc.res_iteration_finished)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone iteration done\n");
+ }
+ else if (proc.records_included != 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone iteration return %u records\n", proc.records_included);
+ }
+ send_zone_iteration_result (&proc);
+ clean_up_zone_iteration_result (&proc);
+
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
int zonekey_file_it (void *cls, const char *filename)
{
+ GNUNET_HashCode long_hash;
int *counter = cls;
if ((filename != NULL) && (NULL != strstr(filename, ".zkey")))
{
c->pubkey = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
c->privkey = privkey;
GNUNET_CRYPTO_rsa_key_get_public(privkey, c->pubkey);
- GNUNET_CRYPTO_hash(c->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &c->zone);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found zonefile for zone `%s'\n", GNUNET_h2s (&c->zone));
+ GNUNET_CRYPTO_short_hash(c->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &c->zone);
- GNUNET_CONTAINER_multihashmap_put(zonekeys, &c->zone, c, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found zonefile for zone `%s'\n", GNUNET_short_h2s (&c->zone));
+ GNUNET_CRYPTO_short_hash_double (&c->zone, &long_hash);
+ GNUNET_CONTAINER_multihashmap_put(zonekeys, &long_hash, c, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
(*counter) ++;
}
return GNUNET_OK;
projects / oweals / gnunet.git / blobdiff