/*
This file is part of GNUnet.
- (C) 2001-2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2001-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file peerinfo-tool/gnunet-peerinfo.c
* @brief Print information about other known peers.
* @author Christian Grothoff
+ * @author Matthias Wachs
*/
#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_peerinfo_service.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_hello_lib.h"
#include "gnunet_transport_service.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_transport_plugin.h"
+#include "gnunet_peerinfo_service.h"
#include "gnunet-peerinfo_plugins.h"
-/**
- * Prefix that every HELLO URI must start with.
- */
-#define HELLO_URI_PREFIX "gnunet://hello/"
-
/**
* How long until we time out during peerinfo iterations?
*/
*/
struct GNUNET_TRANSPORT_AddressToStringContext *atsc;
+ /**
+ * Address expiration time
+ */
+ struct GNUNET_TIME_Absolute expiration;
+
/**
* Printable address.
*/
char *result;
-
+
/**
* Print context this address record belongs to.
*/
* Identity of the peer.
*/
struct GNUNET_PeerIdentity peer;
-
+
/**
* List of printable addresses.
*/
struct AddressRecord *address_list;
/**
- * Number of completed addresses in 'address_list'.
+ * Number of completed addresses in @e address_list.
*/
unsigned int num_addresses;
/**
- * Number of addresses allocated in 'address_list'.
+ * Number of addresses allocated in @e address_list.
*/
unsigned int address_list_size;
/**
- * Current offset in 'address_list' (counted down).
+ * Current offset in @e address_list (counted down).
*/
unsigned int off;
-};
-
-
-/**
- * Context used for building our own URI.
- */
-struct GetUriContext
-{
/**
- * Final URI.
+ * Hello was friend only, #GNUNET_YES or #GNUNET_NO
*/
- char *uri;
-
-};
-
-
-/**
- * Context for 'add_address_to_hello'.
- */
-struct GNUNET_PEERINFO_HelloAddressParsingContext
-{
- /**
- * Position in the URI with the next address to parse.
- */
- const char *pos;
-
- /**
- * Set to GNUNET_SYSERR to indicate parse errors.
- */
- int ret;
+ int friend_only;
};
*/
static int be_quiet;
+/**
+ * Option '-f'
+ */
+static int include_friend_only;
+
/**
* Option '-s'
*/
static int get_self;
/**
- * Option
+ * Option
*/
static int get_uri;
+/**
+ * Option
+ */
+static int default_operation;
+
/**
* Option '-i'
*/
static int get_info;
/**
- * Option
+ * Option
*/
static char *put_uri;
+/**
+ * Option -d
+ */
+static char *dump_hello;
+
/**
* Handle to peerinfo service.
*/
/**
* Main state machine task (if active).
*/
-static GNUNET_SCHEDULER_TaskIdentifier tt;
+static struct GNUNET_SCHEDULER_Task * tt;
+
+/**
+ * Pending #GNUNET_TRANSPORT_get_hello() operation.
+ */
+static struct GNUNET_TRANSPORT_GetHelloHandle *gh;
+
+/**
+ * Connection to transport service.
+ */
+static struct GNUNET_TRANSPORT_Handle *transport;
/**
* Current iterator context (if active, otherwise NULL).
*/
static struct GNUNET_PeerIdentity my_peer_identity;
-/**
- * My public key.
- */
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded my_public_key;
-
/**
* Head of list of print contexts.
*/
static struct PrintContext *pc_tail;
/**
- * Handle to current 'GNUNET_PEERINFO_add_peer' operation.
+ * Handle to current #GNUNET_PEERINFO_add_peer() operation.
*/
static struct GNUNET_PEERINFO_AddContext *ac;
+/**
+ * Hello of this peer (if initialized).
+ */
+static struct GNUNET_HELLO_Message *my_hello;
+
/**
* Main state machine that goes over all options and
const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-/**
- * Replace all characters in the input 'in' according
- * to the mapping. The mapping says to map each character
- * in 'oldchars' to the corresponding character (by offset)
- * in 'newchars'.
- *
- * @param in input string to remap
- * @param oldchars characters to replace
- * @param newchars replacement characters, must have same length as 'oldchars'
- * @return copy of string with replacement applied.
- */
-static char *
-map_characters (const char *in,
- const char *oldchars,
- const char *newchars)
-{
- char *ret;
- const char *off;
- size_t i;
-
- GNUNET_assert (strlen (oldchars) == strlen (newchars));
- ret = GNUNET_strdup (in);
- i = 0;
- while (ret[i] != '\0')
- {
- off = strchr (oldchars, ret[i]);
- if (NULL != off)
- ret[i] = newchars[off - oldchars];
- i++;
- }
- return ret;
-}
-
-
-
/* ********************* 'get_info' ******************* */
/**
- * Print the collected address information to the console and free 'pc'.
+ * Print the collected address information to the console and free @a pc.
*
* @param pc printing context
*/
static void
dump_pc (struct PrintContext *pc)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded enc;
unsigned int i;
- GNUNET_CRYPTO_hash_to_enc (&pc->peer.hashPubKey, &enc);
- printf (_("Peer `%s'\n"),
- (const char *) &enc);
+ printf (_("%sPeer `%s'\n"),
+ (GNUNET_YES == pc->friend_only) ? "F2F: " : "",
+ GNUNET_i2s_full (&pc->peer));
for (i = 0; i < pc->num_addresses; i++)
{
if (NULL != pc->address_list[i].result)
{
- printf ("\t%s\n", pc->address_list[i].result);
+ printf (_("\tExpires: %s \t %s\n"),
+ GNUNET_STRINGS_absolute_time_to_string (pc->address_list[i].expiration),
+ pc->address_list[i].result);
GNUNET_free (pc->address_list[i].result);
}
}
GNUNET_free (pc);
if ( (NULL == pc_head) &&
(NULL == pic) )
- tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
+ tt = GNUNET_SCHEDULER_add_now (&state_machine,
+ NULL);
}
*
* @param cls closure
* @param address NULL on error, otherwise 0-terminated printable UTF-8 string
+ * @param res result of the address to string conversion:
+ * if #GNUNET_OK: address was valid (conversion to
+ * string might still have failed)
+ * if #GNUNET_SYSERR: address is invalid
*/
static void
-process_resolved_address (void *cls, const char *address)
+process_resolved_address (void *cls,
+ const char *address,
+ int res)
{
- struct AddressRecord * ar = cls;
+ struct AddressRecord *ar = cls;
struct PrintContext *pc = ar->pc;
if (NULL != address)
{
- if (NULL == ar->result)
+ if (0 != strlen (address))
+ {
+ if (NULL != ar->result)
+ GNUNET_free (ar->result);
ar->result = GNUNET_strdup (address);
+ }
return;
}
ar->atsc = NULL;
+ if (GNUNET_SYSERR == res)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Failure: Cannot convert address to string for peer `%s'\n"),
+ GNUNET_i2s (&ar->pc->peer));
pc->num_addresses++;
if (pc->num_addresses == pc->address_list_size)
dump_pc (pc);
/**
* Iterator callback to go over all addresses and count them.
*
- * @param cls 'struct PrintContext' with 'off' to increment
+ * @param cls `struct PrintContext *` with `off` to increment
* @param address the address
* @param expiration expiration time
- * @return GNUNET_OK to keep the address and continue
+ * @return #GNUNET_OK to keep the address and continue
*/
static int
-count_address (void *cls, const struct GNUNET_HELLO_Address *address,
+count_address (void *cls,
+ const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute expiration)
{
struct PrintContext *pc = cls;
* @param cls closure
* @param address the address
* @param expiration expiration time
- * @return GNUNET_OK to keep the address and continue
+ * @return #GNUNET_OK to keep the address and continue
*/
static int
-print_address (void *cls, const struct GNUNET_HELLO_Address *address,
+print_address (void *cls,
+ const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute expiration)
{
struct PrintContext *pc = cls;
GNUNET_assert (0 < pc->off);
ar = &pc->address_list[--pc->off];
ar->pc = pc;
- ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg, address, no_resolve,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 10),
+ ar->expiration = expiration;
+ GNUNET_asprintf (&ar->result,
+ "%s:%u:%u",
+ address->transport_name,
+ address->address_length,
+ address->local_info);
+ ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg,
+ address,
+ no_resolve,
+ TIMEOUT,
&process_resolved_address, ar);
return GNUNET_OK;
}
/**
- * Print information about the peer.
- * Currently prints the GNUNET_PeerIdentity and the transport address.
+ * Print information about the peer. Currently prints the `struct
+ * GNUNET_PeerIdentity` and the transport address.
*
- * @param cls the 'struct PrintContext'
- * @param peer identity of the peer
+ * @param cls the `struct PrintContext *`
+ * @param peer identity of the peer
* @param hello addresses of the peer
* @param err_msg error message
*/
static void
-print_peer_info (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Message *hello, const char *err_msg)
+print_peer_info (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Message *hello,
+ const char *err_msg)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded enc;
struct PrintContext *pc;
+ int friend_only;
if (NULL == peer)
{
pic = NULL; /* end of iteration */
if (NULL != err_msg)
{
- FPRINTF (stderr,
+ FPRINTF (stderr,
_("Error in communication with PEERINFO service: %s\n"),
err_msg);
}
tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
return;
}
- if ((GNUNET_YES == be_quiet) || (NULL == hello))
+ friend_only = GNUNET_NO;
+ if (NULL != hello)
+ friend_only = GNUNET_HELLO_is_friend_only (hello);
+ if ( (GNUNET_YES == be_quiet) ||
+ (NULL == hello) )
{
- GNUNET_CRYPTO_hash_to_enc (&peer->hashPubKey, &enc);
- printf ("%s\n", (const char *) &enc);
+ printf ("%s%s\n",
+ (GNUNET_YES == friend_only) ? "F2F: " : "",
+ GNUNET_i2s_full (peer));
return;
}
- pc = GNUNET_malloc (sizeof (struct PrintContext));
+ pc = GNUNET_new (struct PrintContext);
GNUNET_CONTAINER_DLL_insert (pc_head,
- pc_tail,
+ pc_tail,
pc);
pc->peer = *peer;
- GNUNET_HELLO_iterate_addresses (hello,
- GNUNET_NO,
- &count_address,
+ pc->friend_only = friend_only;
+ GNUNET_HELLO_iterate_addresses (hello,
+ GNUNET_NO,
+ &count_address,
pc);
if (0 == pc->off)
{
}
pc->address_list_size = pc->off;
pc->address_list = GNUNET_malloc (sizeof (struct AddressRecord) * pc->off);
- GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO,
- &print_address, pc);
+ GNUNET_HELLO_iterate_addresses (hello,
+ GNUNET_NO,
+ &print_address,
+ pc);
}
-
-/* ************************* GET URI ************************** */
-
+/* ************************* DUMP Hello ************************** */
/**
- * Function that is called on each address of this peer.
- * Expands the corresponding URI string.
+ * Count the number of addresses in the HELLO.
*
- * @param cls the 'GetUriContext'
- * @param address address to add
- * @param expiration expiration time for the address
- * @return GNUNET_OK (continue iteration).
+ * @param cls pointer to an `int *` used for the counter
+ * @param address an address to count
+ * @param expiration (unused)
+ * @return #GNUNET_OK
*/
static int
-compose_uri (void *cls, const struct GNUNET_HELLO_Address *address,
- struct GNUNET_TIME_Absolute expiration)
+count_addr (void *cls,
+ const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute expiration)
{
- struct GetUriContext *guc = cls;
- struct GNUNET_TRANSPORT_PluginFunctions *papi;
- const char *addr;
- char *uri_addr;
- char *ret;
- char tbuf[16];
- struct tm *t;
- time_t seconds;
-
- papi = GPI_plugins_find (address->transport_name);
- if (papi == NULL)
- {
- /* Not an error - we might just not have the right plugin. */
- return GNUNET_OK;
- }
- if (NULL == papi->address_to_string)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "URI conversion not implemented for plugin `%s'\n",
- address->transport_name);
- return GNUNET_OK;
- }
- addr = papi->address_to_string (papi->cls, address->address, address->address_length);
- if ( (addr == NULL) || (strlen(addr) == 0) )
- return GNUNET_OK;
- /* For URIs we use '(' and ')' instead of '[' and ']' as brackets are reserved
- characters in URIs */
- uri_addr = map_characters (addr, "[]", "()");
- seconds = expiration.abs_value / 1000;
- t = gmtime (&seconds);
- GNUNET_assert (0 != strftime (tbuf, sizeof (tbuf),
- "%Y%m%d%H%M%S",
- t));
- GNUNET_asprintf (&ret,
- "%s!%s!%s!%s",
- guc->uri,
- tbuf,
- address->transport_name,
- uri_addr);
- GNUNET_free (uri_addr);
- GNUNET_free (guc->uri);
- guc->uri = ret;
+ int *c = cls;
+
+ (*c) ++;
return GNUNET_OK;
}
+/**
+ * Write HELLO of my peer to a file.
+ *
+ * @param cls the `struct GetUriContext *`
+ * @param peer identity of the peer (unused)
+ * @param hello addresses of the peer
+ * @param err_msg error message
+ */
+static void
+dump_my_hello ()
+{
+ unsigned int size;
+ unsigned int c_addr;
+
+ size = GNUNET_HELLO_size (my_hello);
+ if (0 == size)
+ {
+ FPRINTF (stderr,
+ _("Failure: Received invalid %s\n"),
+ "HELLO");
+ return;
+ }
+ if (GNUNET_SYSERR ==
+ GNUNET_DISK_fn_write (dump_hello,
+ my_hello,
+ size,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE |
+ GNUNET_DISK_PERM_GROUP_READ |
+ GNUNET_DISK_PERM_OTHER_READ))
+ {
+ FPRINTF (stderr,
+ _("Failed to write HELLO with %u bytes to file `%s'\n"),
+ size,
+ dump_hello);
+ if (0 != UNLINK (dump_hello))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
+ GNUNET_ERROR_TYPE_BULK,
+ "unlink",
+ dump_hello);
+
+ }
+ c_addr = 0;
+ GNUNET_HELLO_iterate_addresses (my_hello,
+ GNUNET_NO,
+ count_addr,
+ &c_addr);
+
+ if (! be_quiet)
+ {
+ FPRINTF (stderr,
+ _("Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"),
+ (GNUNET_YES == GNUNET_HELLO_is_friend_only (my_hello)) ? "friend-only": "public",
+ c_addr,
+ size,
+ dump_hello);
+ }
+ GNUNET_free (dump_hello);
+ dump_hello = NULL;
+}
+
+
+/* ************************* GET URI ************************** */
+
+
/**
* Print URI of the peer.
*
- * @param cls the 'struct GetUriContext'
+ * @param cls the `struct GetUriContext *`
* @param peer identity of the peer (unused)
* @param hello addresses of the peer
* @param err_msg error message
*/
static void
-print_my_uri (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Message *hello,
+print_my_uri (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Message *hello,
const char *err_msg)
{
- struct GetUriContext *guc = cls;
+ char *uri;
- if (peer == NULL)
+ if (NULL == peer)
{
pic = NULL;
- if (err_msg != NULL)
+ if (NULL != err_msg)
FPRINTF (stderr,
- _("Error in communication with PEERINFO service: %s\n"),
+ _("Error in communication with PEERINFO service: %s\n"),
err_msg);
- GNUNET_free_non_null (guc->uri);
- GNUNET_free (guc);
tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
return;
- }
- if (NULL != hello)
- GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &compose_uri, guc);
- printf ("%s\n", (const char *) guc->uri);
+ }
+
+ if (NULL == hello)
+ return;
+ uri = GNUNET_HELLO_compose_uri (hello,
+ &GPI_plugins_find);
+ if (NULL != uri)
+ {
+ printf ("%s\n",
+ (const char *) uri);
+ GNUNET_free (uri);
+ }
}
/**
- * We're building a HELLO. Parse the next address from the
- * parsing context and append it.
- *
- * @param cls the 'struct GNUNET_PEERINFO_HelloAddressParsingContext'
- * @param max number of bytes available for HELLO construction
- * @param buffer where to copy the next address (in binary format)
- * @return number of bytes added to buffer
- */
-static size_t
-add_address_to_hello (void *cls, size_t max, void *buffer)
-{
- struct GNUNET_PEERINFO_HelloAddressParsingContext *ctx = cls;
- const char *tname;
- const char *address;
- char *uri_address;
- char *plugin_address;
- const char *end;
- char *plugin_name;
- struct tm expiration_time;
- time_t expiration_seconds;
- struct GNUNET_TIME_Absolute expire;
- struct GNUNET_TRANSPORT_PluginFunctions *papi;
- void *addr;
- size_t addr_len;
- struct GNUNET_HELLO_Address haddr;
- size_t ret;
-
- if (NULL == ctx->pos)
- return 0;
- if ('!' != ctx->pos[0])
- {
- ctx->ret = GNUNET_SYSERR;
- GNUNET_break (0);
- return 0;
- }
- ctx->pos++;
- memset (&expiration_time, 0, sizeof (expiration_time));
- tname = strptime (ctx->pos,
- "%Y%m%d%H%M%S",
- &expiration_time);
-
- if (NULL == tname)
- {
- ctx->ret = GNUNET_SYSERR;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to parse HELLO message: missing expiration time\n"));
- GNUNET_break (0);
- return 0;
- }
- expiration_seconds = mktime (&expiration_time);
- if (expiration_seconds == (time_t) -1)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to parse HELLO message: invalid expiration time\n"));
- ctx->ret = GNUNET_SYSERR;
- GNUNET_break (0);
- return 0;
- }
- expire.abs_value = expiration_seconds * 1000;
- if ('!' != tname[0])
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to parse HELLO message: malformed\n"));
- ctx->ret = GNUNET_SYSERR;
- GNUNET_break (0);
- return 0;
- }
- tname++;
- address = strchr (tname, (int) '!');
- if (NULL == address)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to parse HELLO message: missing transport plugin\n"));
- ctx->ret = GNUNET_SYSERR;
- GNUNET_break (0);
- return 0;
- }
- address++;
- end = strchr (address, (int) '!');
- ctx->pos = end;
- plugin_name = GNUNET_strndup (tname, address - (tname+1));
- papi = GPI_plugins_find (plugin_name);
- if (NULL == papi)
- {
- /* Not an error - we might just not have the right plugin.
- * Skip this part, advance to the next one and recurse.
- * But only if this is not the end of string.
- */
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin `%s' not found\n"),
- plugin_name);
- GNUNET_free (plugin_name);
- GNUNET_break (0);
- return 0;
- }
- if (NULL == papi->string_to_address)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin `%s' does not support URIs yet\n"),
- plugin_name);
- GNUNET_free (plugin_name);
- GNUNET_break (0);
- return 0;
- }
- uri_address = GNUNET_strndup (address, end - address);
- /* For URIs we use '(' and ')' instead of '[' and ']' as brackets are reserved
- characters in URIs; need to convert back to '[]' for the plugin */
- plugin_address = map_characters (uri_address, "()", "[]");
- GNUNET_free (uri_address);
- if (GNUNET_OK !=
- papi->string_to_address (papi->cls,
- plugin_address,
- strlen (plugin_address) + 1,
- &addr,
- &addr_len))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to parse `%s' as an address for plugin `%s'\n"),
- plugin_address,
- plugin_name);
- GNUNET_free (plugin_name);
- GNUNET_free (plugin_address);
- return 0;
- }
- GNUNET_free (plugin_address);
- /* address.peer is unset - not used by add_address() */
- haddr.address_length = addr_len;
- haddr.address = addr;
- haddr.transport_name = plugin_name;
- ret = GNUNET_HELLO_add_address (&haddr, expire, buffer, max);
- GNUNET_free (addr);
- GNUNET_free (plugin_name);
- return ret;
-}
-
-
-/**
- * Continuation called from 'GNUNET_PEERINFO_add_peer'
+ * Continuation called from #GNUNET_PEERINFO_add_peer()
*
* @param cls closure, NULL
* @param emsg error message, NULL on success
/**
- * Parse the PUT URI given at the command line and add it to our peerinfo
+ * Parse the PUT URI given at the command line and add it to our peerinfo
* database.
*
* @param put_uri URI string to parse
- * @return GNUNET_OK on success, GNUNET_SYSERR if the URI was invalid, GNUNET_NO on other errors
+ * @return #GNUNET_OK on success,
+ * #GNUNET_SYSERR if the URI was invalid,
+ * #GNUNET_NO on other errors
*/
static int
parse_hello_uri (const char *put_uri)
{
- const char *pks;
- const char *exc;
- struct GNUNET_HELLO_Message *hello;
- struct GNUNET_PEERINFO_HelloAddressParsingContext ctx;
-
- if (0 != strncmp (put_uri,
- HELLO_URI_PREFIX,
- strlen (HELLO_URI_PREFIX)))
- return GNUNET_SYSERR;
- pks = &put_uri[strlen (HELLO_URI_PREFIX)];
- exc = strstr (pks, "!");
-
- if (GNUNET_OK != GNUNET_STRINGS_string_to_data (pks,
- (NULL == exc) ? strlen (pks) : (exc - pks),
- (unsigned char *) &my_public_key,
- sizeof (my_public_key)))
- return GNUNET_SYSERR;
- ctx.pos = exc;
- ctx.ret = GNUNET_OK;
- hello = GNUNET_HELLO_create (&my_public_key, &add_address_to_hello, &ctx);
+ struct GNUNET_HELLO_Message *hello = NULL;
+
+ int ret = GNUNET_HELLO_parse_uri (put_uri,
+ &my_peer_identity.public_key,
+ &hello,
+ &GPI_plugins_find);
if (NULL != hello)
{
/* WARNING: this adds the address from URI WITHOUT verification! */
- if (GNUNET_OK == ctx.ret)
- ac = GNUNET_PEERINFO_add_peer (peerinfo, hello, &add_continuation, NULL);
+ if (GNUNET_OK == ret)
+ ac = GNUNET_PEERINFO_add_peer (peerinfo, hello,
+ &add_continuation,
+ NULL);
else
tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
GNUNET_free (hello);
}
-
- /* wait 1s to give peerinfo operation a chance to succeed */
- /* FIXME: current peerinfo API sucks to require this; not to mention
- that we get no feedback to determine if the operation actually succeeded */
- return ctx.ret;
+ return ret;
}
GNUNET_PEERINFO_add_peer_cancel (ac);
ac = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != tt)
+ if (NULL != tt)
{
GNUNET_SCHEDULER_cancel (tt);
- tt = GNUNET_SCHEDULER_NO_TASK;
+ tt = NULL;
}
if (NULL != pic)
{
GNUNET_PEERINFO_iterate_cancel (pic);
pic = NULL;
}
+ if (NULL != gh)
+ {
+ GNUNET_TRANSPORT_get_hello_cancel (gh);
+ gh = NULL;
+ }
+ if (NULL != transport)
+ {
+ GNUNET_TRANSPORT_disconnect (transport);
+ transport = NULL;
+ }
while (NULL != (pc = pc_head))
{
GNUNET_CONTAINER_DLL_remove (pc_head,
GNUNET_PEERINFO_disconnect (peerinfo);
peerinfo = NULL;
}
+ if (NULL != my_hello)
+ {
+ GNUNET_free (my_hello);
+ my_hello = NULL;
+ }
+}
+
+
+/**
+ * Function called with our peer's HELLO message.
+ * Used to obtain our peer's public key.
+ *
+ * @param cls NULL
+ * @param hello the HELLO message
+ */
+static void
+hello_callback (void *cls,
+ const struct GNUNET_MessageHeader *hello)
+{
+ if (NULL == hello)
+ {
+ fprintf (stderr,
+ _("Failed to get my own HELLO from this peer!\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ my_hello = (struct GNUNET_HELLO_Message *) GNUNET_copy_message (hello);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_HELLO_get_id (my_hello,
+ &my_peer_identity));
+ GNUNET_TRANSPORT_get_hello_cancel (gh);
+ gh = NULL;
+ GNUNET_TRANSPORT_disconnect (transport);
+ transport = NULL;
+ if (NULL != dump_hello)
+ dump_my_hello ();
+ tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
+}
+
+
+/**
+ * Function called with the result of the check if the PEERINFO
+ * service is running.
+ *
+ * @param cls closure with our configuration
+ * @param result #GNUNET_YES if PEERINFO is running
+ */
+static void
+testservice_task (void *cls,
+ int result)
+{
+ if (GNUNET_YES != result)
+ {
+ FPRINTF (stderr,
+ _("Service `%s' is not running, please start GNUnet\n"),
+ "peerinfo");
+ return;
+ }
+
+ if (NULL == (peerinfo = GNUNET_PEERINFO_connect (cfg)))
+ {
+ FPRINTF (stderr,
+ "%s",
+ _("Could not access PEERINFO service. Exiting.\n"));
+ return;
+ }
+ if ( (GNUNET_YES == get_self) ||
+ (GNUNET_YES == get_uri) ||
+ (NULL != dump_hello) )
+ {
+ transport = GNUNET_TRANSPORT_connect (cfg,
+ NULL,
+ NULL,
+ NULL, NULL, NULL);
+ gh = GNUNET_TRANSPORT_get_hello (transport,
+ &hello_callback,
+ NULL);
+ }
+ else
+ {
+ tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
+ }
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
}
* @param c configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_CRYPTO_RsaPrivateKey *priv;
- char *fn;
-
cfg = c;
- if (NULL != args[0])
+ if ( (NULL != args[0]) &&
+ (NULL == put_uri) &&
+ (args[0] == strcasestr (args[0], "gnunet://hello/")) )
{
- FPRINTF (stderr,
- _("Invalid command line argument `%s'\n"),
- args[0]);
- return;
+ put_uri = GNUNET_strdup (args[0]);
+ args++;
}
- if (NULL == (peerinfo = GNUNET_PEERINFO_connect (cfg)))
+ if (NULL != args[0])
{
- FPRINTF (stderr, "%s", _("Could not access PEERINFO service. Exiting.\n"));
+ FPRINTF (stderr,
+ _("Invalid command line argument `%s'\n"),
+ args[0]);
return;
}
- if ( (GNUNET_YES == get_self) || (GNUNET_YES == get_uri) )
- {
- /* load private key */
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "GNUNETD", "HOSTKEY",
- &fn))
- {
- FPRINTF (stderr, _("Could not find option `%s:%s' in configuration.\n"),
- "GNUNETD", "HOSTKEYFILE");
- return;
- }
- if (NULL == (priv = GNUNET_CRYPTO_rsa_key_create_from_file (fn)))
- {
- FPRINTF (stderr, _("Loading hostkey from `%s' failed.\n"), fn);
- GNUNET_free (fn);
- return;
- }
- GNUNET_free (fn);
- GNUNET_CRYPTO_rsa_key_get_public (priv, &my_public_key);
- GNUNET_CRYPTO_rsa_key_free (priv);
- GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key), &my_peer_identity.hashPubKey);
- }
- tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task,
- NULL);
+ GNUNET_CLIENT_service_test ("peerinfo",
+ cfg,
+ GNUNET_TIME_UNIT_SECONDS,
+ &testservice_task, (void *) cfg);
}
state_machine (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- tt = GNUNET_SCHEDULER_NO_TASK;
+ tt = NULL;
if (NULL != put_uri)
{
GPI_plugins_load (cfg);
if (GNUNET_SYSERR == parse_hello_uri (put_uri))
+ {
fprintf (stderr,
_("Invalid URI `%s'\n"),
- put_uri);
+ put_uri);
+ GNUNET_SCHEDULER_shutdown ();
+ }
GNUNET_free (put_uri);
put_uri = NULL;
- return;
}
- if (GNUNET_YES == get_info)
+ else if (GNUNET_YES == get_info)
{
get_info = GNUNET_NO;
GPI_plugins_load (cfg);
- pic = GNUNET_PEERINFO_iterate (peerinfo, NULL,
+ pic = GNUNET_PEERINFO_iterate (peerinfo,
+ include_friend_only,
+ NULL,
TIMEOUT,
&print_peer_info, NULL);
- return;
}
- if (GNUNET_YES == get_self)
+ else if (GNUNET_YES == get_self)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded enc;
-
get_self = GNUNET_NO;
- GNUNET_CRYPTO_hash_to_enc (&my_peer_identity.hashPubKey, &enc);
if (be_quiet)
- printf ("%s\n", (char *) &enc);
+ printf ("%s\n",
+ GNUNET_i2s_full (&my_peer_identity));
else
- printf (_("I am peer `%s'.\n"), (const char *) &enc);
+ printf (_("I am peer `%s'.\n"),
+ GNUNET_i2s_full (&my_peer_identity));
+ tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
}
- if (GNUNET_YES == get_uri)
+ else if (GNUNET_YES == get_uri)
{
- struct GetUriContext *guc;
- char *pkey;
-
- guc = GNUNET_malloc (sizeof (struct GetUriContext));
- pkey = GNUNET_CRYPTO_rsa_public_key_to_string (&my_public_key);
- GNUNET_asprintf (&guc->uri,
- "%s%s",
- HELLO_URI_PREFIX,
- pkey);
- GNUNET_free (pkey);
GPI_plugins_load (cfg);
- pic = GNUNET_PEERINFO_iterate (peerinfo, &my_peer_identity,
+ pic = GNUNET_PEERINFO_iterate (peerinfo,
+ include_friend_only,
+ &my_peer_identity,
TIMEOUT,
- &print_my_uri, guc);
+ &print_my_uri, NULL);
get_uri = GNUNET_NO;
- return;
}
- GNUNET_SCHEDULER_shutdown ();
+ else if (GNUNET_YES == default_operation)
+ {
+ /* default operation list all */
+ default_operation = GNUNET_NO;
+ get_info = GNUNET_YES;
+ tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
+ }
+ else
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ }
+ default_operation = GNUNET_NO;
}
{'q', "quiet", NULL,
gettext_noop ("output only the identity strings"),
0, &GNUNET_GETOPT_set_one, &be_quiet},
+ {'f', "friends", NULL,
+ gettext_noop ("include friend-only information"),
+ 0, &GNUNET_GETOPT_set_one, &include_friend_only},
{'s', "self", NULL,
gettext_noop ("output our own identity only"),
0, &GNUNET_GETOPT_set_one, &get_self},
{'i', "info", NULL,
gettext_noop ("list all known peers"),
0, &GNUNET_GETOPT_set_one, &get_info},
+ {'d', "dump-hello", NULL,
+ gettext_noop ("dump hello to file"),
+ 1, &GNUNET_GETOPT_set_string, &dump_hello},
{'g', "get-hello", NULL,
gettext_noop ("also output HELLO uri(s)"),
0, &GNUNET_GETOPT_set_one, &get_uri},
1, &GNUNET_GETOPT_set_string, &put_uri},
GNUNET_GETOPT_OPTION_END
};
+ int ret;
- if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ default_operation = GNUNET_YES;
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc,
+ argv,
+ &argc, &argv))
return 2;
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-peerinfo",
- gettext_noop ("Print information about peers."),
- options, &run, NULL)) ? 0 : 1;
+ ret = (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-peerinfo",
+ gettext_noop ("Print information about peers."),
+ options, &run, NULL)) ? 0 : 1;
+ GNUNET_free ((void*) argv);
+ return ret;
}
/* end of gnunet-peerinfo.c */
projects / oweals / gnunet.git / blobdiff