GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
/**
* How long until wait until testcases fails
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
#define CHECK_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
static int timeout;
static char * current_adv_uri;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
static struct GNUNET_SCHEDULER_Handle *sched;
static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
static struct GNUNET_STATISTICS_GetHandle * urisrecv_stat;
static struct GNUNET_STATISTICS_GetHandle * advsent_stat;
-
-static void
-waitpid_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct PeerContext *p = cls;
-
-#if START_ARM
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Killing ARM process.\n");
- if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK)
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ARM process %u stopped\n", p->arm_pid);
-#endif
- GNUNET_CONFIGURATION_destroy (p->cfg);
-}
-
-
static void shutdown_testcase()
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown testcase....\n");
timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Check Task.\n");
- if (check_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (sched, check_task);
- check_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Task.\n");
-
+/*
if ((NULL != learn_peer.stats) && (NULL != download_stats))
GNUNET_STATISTICS_get_cancel (download_stats);
if ((NULL != learn_peer.stats) && (NULL != urisrecv_stat))
GNUNET_STATISTICS_get_cancel (urisrecv_stat);
if ((NULL != adv_peer.stats) && (NULL != advsent_stat))
GNUNET_STATISTICS_get_cancel (advsent_stat);
+*/
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Check Task.\n");
+ if ((check_task != GNUNET_SCHEDULER_NO_TASK) && (sched !=NULL))
+ {
+ GNUNET_SCHEDULER_cancel (sched, check_task);
+ check_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Freeing uri\n");
if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from Transport.\n");
if (adv_peer.th != NULL)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Hostlist server ARM process %u stopped\n", adv_peer.arm_pid);
#endif
- /*
- if (NULL != adv_peer.cfg)
- GNUNET_CONFIGURATION_destroy (adv_peer.cfg);*/
#if START_ARM
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Hostlist client ARM process %u stopped\n", learn_peer.arm_pid);
#endif
- /*
- if (NULL != learn_peer.cfg)
- GNUNET_CONFIGURATION_destroy (learn_peer.cfg);*/
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down scheduler\n");
GNUNET_SCHEDULER_shutdown (sched);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
+
}
/**
int is_persistent)
{
download_stats = NULL;
- if ( ((struct PeerContext *) cls == &learn_peer) && (value == 2) && (learned_hostlist_downloaded == GNUNET_NO) )
+ if ( (value == 2) && (learned_hostlist_downloaded == GNUNET_NO) )
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Peer has successfully downloaded advertised URI \n"));
learned_hostlist_downloaded = GNUNET_YES;
- }
- if (GNUNET_NO != learned_hostlist_downloaded)
shutdown_testcase();
+ }
return GNUNET_OK;
}
GNUNET_asprintf (&stat,
gettext_noop("# advertised URI `%s' downloaded"),
current_adv_uri);
-
-
if ( NULL != learn_peer.stats)
{
download_stats = GNUNET_STATISTICS_get (learn_peer.stats,
NULL,
&process_downloads,
&learn_peer);
- GNUNET_free (stat);
+
urisrecv_stat = GNUNET_STATISTICS_get (learn_peer.stats,
"hostlist",
gettext_noop("# advertised hostlist URIs"),
&process_uris_recv,
&learn_peer);
}
+ GNUNET_free (stat);
if ( NULL != adv_peer.stats)
{
advsent_stat = GNUNET_STATISTICS_get (adv_peer.stats,
uint32_t distance)
{
char *hostname;
- char *expected_uri = GNUNET_malloc (MAX_URL_LEN);
-
+ char *expected_uri;
unsigned long long port;
- size_t size;
const struct GNUNET_MessageHeader * incoming;
if (-1 == GNUNET_CONFIGURATION_get_value_number (adv_peer.cfg,
"HTTPPORT",
&port))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Could not read advertising server's configuration\n" );
- if ( NULL != expected_uri ) GNUNET_free ( expected_uri );
- return GNUNET_SYSERR;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not read advertising server's configuration\n" );
+ return GNUNET_SYSERR;
}
if ( GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (adv_peer.cfg,
&hostname))
hostname = GNUNET_RESOLVER_local_fqdn_get ();
- if (NULL != hostname)
- {
- size = strlen (hostname);
- if (size + 15 > MAX_URL_LEN)
- {
- GNUNET_break (0);
- }
- else
- {
- GNUNET_asprintf (&expected_uri,
- "http://%s:%u/",
- hostname,
- (unsigned int) port);
- }
- }
-
+ GNUNET_asprintf (&expected_uri,
+ "http://%s:%u/",
+ hostname != NULL ? hostname : "localhost",
+ (unsigned int) port);
incoming = (const struct GNUNET_MessageHeader *) message;
current_adv_uri = strdup ((char*) &incoming[1]);
if ( 0 == strcmp( expected_uri, current_adv_uri ) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Recieved hostlist advertisement with URI `%s' as expected\n", current_adv_uri);
- adv_arrived = GNUNET_YES;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Recieved hostlist advertisement with URI `%s' as expected\n", current_adv_uri);
+ adv_arrived = GNUNET_YES;
+ adv_sent = GNUNET_YES;
+ }
else
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expected URI `%s' and recieved URI `%s' differ\n", expected_uri, current_adv_uri);
- GNUNET_free_non_null (expected_uri);
+ GNUNET_free (expected_uri);
GNUNET_free_non_null (hostname);
return GNUNET_OK;
}
if ( NULL != filename) GNUNET_free ( filename );
p->core = GNUNET_CORE_connect (sched, p->cfg,
- GNUNET_TIME_UNIT_FOREVER_REL,
- NULL,
- NULL,
- NULL, NULL,
- NULL, GNUNET_NO,
- NULL, GNUNET_NO,
- learn_handlers );
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL,
+ NULL,
+ NULL, NULL, NULL,
+ NULL, GNUNET_NO,
+ NULL, GNUNET_NO,
+ learn_handlers );
GNUNET_assert ( NULL != p->core );
p->stats = GNUNET_STATISTICS_create (sched, "hostlist", p->cfg);
GNUNET_assert ( NULL != p->stats );
struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
timeout = GNUNET_NO;
adv_sent =GNUNET_NO;
learned_hostlist_saved = GNUNET_NO;
learned_hostlist_downloaded = GNUNET_NO;
+ cfg = c;
sched = s;
- check_task = GNUNET_SCHEDULER_add_delayed (sched,
- CHECK_INTERVALL,
- &check_statistics,
- NULL);
-
setup_adv_peer (&adv_peer, "test_learning_adv_peer.conf");
setup_learn_peer (&learn_peer, "test_learning_learn_peer.conf");
timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
TIMEOUT,
&timeout_error,
NULL);
+
+ check_task = GNUNET_SCHEDULER_add_delayed (sched,
+ CHECK_INTERVALL,
+ &check_statistics,
+ NULL);
}
static int
failed = GNUNET_NO;
+ if (learned_hostlist_downloaded == GNUNET_YES)
+ return GNUNET_NO;
+
if (timeout == GNUNET_YES)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
projects / oweals / gnunet.git / blobdiff