/*
This file is part of GNUnet.
- (C) 2004, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2004, 2009 GNUnet e.V.
- 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 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ 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/>.
*/
/**
* TODO:
* - test merging of HELLOs (add same peer twice...)
*/
-
#include "platform.h"
#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_peerinfo_service.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_testing_lib.h"
#include "peerinfo.h"
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
static struct GNUNET_PEERINFO_IteratorContext *ic;
static struct GNUNET_PEERINFO_Handle *h;
static unsigned int retries;
+static int global_ret;
+
+
static int
check_it (void *cls, const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute expiration)
}
-static size_t
+static ssize_t
address_generator (void *cls, size_t max, void *buf)
{
size_t *agc = cls;
- size_t ret;
+ ssize_t ret;
struct GNUNET_HELLO_Address address;
if (0 == *agc)
- return 0;
+ return GNUNET_SYSERR; /* Done */
memset (&address.peer, 0, sizeof (struct GNUNET_PeerIdentity));
address.address = "Address";
address.transport_name = "peerinfotest";
return ret;
}
+struct GNUNET_PeerIdentity pid;
static void
add_peer ()
{
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
- struct GNUNET_PeerIdentity pid;
struct GNUNET_HELLO_Message *h2;
size_t agc;
agc = 2;
- memset (&pkey, 32, sizeof (pkey));
- GNUNET_CRYPTO_hash (&pkey, sizeof (pkey), &pid.hashPubKey);
- h2 = GNUNET_HELLO_create (&pkey, &address_generator, &agc);
+ memset (&pid, 32, sizeof (pid));
+ h2 = GNUNET_HELLO_create (&pid.public_key, &address_generator, &agc, GNUNET_NO);
GNUNET_PEERINFO_add_peer (h, h2, NULL, NULL);
GNUNET_free (h2);
process (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Message *hello, const char *err_msg)
{
- int *ok = cls;
unsigned int agc;
if (err_msg != NULL)
if (peer == NULL)
{
ic = NULL;
- if ((3 == *ok) && (retries < 50))
+ if ((3 == global_ret) && (retries < 50))
{
/* try again */
retries++;
add_peer ();
- ic = GNUNET_PEERINFO_iterate (h, NULL,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 15), &process,
+ ic = GNUNET_PEERINFO_iterate (h, GNUNET_NO, NULL,
+ &process,
cls);
return;
}
GNUNET_assert (peer == NULL);
- GNUNET_assert (2 == *ok);
+ GNUNET_assert (2 == global_ret);
GNUNET_PEERINFO_disconnect (h);
h = NULL;
- *ok = 0;
+ global_ret = 0;
return;
}
if (hello != NULL)
{
- GNUNET_assert (3 == *ok);
+ GNUNET_assert (3 == global_ret);
agc = 3;
- GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_it, &agc);
+ GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO,
+ &check_it, &agc);
GNUNET_assert (agc == 0);
- *ok = 2;
+ global_ret = 2;
}
}
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
{
- cfg = c;
h = GNUNET_PEERINFO_connect (cfg);
- GNUNET_assert (h != NULL);
+ GNUNET_assert (NULL != h);
add_peer ();
- ic = GNUNET_PEERINFO_iterate (h, NULL,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 15), &process, cls);
-}
-
-
-static int
-check ()
-{
- int ok = 3;
- struct GNUNET_OS_Process *proc;
-
- char *const argv[] = { "test-peerinfo-api",
- "-c",
- "test_peerinfo_api_data.conf",
-#if DEBUG_PEERINFO
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- proc =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-peerinfo",
- "gnunet-service-peerinfo",
-#if DEBUG_PEERINFO
- "-L", "DEBUG",
-#endif
- "-c", "test_peerinfo_api_data.conf", NULL);
- GNUNET_assert (NULL != proc);
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-peerinfo-api", "nohelp", options, &run, &ok);
- if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- ok = 1;
- }
- GNUNET_OS_process_wait (proc);
- GNUNET_OS_process_close (proc);
- proc = NULL;
- return ok;
+ ic = GNUNET_PEERINFO_iterate (h, GNUNET_NO, &pid,
+ &process, cls);
}
int
main (int argc, char *argv[])
{
- int ret = 0;
-
- GNUNET_log_setup ("test_peerinfo_api",
-#if DEBUG_PEERINFO
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret = check ();
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-peerinfo");
- return ret;
+ global_ret = 3;
+ if (0 != GNUNET_TESTING_service_run ("test-gnunet-peerinfo",
+ "peerinfo",
+ "test_peerinfo_api_data.conf",
+ &run, NULL))
+ return 1;
+ return global_ret;
}
/* end of test_peerinfo_api.c */
projects / oweals / gnunet.git / blobdiff