[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34933 - in gnunet/src: ats include transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r34933 - in gnunet/src: ats include transport |
|
Date: |
Sun, 18 Jan 2015 15:10:50 +0100 |
Author: grothoff
Date: 2015-01-18 15:10:50 +0100 (Sun, 18 Jan 2015)
New Revision: 34933
Modified:
gnunet/src/ats/ats_api_scheduling.c
gnunet/src/ats/test_ats_api_delayed_service_performance_list_all_addresses.c
gnunet/src/ats/test_ats_api_delayed_service_performance_monitor.c
gnunet/src/ats/test_ats_api_delayed_service_scheduling_add_address.c
gnunet/src/ats/test_ats_api_performance_list_all_addresses.c
gnunet/src/ats/test_ats_api_performance_list_all_addresses_active.c
gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c
gnunet/src/ats/test_ats_api_performance_monitor.c
gnunet/src/ats/test_ats_api_performance_monitor_initial_callback.c
gnunet/src/ats/test_ats_api_scheduling_add_address.c
gnunet/src/ats/test_ats_api_scheduling_add_address_duplicate.c
gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
gnunet/src/ats/test_ats_api_scheduling_add_session.c
gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
gnunet/src/ats/test_ats_api_scheduling_destroy_address_twice.c
gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
gnunet/src/ats/test_ats_api_scheduling_init.c
gnunet/src/ats/test_ats_solver_add_address.c
gnunet/src/ats/test_ats_solver_add_address_and_request.c
gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
gnunet/src/ats/test_ats_solver_preferences.c
gnunet/src/ats/test_ats_solver_request_and_add_address.c
gnunet/src/ats/test_ats_solver_request_and_delete_address.c
gnunet/src/include/gnunet_ats_service.h
gnunet/src/transport/gnunet-service-transport.c
Log:
remove ATS information from callback from ATS address selection, as the
argument was never used in the first place
Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/ats_api_scheduling.c 2015-01-18 14:10:50 UTC (rev 34933)
@@ -525,8 +525,7 @@
&address,
s,
m->bandwidth_out,
- m->bandwidth_in,
- atsi, ats_count);
+ m->bandwidth_in);
}
Modified:
gnunet/src/ats/test_ats_api_delayed_service_performance_list_all_addresses.c
===================================================================
---
gnunet/src/ats/test_ats_api_delayed_service_performance_list_all_addresses.c
2015-01-18 13:22:12 UTC (rev 34932)
+++
gnunet/src/ats/test_ats_api_delayed_service_performance_list_all_addresses.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -146,19 +146,17 @@
return GNUNET_OK;
}
+
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;
}
@@ -277,7 +275,7 @@
GNUNET_i2s (&p[1].id));
/* Add addresses */
- sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL );
+ sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
if (sched_ats == NULL )
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
Modified: gnunet/src/ats/test_ats_api_delayed_service_performance_monitor.c
===================================================================
--- gnunet/src/ats/test_ats_api_delayed_service_performance_monitor.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_delayed_service_performance_monitor.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -37,12 +37,12 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Configuration handle
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* ATS scheduling handle
@@ -54,7 +54,6 @@
*/
static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-struct GNUNET_ATS_AddressListHandle* phal;
static int ret;
@@ -84,10 +83,10 @@
static struct Address p0_addresses[2];
static struct Address p1_addresses[2];
-struct GNUNET_HELLO_Address p0_ha[2];
-struct GNUNET_HELLO_Address p1_ha[2];
-struct GNUNET_HELLO_Address *s_ha[2];
+static struct GNUNET_HELLO_Address p0_ha[2];
+static struct GNUNET_HELLO_Address p1_ha[2];
+
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
@@ -148,20 +147,18 @@
}
+
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;
}
Modified: gnunet/src/ats/test_ats_api_delayed_service_scheduling_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_delayed_service_scheduling_add_address.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_delayed_service_scheduling_add_address.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -38,7 +38,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -63,7 +63,7 @@
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
@@ -73,24 +73,28 @@
/**
* 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;
-static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+static void
+end (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)
{
-
- 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 (1 == value)
{
GNUNET_SCHEDULER_add_now (&end, NULL);
@@ -100,7 +104,8 @@
static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
@@ -128,6 +133,7 @@
ret = 0;
}
+
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@ -136,19 +142,17 @@
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;
}
@@ -189,8 +193,10 @@
test_hello_address.address_length = test_addr.addr_len;
/* Adding address */
- GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session,
test_ats_info, test_ats_count);
-
+ GNUNET_ATS_address_add (sched_ats,
+ &test_hello_address,
+ test_session,
+ test_ats_info, test_ats_count);
}
Modified: gnunet/src/ats/test_ats_api_performance_list_all_addresses.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_list_all_addresses.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_performance_list_all_addresses.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -35,12 +35,12 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Configuration handle
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* ATS scheduling handle
@@ -52,7 +52,7 @@
*/
static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-struct GNUNET_ATS_AddressListHandle* phal;
+static struct GNUNET_ATS_AddressListHandle* phal;
static int ret;
@@ -82,10 +82,10 @@
static struct Address p0_addresses[2];
static struct Address p1_addresses[2];
-struct GNUNET_HELLO_Address p0_ha[2];
-struct GNUNET_HELLO_Address p1_ha[2];
-struct GNUNET_HELLO_Address *s_ha[2];
+static struct GNUNET_HELLO_Address p0_ha[2];
+static struct GNUNET_HELLO_Address p1_ha[2];
+
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
@@ -152,13 +152,10 @@
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;
}
@@ -170,6 +167,7 @@
ret = GNUNET_SYSERR;
}
+
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
Modified: gnunet/src/ats/test_ats_api_performance_list_all_addresses_active.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_list_all_addresses_active.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_performance_list_all_addresses_active.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -35,12 +35,12 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Configuration handle
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* ATS scheduling handle
@@ -52,7 +52,7 @@
*/
static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-struct GNUNET_ATS_AddressListHandle* phal;
+static struct GNUNET_ATS_AddressListHandle* phal;
static int ret;
@@ -82,10 +82,10 @@
static struct Address p0_addresses[2];
static struct Address p1_addresses[2];
-struct GNUNET_HELLO_Address p0_ha[2];
-struct GNUNET_HELLO_Address p1_ha[2];
-struct GNUNET_HELLO_Address *s_ha[2];
+static struct GNUNET_HELLO_Address p0_ha[2];
+static struct GNUNET_HELLO_Address p1_ha[2];
+
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
@@ -159,13 +159,10 @@
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;
}
Modified: gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_performance_list_peer_addresses.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -35,12 +35,12 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Configuration handle
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* ATS scheduling handle
@@ -52,7 +52,7 @@
*/
static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-struct GNUNET_ATS_AddressListHandle* phal;
+static struct GNUNET_ATS_AddressListHandle* phal;
static int ret;
@@ -85,9 +85,8 @@
static struct Address p0_addresses[2];
static struct Address p1_addresses[2];
-struct GNUNET_HELLO_Address p0_ha[2];
-struct GNUNET_HELLO_Address p1_ha[2];
-struct GNUNET_HELLO_Address *s_ha[2];
+static struct GNUNET_HELLO_Address p0_ha[2];
+static struct GNUNET_HELLO_Address p1_ha[2];
static void
@@ -228,9 +227,7 @@
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");
Modified: gnunet/src/ats/test_ats_api_performance_monitor.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_monitor.c 2015-01-18 13:22:12 UTC
(rev 34932)
+++ gnunet/src/ats/test_ats_api_performance_monitor.c 2015-01-18 14:10:50 UTC
(rev 34933)
@@ -36,12 +36,12 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Configuration handle
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* ATS scheduling handle
@@ -53,8 +53,6 @@
*/
static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-struct GNUNET_ATS_AddressListHandle* phal;
-
static int ret;
struct Address
@@ -83,9 +81,8 @@
static struct Address p0_addresses[2];
static struct Address p1_addresses[2];
-struct GNUNET_HELLO_Address p0_ha[2];
-struct GNUNET_HELLO_Address p1_ha[2];
-struct GNUNET_HELLO_Address *s_ha[2];
+static struct GNUNET_HELLO_Address p0_ha[2];
+static struct GNUNET_HELLO_Address p1_ha[2];
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
@@ -153,14 +150,11 @@
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;
}
Modified: gnunet/src/ats/test_ats_api_performance_monitor_initial_callback.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_monitor_initial_callback.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_performance_monitor_initial_callback.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -36,12 +36,12 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Configuration handle
*/
-struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* ATS scheduling handle
@@ -53,10 +53,9 @@
*/
static struct GNUNET_ATS_PerformanceHandle *perf_ats;
-struct GNUNET_ATS_AddressListHandle* phal;
-
static int ret;
+
struct Address
{
char *plugin;
@@ -160,14 +159,11 @@
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;
}
Modified: gnunet/src/ats/test_ats_api_scheduling_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_address.c 2015-01-18
13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_add_address.c 2015-01-18
14:10:50 UTC (rev 34933)
@@ -135,19 +135,17 @@
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;
}
Modified: gnunet/src/ats/test_ats_api_scheduling_add_address_duplicate.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_address_duplicate.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_add_address_duplicate.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -146,20 +146,17 @@
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;
}
Modified: gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_add_address_inbound.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -37,7 +37,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -62,33 +62,31 @@
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
- * Session
- */
-//static void *test_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;
-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)
{
-
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
subsystem,name, value);
if (1 == value)
@@ -141,19 +139,17 @@
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;
}
Modified: gnunet/src/ats/test_ats_api_scheduling_add_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_session.c 2015-01-18
13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_add_session.c 2015-01-18
14:10:50 UTC (rev 34933)
@@ -37,7 +37,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -62,7 +62,7 @@
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
@@ -72,17 +72,22 @@
/**
* 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;
-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,
@@ -154,13 +159,10 @@
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;
}
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_address.c 2015-01-18
13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_address.c 2015-01-18
14:10:50 UTC (rev 34933)
@@ -163,9 +163,7 @@
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");
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_address_twice.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_address_twice.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_address_twice.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -38,7 +38,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -78,11 +78,12 @@
/**
* Test ats count
*/
-uint32_t test_ats_count;
+static uint32_t test_ats_count;
static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
static int
stat_cb(void *cls, const char *subsystem,
const char *name, uint64_t value,
@@ -140,6 +141,7 @@
ret = 0;
}
+
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@ -148,30 +150,34 @@
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;
}
+
static int
-dummy_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+dummy_stat (void *cls,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
int is_persistent)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got dummy stat %s%s:%s = %llu\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Got dummy stat %s%s:%s = %llu\n",
is_persistent ? "!" : " ", subsystem, name, value);
return GNUNET_OK;
}
+
static void
got_initial_value (void *cls, int success)
{
Modified: gnunet/src/ats/test_ats_api_scheduling_destroy_session.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2015-01-18
13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_destroy_session.c 2015-01-18
14:10:50 UTC (rev 34933)
@@ -41,7 +41,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -66,7 +66,7 @@
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
@@ -76,17 +76,22 @@
/**
* 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;
-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,
@@ -158,13 +163,10 @@
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;
}
static void
Modified: gnunet/src/ats/test_ats_api_scheduling_init.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_init.c 2015-01-18 13:22:12 UTC
(rev 34932)
+++ gnunet/src/ats/test_ats_api_scheduling_init.c 2015-01-18 14:10:50 UTC
(rev 34933)
@@ -115,21 +115,20 @@
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;
}
+
static void
got_initial_value (void *cls, int success)
{
Modified: gnunet/src/ats/test_ats_solver_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_add_address.c 2015-01-18 13:22:12 UTC
(rev 34932)
+++ gnunet/src/ats/test_ats_solver_add_address.c 2015-01-18 14:10:50 UTC
(rev 34933)
@@ -37,7 +37,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -62,7 +62,7 @@
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
@@ -72,18 +72,19 @@
/**
* 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;
static int
stat_cb(void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent);
+
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@ -122,19 +123,17 @@
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;
}
Modified: gnunet/src/ats/test_ats_solver_add_address_and_request.c
===================================================================
--- gnunet/src/ats/test_ats_solver_add_address_and_request.c 2015-01-18
13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_solver_add_address_and_request.c 2015-01-18
14:10:50 UTC (rev 34933)
@@ -43,7 +43,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -68,7 +68,7 @@
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
@@ -78,12 +78,12 @@
/**
* 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;
static int
@@ -133,21 +133,17 @@
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_assert (NULL != address);
GNUNET_assert (NULL == session);
GNUNET_assert (ntohl(bandwidth_in.value__) > 0);
GNUNET_assert (ntohl(bandwidth_out.value__) > 0);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received sugggestion for peer `%s'\n",
- GNUNET_i2s (&address->peer));
-
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Received sugggestion for peer `%s'\n",
+ GNUNET_i2s (&address->peer));
GNUNET_SCHEDULER_add_now (&end, NULL);
- return;
}
Modified: gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
2015-01-18 13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
2015-01-18 14:10:50 UTC (rev 34933)
@@ -37,7 +37,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -92,15 +92,15 @@
/**
* Test state
*/
-int addresses_added = GNUNET_NO;
+static int addresses_added = GNUNET_NO;
-int first_address_suggested = GNUNET_NO;
+static int first_address_suggested = GNUNET_NO;
-int first_address_deleted = GNUNET_NO;
+static int first_address_deleted = GNUNET_NO;
-int second_address_deleted = GNUNET_NO;
+static int second_address_deleted = GNUNET_NO;
-int second_address_suggested = GNUNET_YES;
+static int second_address_suggested = GNUNET_YES;
static struct GNUNET_HELLO_Address *first_suggestion = NULL;
@@ -166,9 +166,7 @@
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_INFO, "Received a sugggestion for peer `%s' :
`%s'\n",
GNUNET_i2s (&address->peer), (char *) address->address);
Modified: gnunet/src/ats/test_ats_solver_preferences.c
===================================================================
--- gnunet/src/ats/test_ats_solver_preferences.c 2015-01-18 13:22:12 UTC
(rev 34932)
+++ gnunet/src/ats/test_ats_solver_preferences.c 2015-01-18 14:10:50 UTC
(rev 34933)
@@ -43,7 +43,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -83,13 +83,14 @@
/**
* Test ats info
*/
-struct GNUNET_ATS_Information test_ats_info[3];
+static struct GNUNET_ATS_Information test_ats_info[3];
/**
* Test ats count
*/
-uint32_t test_ats_count;
+static uint32_t test_ats_count;
+
static int
stat_cb (void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent);
@@ -129,6 +130,7 @@
ret = 0;
}
+
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@ -142,8 +144,8 @@
perf_info_cb (void *cls,
const struct GNUNET_HELLO_Address *address, int address_active,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
{
if (NULL == address)
return;
@@ -152,15 +154,14 @@
GNUNET_i2s (&address->peer));
}
+
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)
{
int c;
double pref_val;
@@ -175,6 +176,7 @@
}
}
+
static int
stat_cb (void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent)
Modified: gnunet/src/ats/test_ats_solver_request_and_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_request_and_add_address.c 2015-01-18
13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_solver_request_and_add_address.c 2015-01-18
14:10:50 UTC (rev 34933)
@@ -43,7 +43,7 @@
/**
* Statistics handle
*/
-struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_STATISTICS_Handle *stats;
/**
* Scheduling handle
@@ -68,7 +68,7 @@
/**
* HELLO address
*/
-struct GNUNET_HELLO_Address test_hello_address;
+static struct GNUNET_HELLO_Address test_hello_address;
/**
* Session
@@ -78,12 +78,12 @@
/**
* 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;
static int
@@ -133,9 +133,7 @@
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_assert (NULL != address);
@@ -145,7 +143,6 @@
GNUNET_i2s (&address->peer));
GNUNET_SCHEDULER_add_now (&end, NULL);
- return;
}
Modified: gnunet/src/ats/test_ats_solver_request_and_delete_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_request_and_delete_address.c 2015-01-18
13:22:12 UTC (rev 34932)
+++ gnunet/src/ats/test_ats_solver_request_and_delete_address.c 2015-01-18
14:10:50 UTC (rev 34933)
@@ -138,9 +138,7 @@
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)
{
if (GNUNET_NO == address_deleted)
{
Modified: gnunet/src/include/gnunet_ats_service.h
===================================================================
--- gnunet/src/include/gnunet_ats_service.h 2015-01-18 13:22:12 UTC (rev
34932)
+++ gnunet/src/include/gnunet_ats_service.h 2015-01-18 14:10:50 UTC (rev
34933)
@@ -325,18 +325,13 @@
* Signature of a function called by ATS with the current bandwidth
* and address preferences as determined by ATS.
*
- * If an address is available immediately the address will be included. If no
- * address can be suggested, address, session, bandwidth and ATS information
will
- * be NULL/0. ATS will suggest an address as soon as it can provide such an
- * address
- *
* @param cls closure
* @param address suggested address (including peer identity of the peer)
- * @param session session to use
- * @param bandwidth_out assigned outbound bandwidth for the connection
- * @param bandwidth_in assigned inbound bandwidth for the connection
- * @param ats performance data for the address (as far as known)
- * @param ats_count number of performance records in @a ats
+ * @param session session to use, NULL to establish a new outgoing session
+ * @param bandwidth_out assigned outbound bandwidth for the connection,
+ * 0 to disconnect
+ * @param bandwidth_in assigned inbound bandwidth for the connection,
+ * 0 to disconnect
*/
typedef void
(*GNUNET_ATS_AddressSuggestionCallback) (void *cls,
@@ -344,8 +339,7 @@
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 *ats, uint32_t ats_count);
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in);
/**
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2015-01-18 13:22:12 UTC
(rev 34932)
+++ gnunet/src/transport/gnunet-service-transport.c 2015-01-18 14:10:50 UTC
(rev 34933)
@@ -908,9 +908,7 @@
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 *ats,
- uint32_t ats_count)
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
uint32_t bw_in = ntohl (bandwidth_in.value__);
uint32_t bw_out = ntohl (bandwidth_out.value__);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34933 - in gnunet/src: ats include transport,
gnunet <=