/*
This file is part of GNUnet
- (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
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 hello/gnunet-hello.c
* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_protocols.h"
#include "gnunet_hello_lib.h"
/**
- * Closure for 'add_to_buf'.
+ * Closure for #add_to_buf().
*/
struct AddContext
{
* Where to add.
*/
char *buf;
-
+
/**
* Maximum number of bytes left
*/
size_t ret;
};
+static int address_count;
+
/**
* Add the given address with infinit expiration to the buffer.
* @param cls closure
* @param address address to add
* @param expiration old expiration
- * @return GNUNET_OK keep iterating
+ * @return #GNUNET_OK keep iterating
*/
static int
-add_to_buf (void *cls, const struct GNUNET_HELLO_Address *address,
+add_to_buf (void *cls,
+ const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute expiration)
{
struct AddContext *ac = cls;
size_t ret;
- ret = GNUNET_HELLO_add_address (address,
+ ret = GNUNET_HELLO_add_address (address,
GNUNET_TIME_UNIT_FOREVER_ABS,
ac->buf,
ac->max);
ac->buf += ret;
ac->max -= ret;
- ac->ret += ret;
+ ac->ret += ret;
+ address_count ++;
return GNUNET_OK;
}
* @param buf where to add the addresses
* @return number of bytes added, 0 to terminate
*/
-static size_t
-add_from_hello (void *cls, size_t max, void *buf)
+static ssize_t
+add_from_hello (void *cls,
+ size_t max,
+ void *buf)
{
struct GNUNET_HELLO_Message **orig = cls;
struct AddContext ac;
if (NULL == *orig)
- return 0; /* already done */
+ return GNUNET_SYSERR; /* already done */
ac.buf = buf;
ac.max = max;
ac.ret = 0;
GNUNET_assert (NULL ==
- GNUNET_HELLO_iterate_addresses (*orig,
+ GNUNET_HELLO_iterate_addresses (*orig,
GNUNET_NO, &add_to_buf,
&ac));
*orig = NULL;
struct GNUNET_DISK_FileHandle *fh;
struct GNUNET_HELLO_Message *orig;
struct GNUNET_HELLO_Message *result;
- struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pk;
+ struct GNUNET_PeerIdentity pid;
uint64_t fsize;
+ address_count = 0;
GNUNET_log_setup ("gnunet-hello", "INFO", NULL);
if (argc != 2)
argv[1]);
return 1;
}
- fh = GNUNET_DISK_file_open (argv[1],
+ fh = GNUNET_DISK_file_open (argv[1],
GNUNET_DISK_OPEN_READ,
GNUNET_DISK_PERM_USER_READ);
if (NULL == fh)
}
{
char buf[fsize] GNUNET_ALIGN;
-
- GNUNET_assert (fsize ==
+
+ GNUNET_assert (fsize ==
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"),
argv[1]);
return 1;
}
- result = GNUNET_HELLO_create (&pk, &add_from_hello, &orig);
+ {
+ char *pids;
+
+ pids = GNUNET_CRYPTO_eddsa_public_key_to_string (&pid.public_key);
+ fprintf (stdout,
+ "Processing HELLO for peer `%s'\n",
+ pids);
+ GNUNET_free (pids);
+ }
+ 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,
+ fh = GNUNET_DISK_file_open (argv[1],
+ 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, wrote %u bytes\n"),
+ address_count,
+ (unsigned int) fsize);
return 0;
}