/*
This file is part of GNUnet.
- (C) 2010,2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010,2011 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
/**
* Test ats info
*/
-struct GNUNET_ATS_Information test_ats_info[2];
+static struct GNUNET_ATS_Information test_ats_info[2];
/**
* Test ats count
*/
-uint32_t test_ats_count;
+static uint32_t test_ats_count;
+/**
+ * Address record we will modify with a session later.
+ */
+static struct GNUNET_ATS_AddressRecord *ar;
+
+
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
static int
-stat_cb(void *cls, const char *subsystem,
- const char *name, uint64_t value,
- int is_persistent)
+stat_cb (void *cls, const char *subsystem,
+ const char *name, uint64_t value,
+ int is_persistent)
{
static int first_stat_cb = GNUNET_YES;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
- subsystem,name, value);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "ATS statistics: `%s' `%s' %llu\n",
+ subsystem,name, value);
if ((GNUNET_YES == first_stat_cb) && (1 == value))
{
- GNUNET_ATS_address_add (sched_ats, &test_hello_address, (struct Session *) &test_session, test_ats_info, test_ats_count);
+ GNUNET_ATS_address_add_session (ar,
+ (struct Session *) &test_session);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
}
if ((GNUNET_NO == first_stat_cb) && (1 == value))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS updated existing address\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "ATS updated existing address\n");
}
if (value > 1)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS did not update existing address, but added 2nd address!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "ATS did not update existing address, but added 2nd address!\n");
GNUNET_SCHEDULER_add_now (&end_badly, NULL);
}
ret = 0;
}
+
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
ret = GNUNET_SYSERR;
}
+
static void
address_suggest_cb (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
struct Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t ats_count)
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
GNUNET_SCHEDULER_add_now (&end_badly, NULL);
- return;
}
/* Set up peer */
memset (&p.id, '1', sizeof (p.id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created peer `%s'\n",
GNUNET_i2s_full(&p.id));
/* Prepare ATS Information */
test_hello_address.address_length = test_addr.addr_len;
/* Adding address */
- GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
+ ar = GNUNET_ATS_address_add (sched_ats,
+ &test_hello_address, NULL,
+ test_ats_info, test_ats_count);
}