diff options
-rw-r--r-- | src/namestore/test_namestore_api_remove.c | 72 |
1 files changed, 62 insertions, 10 deletions
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 9fd2e8d26..132b8d39e 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c | |||
@@ -19,7 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file namestore/test_namestore_api.c | 21 | * @file namestore/test_namestore_api.c |
22 | * @brief testcase for namestore_api.c to remove record | 22 | * @brief testcase for namestore_api.c to: remove record |
23 | */ | 23 | */ |
24 | #include "platform.h" | 24 | #include "platform.h" |
25 | #include "gnunet_common.h" | 25 | #include "gnunet_common.h" |
@@ -103,12 +103,32 @@ remove_cont (void *cls, int32_t success, const char *emsg) | |||
103 | { | 103 | { |
104 | const char *name = cls; | 104 | const char *name = cls; |
105 | 105 | ||
106 | if (GNUNET_YES != success) | ||
107 | { | ||
108 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
109 | _("Records could not be removed: `%s'\n"), emsg); | ||
110 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | ||
111 | GNUNET_SCHEDULER_cancel (endbadly_task); | ||
112 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | ||
113 | return; | ||
114 | } | ||
115 | |||
106 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 116 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
107 | "Records were removed, perform lookup\n"); | 117 | "Records were removed, perform lookup\n"); |
108 | 118 | ||
109 | removed = GNUNET_YES; | 119 | removed = GNUNET_YES; |
110 | nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash, | 120 | nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash, |
111 | &name_lookup_proc, (void *) name); | 121 | &name_lookup_proc, (void *) name); |
122 | if (NULL == nsqe) | ||
123 | { | ||
124 | GNUNET_break (0); | ||
125 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
126 | _("Namestore cannot perform lookup for removed record\n")); | ||
127 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | ||
128 | GNUNET_SCHEDULER_cancel (endbadly_task); | ||
129 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | ||
130 | return; | ||
131 | } | ||
112 | } | 132 | } |
113 | 133 | ||
114 | 134 | ||
@@ -138,11 +158,18 @@ rd_decrypt_cb (void *cls, | |||
138 | } | 158 | } |
139 | else | 159 | else |
140 | { | 160 | { |
141 | GNUNET_assert (0 == rd_count); | 161 | if ((0 != rd_count) /*|| (NULL != rd)*/) |
162 | { | ||
163 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
164 | _("Record was not removed \n")); | ||
165 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | ||
166 | GNUNET_SCHEDULER_cancel (endbadly_task); | ||
167 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | ||
168 | return; | ||
169 | } | ||
142 | 170 | ||
143 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 171 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
144 | "Record was removed \n"); | 172 | _("Record was removed \n")); |
145 | |||
146 | GNUNET_SCHEDULER_add_now (&end, NULL); | 173 | GNUNET_SCHEDULER_add_now (&end, NULL); |
147 | } | 174 | } |
148 | } | 175 | } |
@@ -165,17 +192,17 @@ name_lookup_proc (void *cls, | |||
165 | if (NULL == block) | 192 | if (NULL == block) |
166 | { | 193 | { |
167 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 194 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
168 | "Namestore returned no block\n"); | 195 | _("Namestore returned no block\n")); |
169 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 196 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) |
170 | GNUNET_SCHEDULER_cancel (endbadly_task); | 197 | GNUNET_SCHEDULER_cancel (endbadly_task); |
171 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 198 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
199 | return; | ||
172 | } | 200 | } |
173 | 201 | ||
174 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 202 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
175 | "Namestore returned block, decrypting \n"); | 203 | "Namestore returned block, decrypting \n"); |
176 | 204 | GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block, | |
177 | GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block, | 205 | &pubkey, name, &rd_decrypt_cb, (void *) name)); |
178 | &pubkey, name, &rd_decrypt_cb, (void *) name)); | ||
179 | } | 206 | } |
180 | 207 | ||
181 | static void | 208 | static void |
@@ -184,8 +211,18 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
184 | const char *name = cls; | 211 | const char *name = cls; |
185 | 212 | ||
186 | GNUNET_assert (NULL != cls); | 213 | GNUNET_assert (NULL != cls); |
214 | if (GNUNET_SYSERR == success) | ||
215 | { | ||
216 | GNUNET_break (0); | ||
217 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
218 | _("Namestore could not store record: `%s'\n"), emsg); | ||
219 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | ||
220 | GNUNET_SCHEDULER_cancel (endbadly_task); | ||
221 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | ||
222 | return; | ||
223 | } | ||
187 | 224 | ||
188 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
189 | "Name store added record for `%s': %s\n", | 226 | "Name store added record for `%s': %s\n", |
190 | name, | 227 | name, |
191 | (success == GNUNET_OK) ? "SUCCESS" : "FAIL"); | 228 | (success == GNUNET_OK) ? "SUCCESS" : "FAIL"); |
@@ -195,6 +232,16 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
195 | 232 | ||
196 | nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash, | 233 | nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash, |
197 | &name_lookup_proc, (void *) name); | 234 | &name_lookup_proc, (void *) name); |
235 | if (NULL == nsqe) | ||
236 | { | ||
237 | GNUNET_break (0); | ||
238 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
239 | _("Namestore cannot perform lookup\n")); | ||
240 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | ||
241 | GNUNET_SCHEDULER_cancel (endbadly_task); | ||
242 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | ||
243 | return; | ||
244 | } | ||
198 | } | 245 | } |
199 | 246 | ||
200 | 247 | ||
@@ -231,6 +278,11 @@ run (void *cls, | |||
231 | GNUNET_break (NULL != nsh); | 278 | GNUNET_break (NULL != nsh); |
232 | nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name, | 279 | nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name, |
233 | 1, &rd, &put_cont, (void *) name); | 280 | 1, &rd, &put_cont, (void *) name); |
281 | if (NULL == nsqe) | ||
282 | { | ||
283 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
284 | _("Namestore cannot store no block\n")); | ||
285 | } | ||
234 | GNUNET_free ((void *)rd.data); | 286 | GNUNET_free ((void *)rd.data); |
235 | } | 287 | } |
236 | 288 | ||