#include "gnunet_crypto_lib.h"
#include "gnunet_configuration_lib.h"
#include "gnunet_getopt_lib.h"
-#include "gnunet_peerinfo_service.h"
-#include "gnunet_transport_service.h"
#include "gnunet_program_lib.h"
-#include "gnunet_transport_plugin.h"
+#include "gnunet_hello_lib.h"
+#include "gnunet_transport_service.h"
+#include "gnunet_peerinfo_service.h"
#include "gnunet-peerinfo_plugins.h"
+/**
+ * How long until we time out during peerinfo iterations?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
/**
* Structure we use to collect printable address information.
*/
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.
*/
*/
unsigned int off;
-};
-
-
-/**
- * Context used for building our own URI.
- */
-struct GetUriContext
-{
- /**
- * Final URI.
- */
- char *uri;
-
-};
-
-
-/**
- * FIXME.
- */
-struct GNUNET_PEERINFO_HelloAddressParsingContext
-{
/**
- * FIXME.
+ * Hello was friend only, GNUNET_YES or GNUNET_NO
*/
- char *tmp;
-
- /**
- * FIXME.
- */
- char *pos;
+ int friend_only;
- /**
- * FIXME.
- */
- size_t tmp_len;
};
*/
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.
*/
*/
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.
+ */
+static struct GNUNET_PEERINFO_AddContext *ac;
+
/**
* Main state machine that goes over all options and
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);
}
{
struct PrintContext *pc = cls;
struct AddressRecord *ar;
-
GNUNET_assert (0 < pc->off);
ar = &pc->address_list[--pc->off];
ar->pc = pc;
+ ar->expiration = expiration;
ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg, address, no_resolve,
GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
* Currently prints the GNUNET_PeerIdentity and the transport address.
*
* @param cls the 'struct PrintContext'
- * @param peer identity of the peer
+ * @param peer identity of the peer
* @param hello addresses of the peer
* @param err_msg error message
*/
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 (peer == NULL)
+ if (NULL == peer)
{
pic = NULL; /* end of iteration */
- if (err_msg != NULL)
+ 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;
}
+ 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));
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,
+ GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO,
&print_address, pc);
}
+/* ************************* DUMP Hello ************************** */
-/* ************************* GET URI ************************** */
-
-
-/**
- * Function that is called on each address of this peer.
- * Expands the corresponding URI string.
- *
- * @param cls the 'GetUriContext'
- * @param address address to add
- * @param expiration expiration time for the address
- * @return GNUNET_OK (continue iteration).
- */
-static int
-compose_uri (void *cls, const struct GNUNET_HELLO_Address *address,
- struct GNUNET_TIME_Absolute expiration)
+static int 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 *ret;
- 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;
- seconds = expiration.abs_value / 1000;
- t = gmtime (&seconds);
- GNUNET_asprintf (&ret,
- "%s!%04u%02u%02u%02u%02u%02u!%s!%s",
- guc->uri,
- t->tm_year,
- t->tm_mon,
- t->tm_mday,
- t->tm_hour,
- t->tm_min,
- t->tm_sec,
- address->transport_name,
- addr);
- GNUNET_free (guc->uri);
- guc->uri = ret;
+ int *c = cls;
+ (*c) ++;
return GNUNET_OK;
}
-
/**
- * Print URI of the peer.
+ * Write Hello of my peer to a file.
*
* @param cls the 'struct GetUriContext'
* @param peer identity of the peer (unused)
* @param err_msg error message
*/
static void
-print_my_uri (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Message *hello,
+dump_my_hello (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Message *hello,
const char *err_msg)
{
- struct GetUriContext *guc = cls;
-
+ unsigned int size;
+ unsigned int c_addr;
if (peer == NULL)
{
+ pic = NULL;
if (err_msg != NULL)
FPRINTF (stderr,
- _("Error in communication with PEERINFO service: %s\n"),
+ _("Error in communication with PEERINFO service: %s\n"),
err_msg);
- }
- else
- {
- if (NULL != hello)
- GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &compose_uri, guc);
- printf ("%s\n", (const char *) guc->uri);
+ tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
+ return;
}
- GNUNET_free (guc->uri);
- GNUNET_free (guc);
- tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
-}
-
-/* ************************* import HELLO by URI ********************* */
-
-
-static size_t
-add_addr_to_hello (void *cls, size_t max, void *buffer)
-{
- struct tm expiration_time;
- char buf[5];
- long l;
- time_t expiration_seconds;
- struct GNUNET_TIME_Absolute expire;
-
- struct GNUNET_PEERINFO_HelloAddressParsingContext *ctx = cls;
- char *exp1, *exp2;
- struct GNUNET_TRANSPORT_PluginFunctions *papi;
- void *addr;
- size_t addr_len;
-
- /* End of string */
- if (ctx->pos - ctx->tmp == ctx->tmp_len)
- return 0;
-
- /* Parsed past the end of string, OR wrong format */
- if ((ctx->pos - ctx->tmp > ctx->tmp_len) || ctx->pos[0] != '!')
+ if (NULL == hello)
{
- GNUNET_break (0);
- return 0;
+ FPRINTF (stderr,
+ _("Failure: Did not receive %s\n"), "HELLO");
+ return;
}
- /* Not enough bytes (3 for three '!', 14 for expiration date, and
- * at least 1 for type and 1 for address (1-byte long address is a joke,
- * but it is not completely unrealistic. Zero-length address is.
- */
- if (ctx->tmp_len - (ctx->pos - ctx->tmp) < 1 /*!*/ * 3 + 14 + /* at least */ 2)
+ size = GNUNET_HELLO_size (hello);
+ if (0 == size)
{
- GNUNET_break (0);
- return 0;
+ FPRINTF (stderr,
+ _("Failure: Received invalid %s\n"), "HELLO");
+ return;
}
- /* Go past the first '!', now we're on expiration date */
- ctx->pos += 1;
- /* Its length is known, so check for the next '!' right away */
- if (ctx->pos[14] != '!')
+ if (GNUNET_SYSERR == GNUNET_DISK_fn_write (dump_hello, hello, size,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE |
+ GNUNET_DISK_PERM_GROUP_READ |
+ GNUNET_DISK_PERM_OTHER_READ))
{
- GNUNET_break (0);
- return 0;
- }
-
- memset (&expiration_time, 0, sizeof (struct tm));
-
- /* This is FAR more strict than strptime(ctx->pos, "%Y%m%d%H%M%S", ...); */
- /* FIXME: make it a separate function, since expiration is specified to every address */
-#define GETNDIGITS(n,cond) \
- strncpy (buf, &ctx->pos[0], n); \
- buf[n] = '\0'; \
- errno = 0; \
- l = strtol (buf, NULL, 10); \
- if (errno != 0 || cond) \
- { \
- GNUNET_break (0); \
- return 0; \
- } \
- ctx->pos += n;
+ 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);
- GETNDIGITS (4, l < 1900)
- expiration_time.tm_year = l - 1900;
-
- GETNDIGITS (2, l < 1 || l > 12)
- expiration_time.tm_mon = l;
-
- GETNDIGITS (2, l < 1 || l > 31)
- expiration_time.tm_mday = l;
-
- GETNDIGITS (2, l < 0 || l > 23)
- expiration_time.tm_hour = l;
+ }
+ c_addr = 0;
+ GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, count_addr, &c_addr);
- GETNDIGITS (2, l < 0 || l > 59)
- expiration_time.tm_min = l;
+ 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(hello)) ? "friend-only": "public",
+ c_addr, size, dump_hello);
+ }
- /* 60 - with a leap second */
- GETNDIGITS (2, l < 0 || l > 60)
- expiration_time.tm_sec = l;
+ GNUNET_free (dump_hello);
+ dump_hello = NULL;
- expiration_time.tm_isdst = -1;
+}
-#undef GETNDIGITS
- expiration_seconds = mktime (&expiration_time);
- if (expiration_seconds == (time_t) -1)
- {
- GNUNET_break (0);
- return 0;
- }
- expire.abs_value = expiration_seconds * 1000;
+/* ************************* GET URI ************************** */
- /* Now we're at '!', advance to the transport type */
- ctx->pos += 1;
- /* Find the next '!' that separates transport type from
- * the address
- */
- exp1 = strstr (ctx->pos, "!");
- if (exp1 == NULL)
+/**
+ * Print URI of the peer.
+ *
+ * @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,
+ const char *err_msg)
+{
+ if (peer == NULL)
{
- GNUNET_break (0);
- return 0;
+ pic = NULL;
+ if (err_msg != NULL)
+ FPRINTF (stderr,
+ _("Error in communication with PEERINFO service: %s\n"),
+ err_msg);
+ tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
+ return;
}
- /* We need it 0-terminated */
- exp1[0] = '\0';
- /* Find the '!' that separates address from the next record.
- * It might not be there, if this is the last record.
- */
- exp2 = strstr (&exp1[1], "!");
- if (exp2 == NULL)
- exp2 = &ctx->tmp[ctx->tmp_len];
- papi = GPI_plugins_find (ctx->pos);
- if (papi == NULL)
- {
- /* 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.
- */
- ctx->pos = exp2 + 1;
- if (ctx->pos - ctx->tmp >= ctx->tmp_len)
- return 0;
- return add_addr_to_hello (cls, max, buffer);
- }
- if (NULL == papi->string_to_address)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin `%s' does not support URIs yet\n"),
- ctx->pos);
- ctx->pos = exp2 + 1;
- if (ctx->pos - ctx->tmp >= ctx->tmp_len)
- return 0;
- return add_addr_to_hello (cls, max, buffer);
- }
- if ((papi->string_to_address != NULL) && (GNUNET_OK ==
- papi->string_to_address (papi->cls, &exp1[1], exp2 - &exp1[1], &addr,
- &addr_len)))
- {
- struct GNUNET_HELLO_Address address;
- int ret;
-
- /* address.peer is unset - not used by add_address() */
- address.address_length = addr_len;
- address.address = addr;
- address.transport_name = ctx->pos;
- ret = GNUNET_HELLO_add_address (&address, expire, buffer, max);
- GNUNET_free (addr);
- ctx->pos = exp2;
- return ret;
+ if (NULL == hello)
+ return;
+ char *uri = GNUNET_HELLO_compose_uri(hello, &GPI_plugins_find);
+ if (NULL != uri) {
+ printf ("%s\n", (const char *) uri);
+ GNUNET_free (uri);
}
- return 0;
}
+/* ************************* import HELLO by URI ********************* */
+
+
+/**
+ * Continuation called from 'GNUNET_PEERINFO_add_peer'
+ *
+ * @param cls closure, NULL
+ * @param emsg error message, NULL on success
+ */
static void
-parse_hello (const struct GNUNET_CONFIGURATION_Handle *c,
- const char *put_uri)
+add_continuation (void *cls,
+ const char *emsg)
{
- int r;
- char *scheme_part = NULL;
- char *path_part = NULL;
- char *exc;
- int std_result;
- struct GNUNET_HELLO_Message *hello;
- struct GNUNET_PEERINFO_HelloAddressParsingContext ctx;
-
- r = GNUNET_STRINGS_parse_uri (put_uri, &scheme_part, (const char **) &path_part);
- if (r == GNUNET_NO)
- return;
- if (scheme_part == NULL || strcmp (scheme_part, "gnunet://") != 0)
- {
- GNUNET_free_non_null (scheme_part);
- return;
- }
- GNUNET_free (scheme_part);
+ ac = NULL;
+ if (NULL != emsg)
+ fprintf (stderr,
+ _("Failure adding HELLO: %s\n"),
+ emsg);
+ tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
+}
- if (strncmp (path_part, "hello/", 6) != 0)
- return;
- path_part = &path_part[6];
- ctx.tmp = GNUNET_strdup (path_part);
- ctx.tmp_len = strlen (path_part);
- exc = strstr (ctx.tmp, "!");
- if (exc == NULL)
- exc = ctx.tmp + ctx.tmp_len;
- ctx.pos = exc;
-
- std_result = GNUNET_STRINGS_string_to_data (ctx.tmp, exc - ctx.tmp,
- (unsigned char *) &my_public_key, sizeof (my_public_key));
- if (std_result != GNUNET_OK)
- {
- GNUNET_free (ctx.tmp);
- return;
- }
+/**
+ * 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
+ */
+static int
+parse_hello_uri (const char *put_uri)
+{
+ struct GNUNET_HELLO_Message *hello = NULL;
+
+ int ret = GNUNET_HELLO_parse_uri(put_uri, &my_peer_identity.public_key,
+ &hello, &GPI_plugins_find);
- hello = GNUNET_HELLO_create (&my_public_key, add_addr_to_hello, &ctx);
- GNUNET_free (ctx.tmp);
+ if (NULL != hello) {
+ /* WARNING: this adds the address from URI WITHOUT verification! */
+ 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);
+ }
- /* WARNING: this adds the address from URI WITHOUT verification! */
- GNUNET_PEERINFO_add_peer (peerinfo, hello);
- GNUNET_free (hello);
/* wait 1s to give peerinfo operation a chance to succeed */
- tt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
- &state_machine, NULL);
+ /* FIXME: current peerinfo API sucks to require this; not to mention
+ that we get no feedback to determine if the operation actually succeeded */
+ return ret;
}
struct AddressRecord *ar;
unsigned int i;
+ if (NULL != ac)
+ {
+ GNUNET_PEERINFO_add_peer_cancel (ac);
+ ac = NULL;
+ }
if (GNUNET_SCHEDULER_NO_TASK != tt)
{
GNUNET_SCHEDULER_cancel (tt);
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_CRYPTO_RsaPrivateKey *priv;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
char *fn;
cfg = c;
- if (args[0] != NULL)
+ if ( (NULL != args[0]) &&
+ (NULL == put_uri) &&
+ (args[0] == strcasestr (args[0], "gnunet://hello/")) )
{
- FPRINTF (stderr, _("Invalid command line argument `%s'\n"), args[0]);
+ put_uri = GNUNET_strdup (args[0]);
+ args++;
+ }
+ if (NULL != args[0])
+ {
+ FPRINTF (stderr,
+ _("Invalid command line argument `%s'\n"),
+ args[0]);
return;
}
- peerinfo = GNUNET_PEERINFO_connect (cfg);
- if (peerinfo == NULL)
+ 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) )
+ if ( (GNUNET_YES == get_self) || (GNUNET_YES == get_uri) || (NULL != dump_hello) )
{
/* load private key */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "GNUNETD", "HOSTKEY",
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "PEER", "PRIVATE_KEY",
&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)))
+ if (NULL == (priv = GNUNET_CRYPTO_eddsa_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);
- fprintf (stderr, "PK: `%s\n",
- GNUNET_CRYPTO_rsa_public_key_to_string (&my_public_key));
- GNUNET_CRYPTO_rsa_key_free (priv);
- GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key), &my_peer_identity.hashPubKey);
+ GNUNET_CRYPTO_eddsa_key_get_public (priv,
+ &my_peer_identity.public_key);
+ GNUNET_free (priv);
}
tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
if (NULL != put_uri)
{
GPI_plugins_load (cfg);
- parse_hello (cfg, put_uri);
+ if (GNUNET_SYSERR == parse_hello_uri (put_uri))
+ {
+ fprintf (stderr,
+ _("Invalid URI `%s'\n"),
+ 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,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ 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,
- "gnunet://hello/%s",
- pkey);
- GNUNET_free (pkey);
GPI_plugins_load (cfg);
- pic = GNUNET_PEERINFO_iterate (peerinfo, &my_peer_identity,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &print_my_uri, guc);
+ pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, &my_peer_identity,
+ TIMEOUT, &print_my_uri, NULL);
get_uri = GNUNET_NO;
- return;
}
- GNUNET_SCHEDULER_shutdown ();
+ else if (NULL != dump_hello)
+ {
+ pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, &my_peer_identity,
+ TIMEOUT, &dump_my_hello, NULL);
+ }
+ 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;
}
int
main (int argc, char *const *argv)
{
+ default_operation = GNUNET_YES;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'n', "numeric", NULL,
gettext_noop ("don't resolve host names"),
{'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
};
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-peerinfo",
- gettext_noop ("Print information about peers."),
- options, &run, NULL)) ? 0 : 1;
+ int ret;
+
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
+ 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