/*
This file is part of GNUnet
- Copyright (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012 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
#include "gnunet_hello_lib.h"
/**
- * Closure for 'add_to_buf'.
+ * Closure for #add_to_buf().
*/
struct AddContext
{
struct GNUNET_DISK_FileHandle *fh;
struct GNUNET_HELLO_Message *orig;
struct GNUNET_HELLO_Message *result;
- struct GNUNET_CRYPTO_EddsaPublicKey pk;
+ struct GNUNET_PeerIdentity pid;
uint64_t fsize;
address_count = 0;
GNUNET_DISK_file_read (fh, buf, fsize));
GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
orig = (struct GNUNET_HELLO_Message *) buf;
- if ( (fsize != GNUNET_HELLO_size (orig)) ||
- (GNUNET_OK != GNUNET_HELLO_get_key (orig, &pk)) )
+ if ( (fsize < GNUNET_HELLO_size (orig)) ||
+ (GNUNET_OK != GNUNET_HELLO_get_id (orig,
+ &pid)) )
{
FPRINTF (stderr,
_("Did not find well-formed HELLO in file `%s'\n"),
return 1;
}
{
- char *pid;
+ char *pids;
- pid = GNUNET_CRYPTO_eddsa_public_key_to_string (&pk);
+ pids = GNUNET_CRYPTO_eddsa_public_key_to_string (&pid.public_key);
fprintf (stdout,
"Processing HELLO for peer `%s'\n",
- pid);
- GNUNET_free (pid);
+ pids);
+ GNUNET_free (pids);
}
- result = GNUNET_HELLO_create (&pk, &add_from_hello,
+ result = GNUNET_HELLO_create (&pid.public_key,
+ &add_from_hello,
&orig,
GNUNET_HELLO_is_friend_only (orig));
GNUNET_assert (NULL != result);
fh = GNUNET_DISK_file_open (argv[1],
- GNUNET_DISK_OPEN_WRITE,
+ GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_TRUNCATE,
GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
if (NULL == fh)
{
}
GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
}
- FPRINTF (stderr, _("Modified %u addresses \n"), address_count);
+ FPRINTF (stderr,
+ _("Modified %u addresses, wrote %u bytes\n"),
+ address_count,
+ (unsigned int) fsize);
return 0;
}