* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_protocols.h"
#include "gnunet_hello_lib.h"
-#define DEBUG GNUNET_EXTRA_LOGGING
-
-#define VERBOSE GNUNET_NO
-
/**
* Closure for 'add_to_buf'.
*/
* 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_RsaPublicKeyBinaryEncoded pk;
+ struct GNUNET_CRYPTO_EddsaPublicKey pk;
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)
return 1;
}
{
- char buf[fsize];
-
- GNUNET_assert (fsize ==
+ char buf[fsize] GNUNET_ALIGN;
+
+ 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;
argv[1]);
return 1;
}
- result = GNUNET_HELLO_create (&pk, &add_from_hello, &orig);
+ {
+ char *pid;
+
+ pid = GNUNET_CRYPTO_eddsa_public_key_to_string (&pk);
+ fprintf (stdout,
+ "Processing HELLO for peer `%s'\n",
+ pid);
+ GNUNET_free (pid);
+ }
+ result = GNUNET_HELLO_create (&pk, &add_from_hello,
+ &orig,
+ GNUNET_HELLO_is_friend_only (orig));
GNUNET_assert (NULL != result);
- fh = GNUNET_DISK_file_open (argv[1],
+ fh = GNUNET_DISK_file_open (argv[1],
GNUNET_DISK_OPEN_WRITE,
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);
return 0;
}