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
static int get_self;
-static struct GNUNET_SCHEDULER_Handle *sched;
-
static struct GNUNET_PEERINFO_Handle *peerinfo;
static const struct GNUNET_CONFIGURATION_Handle *cfg;
char **address_list;
unsigned int num_addresses;
uint32_t off;
- uint32_t trust;
};
unsigned int i;
GNUNET_CRYPTO_hash_to_enc (&pc->peer.hashPubKey, &enc);
- printf (_("Peer `%s' with trust %8u\n"),
- (const char *) &enc,
- pc->trust);
+ printf (_("Peer `%s'\n"),
+ (const char *) &enc);
for (i=0;i<pc->num_addresses;i++)
{
printf ("\t%s\n",
count_address (void *cls,
const char *tname,
struct GNUNET_TIME_Absolute expiration,
- const void *addr, size_t addrlen)
+ const void *addr, uint16_t addrlen)
{
struct PrintContext *pc = cls;
pc->off++;
print_address (void *cls,
const char *tname,
struct GNUNET_TIME_Absolute expiration,
- const void *addr, size_t addrlen)
+ const void *addr, uint16_t addrlen)
{
struct PrintContext *pc = cls;
- GNUNET_TRANSPORT_address_lookup (sched,
- cfg,
+ GNUNET_TRANSPORT_address_lookup (cfg,
addr,
addrlen,
no_resolve,
/**
* Print information about the peer.
- * Currently prints the GNUNET_PeerIdentity, trust and the IP.
+ * Currently prints the GNUNET_PeerIdentity and the IP.
* Could of course do more (e.g. resolve via DNS).
*/
static void
print_peer_info (void *cls,
const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Message *hello, uint32_t trust)
+ const struct GNUNET_HELLO_Message *hello)
{
struct GNUNET_CRYPTO_HashAsciiEncoded enc;
struct PrintContext *pc;
if (peer == NULL)
{
GNUNET_PEERINFO_disconnect (peerinfo);
- switch (trust)
- {
- case 0:
- break;
- case 1:
- fprintf (stderr,
- _("Timeout trying to interact with PEERINFO service\n"));
- break;
- case 2:
- fprintf (stderr,
- _("Error in communication with PEERINFO service\n"));
- break;
- default:
- GNUNET_break (0);
- break;
- }
+ fprintf (stderr,
+ _("Error in communication with PEERINFO service\n"));
return;
}
if (be_quiet)
}
pc = GNUNET_malloc (sizeof (struct PrintContext));
pc->peer = *peer;
- pc->trust = trust;
GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &count_address, pc);
if (0 == pc->off)
{
* Main function that will be run by the scheduler.
*
* @param cls closure
- * @param s the scheduler to use
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
* @param c configuration
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
struct GNUNET_PeerIdentity pid;
struct GNUNET_CRYPTO_HashAsciiEncoded enc;
char *fn;
- int delta;
- sched = s;
cfg = c;
- delta = 0;
- if ( (args[0] != NULL) &&
- (args[1] != NULL) &&
- (1 == sscanf(args[0], "%d", &delta)) &&
- (GNUNET_OK ==
- GNUNET_CRYPTO_hash_from_string (args[1],
- &pid.hashPubKey)) )
- {
- peerinfo = GNUNET_PEERINFO_connect (sched, cfg);
- GNUNET_PEERINFO_iterate (peerinfo,
- &pid,
- delta,
- GNUNET_TIME_UNIT_SECONDS,
- &print_peer_info, NULL);
- return;
- }
- else if (args[0] != NULL)
+ if (args[0] != NULL)
{
fprintf (stderr,
_("Invalid command line argument `%s'\n"),
}
if (get_self != GNUNET_YES)
{
- peerinfo = GNUNET_PEERINFO_connect (sched, cfg);
+ peerinfo = GNUNET_PEERINFO_connect (cfg);
if (peerinfo == NULL)
{
fprintf (stderr,
}
(void) GNUNET_PEERINFO_iterate (peerinfo,
NULL,
- 0,
GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 2),
&print_peer_info, NULL);
}
-/**
- * gnunet-peerinfo command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'n', "numeric", NULL,
- gettext_noop ("don't resolve host names"),
- 0, &GNUNET_GETOPT_set_one, &no_resolve},
- {'q', "quiet", NULL,
- gettext_noop ("output only the identity strings"),
- 0, &GNUNET_GETOPT_set_one, &be_quiet},
- {'s', "self", NULL,
- gettext_noop ("output our own identity only"),
- 0, &GNUNET_GETOPT_set_one, &get_self},
- GNUNET_GETOPT_OPTION_END
-};
-
/**
* The main function to obtain peer information.
*
int
main (int argc, char *const *argv)
{
+ static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ {'n', "numeric", NULL,
+ gettext_noop ("don't resolve host names"),
+ 0, &GNUNET_GETOPT_set_one, &no_resolve},
+ {'q', "quiet", NULL,
+ gettext_noop ("output only the identity strings"),
+ 0, &GNUNET_GETOPT_set_one, &be_quiet},
+ {'s', "self", NULL,
+ gettext_noop ("output our own identity only"),
+ 0, &GNUNET_GETOPT_set_one, &get_self},
+ GNUNET_GETOPT_OPTION_END
+ };
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc,
argv,