struct GNUNET_NAMESTORE_Client * client;
+ int has_zone;
+
GNUNET_HashCode zone;
uint64_t request_id;
uint32_t offset;
+
+
};
GNUNET_free (no);
}
+
GNUNET_SERVER_client_drop(nc->client);
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
GNUNET_free (nc);
}
-/**
- * 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,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
/* send response */
struct LookupNameContext *lnc = cls;
struct LookupNameResponseMessage *lnr_msg;
-
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key_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;
-
size_t r_size = 0;
-
size_t name_len = 0;
- if (NULL != name)
- name_len = strlen(name) + 1;
int copied_elements = 0;
int contains_signature = 0;
int c;
+ if (NULL != name)
+ name_len = strlen(name) + 1;
+
/* count records to copy */
if (rd_count != 0)
{
char rd_ser[rd_ser_len];
GNUNET_NAMESTORE_records_serialize(copied_elements, rd_selected, rd_ser_len, rd_ser);
+ if (rd_selected != rd)
+ GNUNET_free (rd_selected);
+
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);
+ if ((copied_elements == rd_count) && (NULL != signature))
+ contains_signature = GNUNET_YES;
+ else
+ contains_signature = GNUNET_NO;
r_size = sizeof (struct LookupNameResponseMessage) +
sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
name_len +
- rd_ser_len +
- contains_signature * sizeof (struct GNUNET_CRYPTO_RsaSignature);
+ rd_ser_len;
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 (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 = &name_tmp[name_len];
- signature_tmp = (struct GNUNET_CRYPTO_RsaSignature *) &rd_tmp[rd_ser_len];
+ lnr_msg->expire = GNUNET_TIME_absolute_hton(expire);
if (zone_key != NULL)
- memcpy (zone_key_tmp, zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ lnr_msg->public_key = (*zone_key);
else
- {
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded dummy;
- memset (&dummy, '0', sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
- memcpy (zone_key_tmp, &dummy, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
- }
+ memset(&lnr_msg->public_key, '\0', sizeof (lnr_msg->public_key));
+ if (GNUNET_YES == contains_signature)
+ lnr_msg->signature = *signature;
+ else
+ memset (&lnr_msg->signature, '\0', sizeof (lnr_msg->signature));
+
+ name_tmp = (char *) &lnr_msg[1];
+ rd_tmp = &name_tmp[name_len];
+
memcpy (name_tmp, name, name_len);
memcpy (rd_tmp, rd_ser, rd_ser_len);
- if (GNUNET_YES == contains_signature)
- memcpy (signature_tmp, signature, sizeof (struct GNUNET_CRYPTO_RsaSignature));
GNUNET_SERVER_notification_context_unicast (snc, lnc->nc->client, (const struct GNUNET_MessageHeader *) lnr_msg, GNUNET_NO);
GNUNET_free (lnr_msg);
char * name;
uint32_t rid = 0;
uint32_t type = 0;
- int res;
if (ntohs (message->size) < sizeof (struct LookupNameMessage))
{
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);
+ GSN_database->iterate_records(GSN_database->cls, &ln_msg->zone, name, 0, &handle_lookup_name_it, &lnc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "NAMESTORE_RECORD_PUT");
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_TIME_Absolute expire;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key;
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;
char * rd_ser;
uint32_t rid = 0;
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 = ntohs (rp_msg->rd_count);
rd_ser_len = ntohs(rp_msg->rd_len);
return;
}
- msg_size_exp = sizeof (struct RecordPutMessage) + key_len + name_len + rd_ser_len;
+ msg_size_exp = sizeof (struct RecordPutMessage) + 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;
}
- zone_key = (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *) &rp_msg[1];
- name = &((char *)zone_key)[key_len];
+ name = (char *) &rp_msg[1];
if (name[name_len -1] != '\0')
{
goto send;
}
-
GNUNET_HashCode zone_hash;
- GNUNET_CRYPTO_hash (zone_key, key_len, &zone_hash);
+ GNUNET_CRYPTO_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));
/* Database operation */
res = GSN_database->put_records(GSN_database->cls,
- zone_key,
+ &rp_msg->public_key,
expire,
name,
rd_count, rd,
/* 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;
- rpr_msg.header.size = htons (sizeof (struct RecordPutResponseMessage));
- if (GNUNET_OK == res)
- rpr_msg.op_result = htons (GNUNET_OK);
- else
- rpr_msg.op_result = htons (GNUNET_NO);
+ rpr_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE);
+ rpr_msg.gns_header.header.size = htons (sizeof (struct RecordPutResponseMessage));
+ rpr_msg.gns_header.r_id = htonl (rid);
+ rpr_msg.op_result = htonl (res);
GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) &rpr_msg, GNUNET_NO);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
struct CreateRecordContext * crc = cls;
struct GNUNET_CRYPTO_RsaSignature *signature_new = NULL;
struct GNUNET_NAMESTORE_RecordData *rd_new = NULL;
+ struct GNUNET_TIME_Absolute block_expiration;
int res;
int exist = GNUNET_SYSERR;
int update = GNUNET_NO;
}
}
+ block_expiration = GNUNET_TIME_absolute_max(crc->expire, expire);
+ if (block_expiration.abs_value != expire.abs_value)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updated block expiration time\n");
+
+
/* 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,
+ block_expiration,
crc->name,
rd_count_new, rd_new,
signature_new);
GNUNET_break (GNUNET_OK == res);
+ if (res == GNUNET_OK)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully put record for `%s' in database \n", crc->name);
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to put record for `%s' in database \n", crc->name);
res = GNUNET_YES;
end:
}
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_CRYPTO_rsa_key_get_public(pkey, &pub);
GNUNET_CRYPTO_hash (&pub, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &pubkey_hash);
+ crc.expire = GNUNET_TIME_absolute_ntoh(rp_msg->expire);
+ crc.res = GNUNET_SYSERR;
crc.pkey = pkey;
crc.pubkey = &pub;
crc.rd = rd;
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));
+ rcr_msg.gns_header.r_id = htonl (rid);
if ((GNUNET_OK == res) && (crc.res == GNUNET_YES))
- rcr_msg.op_result = htons (GNUNET_YES);
+ rcr_msg.op_result = htonl (GNUNET_YES);
else if ((GNUNET_OK == res) && (crc.res == GNUNET_NO))
- rcr_msg.op_result = htons (GNUNET_NO);
+ rcr_msg.op_result = htonl (GNUNET_NO);
else
- rcr_msg.op_result = htons (GNUNET_SYSERR);
+ rcr_msg.op_result = htonl (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);
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);
+ key_len = ntohs (rr_msg->pkey_len);
msg_size = ntohs (message->size);
if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
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 (res);
+ rrr_msg.gns_header.r_id = htonl (rid);
+ rrr_msg.op_result = htonl (res);
GNUNET_SERVER_notification_context_unicast (snc, nc->client, (const struct GNUNET_MessageHeader *) &rrr_msg, GNUNET_NO);
GNUNET_CRYPTO_rsa_key_free (pkey);
ztnr_msg->rd_len = htons (rd_ser_len);
ztnr_msg->rd_count = htons (rd_count);
ztnr_msg->name_len = htons (name_len);
- ztnr_msg->contains_sig = htons (contains_sig);
ztnr_msg->expire = GNUNET_TIME_absolute_hton(expire);
if (zone_key != NULL)
ztnr_msg->zone_key = *zone_key;
struct ZoneToNameCtx ztn_ctx;
size_t msg_size = 0;
uint32_t rid = 0;
- int res;
-
if (ntohs (message->size) != sizeof (struct ZoneToNameMessage))
{
GNUNET_h2s (&ztn_msg->value_zone));
GNUNET_free (z_tmp);
- res = GSN_database->zone_to_name (GSN_database->cls, &ztn_msg->zone, &ztn_msg->value_zone, &handle_zone_to_name_it, &ztn_ctx);
+ 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);
}
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- 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;
-
- zipr->expire = expire;
-
- if (name != NULL)
- {
- memcpy (zipr->name, name, strlen(name) + 1);
- zipr->have_name = GNUNET_YES;
- }
- else
- zipr->have_name = GNUNET_NO;
+ struct GNUNET_NAMESTORE_ZoneIteration *zi = cls;
+ struct GNUNET_NAMESTORE_Client *nc = zi->client;
+ //size_t len;
- if (signature != NULL)
+ if ((zone_key == NULL) && (name == NULL))
{
- zipr->signature = *signature;
- zipr->have_signature = GNUNET_YES;
+ 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));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No more results for all zones\n");
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending empty `%s' message\n", "ZONE_ITERATION_RESPONSE");
+ zir_msg.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
+ zir_msg.gns_header.header.size = htons (sizeof (struct ZoneIterationResponseMessage));
+ zir_msg.gns_header.r_id = htonl(zi->request_id);
+ zir_msg.expire = GNUNET_TIME_absolute_hton(GNUNET_TIME_absolute_get_zero());
+ zir_msg.name_len = htons (0);
+ zir_msg.reserved = htons (0);
+ zir_msg.rd_count = htons (0);
+ 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_log (GNUNET_ERROR_TYPE_DEBUG, "Removing zone iterator\n");
+ GNUNET_CONTAINER_DLL_remove (nc->op_head, nc->op_tail, zi);
+ GNUNET_free (zi);
+ return;
}
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;
+ 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));
+ if (zi->has_zone == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending name `%s' for iteration over all zones\n",
+ 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;
+
+ 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);
+ 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];
+
+ 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->reserved = htons (0);
+ zir_msg->name_len = htons (name_len);
+ zir_msg->rd_count = htons (rd_count);
+ zir_msg->rd_len = htons (rd_ser_len);
+ zir_msg->signature = *signature;
+ zir_msg->public_key = *zone_key;
+ memcpy (name_tmp, 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_free (zir_msg);
}
}
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->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, &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_HashCode dummy;
+ GNUNET_HashCode *zone_tmp;
+ memset (&dummy, '\0', sizeof (dummy));
+ if (0 == memcmp (&dummy, &zis_msg->zone, sizeof (dummy)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to iterate over all zones\n");
+ zi->has_zone = GNUNET_NO;
+ zone_tmp = NULL;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting to iterate over zone `%s'\n", GNUNET_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);
-
- 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);
-
-
+ res = GSN_database->iterate_records (GSN_database->cls, zone_tmp , NULL, zi->offset , &zone_iteration_proc, zi);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
}
GNUNET_CONTAINER_DLL_remove(nc->op_head, nc->op_tail, zi);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration for zone `%s'\n", GNUNET_h2s (&zi->zone));
+ if (GNUNET_YES == zi->has_zone)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration for zone `%s'\n", GNUNET_h2s (&zi->zone));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopped zone iteration all zones\n");
GNUNET_free (zi);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
struct GNUNET_NAMESTORE_Client *nc;
struct GNUNET_NAMESTORE_ZoneIteration *zi;
+ GNUNET_HashCode *zone_tmp;
struct ZoneIterationStopMessage * zis_msg = (struct ZoneIterationStopMessage *) message;
uint32_t rid;
- int res;
nc = client_lookup(client);
if (nc == NULL)
return;
}
+ if (GNUNET_YES == zi->has_zone)
+ zone_tmp = &zi->zone;
+ else
+ zone_tmp = NULL;
+
zi->offset++;
- res = GSN_database->iterate_records (GSN_database->cls, &zi->zone, NULL, zi->offset , &zone_iteration_proc, zi);
+ GSN_database->iterate_records (GSN_database->cls, zone_tmp, NULL, zi->offset , &zone_iteration_proc, zi);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
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,
GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME, 0},
{&handle_iteration_start, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START, sizeof (struct ZoneIterationStartMessage)},
- {&handle_iteration_stop, NULL,
- GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP, sizeof (struct ZoneIterationStopMessage)},
{&handle_iteration_next, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT, 0},
+ {&handle_iteration_stop, NULL,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP, 0},
{NULL, NULL, 0, 0}
};
projects / oweals / gnunet.git / blobdiff