diff options
Diffstat (limited to 'src/namestore/gnunet-service-namestore.c')
-rw-r--r-- | src/namestore/gnunet-service-namestore.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index 6ad7354ad..cdd52cc42 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -11,7 +11,7 @@ | |||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
@@ -624,7 +624,6 @@ send_lookup_response (struct NamestoreClient *nc, | |||
624 | char *rd_ser; | 624 | char *rd_ser; |
625 | 625 | ||
626 | nick = get_nick_record (zone_key); | 626 | nick = get_nick_record (zone_key); |
627 | |||
628 | GNUNET_assert (-1 != | 627 | GNUNET_assert (-1 != |
629 | GNUNET_GNSRECORD_records_get_size (rd_count, | 628 | GNUNET_GNSRECORD_records_get_size (rd_count, |
630 | rd)); | 629 | rd)); |
@@ -925,7 +924,7 @@ continue_store_activity (struct StoreActivity *sa) | |||
925 | sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) ) | 924 | sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) ) |
926 | { | 925 | { |
927 | sa->zm_pos = zm->next; /* not interesting to this monitor */ | 926 | sa->zm_pos = zm->next; /* not interesting to this monitor */ |
928 | continue; // -- fails tests, but why not here? | 927 | continue; |
929 | } | 928 | } |
930 | if (zm->limit == zm->iteration_cnt) | 929 | if (zm->limit == zm->iteration_cnt) |
931 | { | 930 | { |
@@ -1733,7 +1732,7 @@ run_zone_iteration_round (struct ZoneIteration *zi, | |||
1733 | { | 1732 | { |
1734 | struct ZoneIterationProcResult proc; | 1733 | struct ZoneIterationProcResult proc; |
1735 | struct GNUNET_MQ_Envelope *env; | 1734 | struct GNUNET_MQ_Envelope *env; |
1736 | struct RecordResultMessage *rrm; | 1735 | struct GNUNET_NAMESTORE_Header *em; |
1737 | struct GNUNET_TIME_Absolute start; | 1736 | struct GNUNET_TIME_Absolute start; |
1738 | struct GNUNET_TIME_Relative duration; | 1737 | struct GNUNET_TIME_Relative duration; |
1739 | 1738 | ||
@@ -1771,16 +1770,16 @@ run_zone_iteration_round (struct ZoneIteration *zi, | |||
1771 | "Returned %llu results, more results available\n", | 1770 | "Returned %llu results, more results available\n", |
1772 | (unsigned long long) limit); | 1771 | (unsigned long long) limit); |
1773 | return; /* more results later after we get the | 1772 | return; /* more results later after we get the |
1774 | #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT message */ | 1773 | #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT message */ |
1775 | } | 1774 | } |
1776 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1775 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1777 | "Completed iteration after %llu/%llu results\n", | 1776 | "Completed iteration after %llu/%llu results\n", |
1778 | (unsigned long long) (limit - proc.limit), | 1777 | (unsigned long long) (limit - proc.limit), |
1779 | (unsigned long long) limit); | 1778 | (unsigned long long) limit); |
1780 | /* send empty response to indicate end of list */ | 1779 | /* send empty response to indicate end of list */ |
1781 | env = GNUNET_MQ_msg (rrm, | 1780 | env = GNUNET_MQ_msg (em, |
1782 | GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT); | 1781 | GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT_END); |
1783 | rrm->gns_header.r_id = htonl (zi->request_id); | 1782 | em->r_id = htonl (zi->request_id); |
1784 | GNUNET_MQ_send (zi->nc->mq, | 1783 | GNUNET_MQ_send (zi->nc->mq, |
1785 | env); | 1784 | env); |
1786 | GNUNET_CONTAINER_DLL_remove (zi->nc->op_head, | 1785 | GNUNET_CONTAINER_DLL_remove (zi->nc->op_head, |