*/
static GNUNET_CORE_DisconnectEventHandler client_dh;
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* A HOSTLIST_ADV message is used to exchange information about
* hostlist advertisements. This struct is always
*/
uint32_t reserved GNUNET_PACKED;
};
-
+GNUNET_NETWORK_STRUCT_END
static struct GNUNET_PeerIdentity me;
static void
-core_init (void *cls,
- struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+core_init (void *cls, struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *my_identity)
{
me = *my_identity;
}
/**
* Core handler for p2p hostlist advertisements
+ *
+ * @param cls closure
+ * @param peer identity of the sender
+ * @param message advertisement message we got
+ * @param atsi performance information
+ * @param atsi_count number of records in 'atsi'
+ * @return GNUNET_OK on success
*/
static int
-advertisement_handler (void *cls,
- const struct GNUNET_PeerIdentity *peer,
+advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
GNUNET_assert (NULL != client_adv_handler);
- return (*client_adv_handler) (cls, peer, message, atsi);
+ return (*client_adv_handler) (cls, peer, message, atsi, atsi_count);
}
* @param cls closure
* @param peer peer identity this notification is about
* @param atsi performance data
+ * @param atsi_count number of records in 'atsi'
*/
static void
-connect_handler (void *cls,
- const struct
- GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"A new peer connected, notifying client and server\n");
if (NULL != client_ch)
- (*client_ch) (cls, peer, atsi);
+ (*client_ch) (cls, peer, atsi, atsi_count);
#if HAVE_MHD
if (NULL != server_ch)
- (*server_ch) (cls, peer, atsi);
+ (*server_ch) (cls, peer, atsi, atsi_count);
#endif
}
* @param cfg configuration
*/
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
static const struct GNUNET_CORE_MessageHandler learn_handlers[] = {
{&advertisement_handler, GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, 0},
stats = GNUNET_STATISTICS_create ("hostlist", cfg);
- core = GNUNET_CORE_connect (cfg,
- 1,
- NULL,
- &core_init,
- &connect_handler, &disconnect_handler, NULL,
- NULL, GNUNET_NO,
- NULL, GNUNET_NO,
- learning ? learn_handlers : no_learn_handlers);
+ core =
+ GNUNET_CORE_connect (cfg, 1, NULL, &core_init, &connect_handler,
+ &disconnect_handler, NULL, GNUNET_NO, NULL,
+ GNUNET_NO,
+ learning ? learn_handlers : no_learn_handlers);
if (bootstrapping)
{
- GNUNET_HOSTLIST_client_start (cfg, stats,
- &client_ch, &client_dh, &client_adv_handler,
- learning);
+ GNUNET_HOSTLIST_client_start (cfg, stats, &client_ch, &client_dh,
+ &client_adv_handler, learning);
}
#if HAVE_MHD
advertising);
}
#endif
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &cleaning_task, NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleaning_task,
+ NULL);
if (NULL == core)
{
int ret;
GNUNET_log_setup ("hostlist", "WARNING", NULL);
- ret = (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc,
- argv,
- "hostlist",
- _("GNUnet hostlist server and client"),
- options, &run, NULL)) ? 0 : 1;
+ ret =
+ (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc, argv, "hostlist",
+ _("GNUnet hostlist server and client"), options,
+ &run, NULL)) ? 0 : 1;
return ret;
}