WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file namestore/test_namestore_api_zone_iteration.c
static struct GNUNET_NAMESTORE_Handle * nsh;
-static struct GNUNET_SCHEDULER_Task * endbadly_task;
-
static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
* @param tc scheduler context
*/
static void
-endbadly (void *cls)
+end (void *cls)
{
if (NULL != zi)
{
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
}
- GNUNET_free_non_null(s_name_1);
- GNUNET_free_non_null(s_name_2);
- GNUNET_free_non_null(s_name_3);
+ GNUNET_free_non_null (s_name_1);
+ GNUNET_free_non_null (s_name_2);
+ GNUNET_free_non_null (s_name_3);
if (s_rd_1 != NULL)
{
}
if (privkey != NULL)
- GNUNET_free (privkey);
- privkey = NULL;
-
- if (privkey2 != NULL)
- GNUNET_free (privkey2);
- privkey2 = NULL;
- res = 1;
-}
-
-
-static void
-end (void *cls)
-{
- if (NULL != zi)
{
- GNUNET_NAMESTORE_zone_iteration_stop (zi);
- zi = NULL;
- }
- if (endbadly_task != NULL)
- {
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = NULL;
- }
-
- if (privkey != NULL)
GNUNET_free (privkey);
- privkey = NULL;
-
- if (privkey2 != NULL)
- GNUNET_free (privkey2);
- privkey2 = NULL;
-
- GNUNET_free (s_name_1);
- GNUNET_free (s_name_2);
- GNUNET_free (s_name_3);
- if (s_rd_1 != NULL)
- {
- GNUNET_free ((void *)s_rd_1->data);
- GNUNET_free (s_rd_1);
+ privkey = NULL;
}
- if (s_rd_2 != NULL)
- {
- GNUNET_free ((void *)s_rd_2->data);
- GNUNET_free (s_rd_2);
- }
- if (s_rd_3 != NULL)
+ if (privkey2 != NULL)
{
- GNUNET_free ((void *)s_rd_3->data);
- GNUNET_free (s_rd_3);
+ GNUNET_free (privkey2);
+ privkey2 = NULL;
}
- if (nsh != NULL)
- GNUNET_NAMESTORE_disconnect (nsh);
- nsh = NULL;
}
static int
check_zone_1 (const char *label, unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- int failed = GNUNET_NO;
- int c;
- for (c = 0; c< rd_count ; c++)
+ for (unsigned int c = 0; c< rd_count ; c++)
{
- if (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK)
- if (0 != strcmp (rd[c].data, ZONE_NICK_1))
- {
- GNUNET_break (0);
- return GNUNET_YES;
- }
+ if ( (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
+ (0 != strcmp (rd[c].data, ZONE_NICK_1)) )
+ {
+ GNUNET_break (0);
+ return GNUNET_YES;
+ }
}
- return failed;
+ return GNUNET_NO;
}
+
static int
check_zone_2 (const char *label,
- unsigned int rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- int failed = GNUNET_NO;
- int c;
-
- for (c = 0; c< rd_count ; c++)
+ for (unsigned int c = 0; c< rd_count ; c++)
{
- if (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK)
- if (0 != strcmp (rd[c].data, ZONE_NICK_2))
- {
- GNUNET_break (0);
- return GNUNET_YES;
- }
+ if ( (rd[c].record_type == GNUNET_GNSRECORD_TYPE_NICK) &&
+ (0 != strcmp (rd[c].data, ZONE_NICK_2)) )
+ {
+ GNUNET_break (0);
+ return GNUNET_YES;
+ }
}
-
- return failed;
+ return GNUNET_NO;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received last result, iteration done after receing %u results\n",
returned_records);
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ GNUNET_SCHEDULER_shutdown ();
}
{
GNUNET_break (0);
res = 1;
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ GNUNET_SCHEDULER_shutdown ();
}
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n",
emsg);
GNUNET_break (0);
- if (NULL != endbadly_task)
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n");
GNUNET_break (0);
- if (NULL != endbadly_task)
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Expected empty zone but received zone private key\n"));
GNUNET_break (0);
- if (endbadly_task != NULL)
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
if ((NULL != label) || (NULL != rd) || (0 != rd_count))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Expected no zone content but received data\n"));
GNUNET_break (0);
- if (endbadly_task != NULL)
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
GNUNET_assert (0);
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &endbadly,
- NULL);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
-
+ GNUNET_SCHEDULER_add_shutdown (&end,
+ NULL);
/* first, iterate over empty namestore */
zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
NULL,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to create zone iterator\n");
GNUNET_break (0);
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ GNUNET_SCHEDULER_shutdown ();
}
}
+#include "test_common.c"
+
+
int
main (int argc, char *argv[])
{
const char *plugin_name;
char *cfg_name;
- plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
- GNUNET_asprintf (&cfg_name,
- "test_namestore_api_%s.conf",
- plugin_name);
+ SETUP_CFG (plugin_name, cfg_name);
res = 1;
- GNUNET_DISK_purge_cfg_dir (cfg_name,
- "GNUNET_TEST_HOME");
if (0 !=
GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-nick",
cfg_name,
projects / oweals / gnunet.git / blobdiff