diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-12-11 10:50:05 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-12-11 10:50:05 +0000 |
commit | 89163e2587082ac3bc6b4275c445fbc23b7be391 (patch) | |
tree | 555d5bbb8ecd40e2470e926b55b67f98e72ba4e2 /src/ats | |
parent | e8bc9fe72894972f3280eed7cdb0e1994188ff38 (diff) | |
download | gnunet-89163e2587082ac3bc6b4275c445fbc23b7be391.tar.gz gnunet-89163e2587082ac3bc6b4275c445fbc23b7be391.zip |
changes
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/Makefile.am | 8 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 2 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_simplistic.c | 4 | ||||
-rw-r--r-- | src/ats/test_ats_api_scheduling_add_address.c | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 8fedbd2df..1419b6d98 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am | |||
@@ -60,6 +60,7 @@ gnunet_service_ats_DEPENDENCIES = \ | |||
60 | check_PROGRAMS = \ | 60 | check_PROGRAMS = \ |
61 | test_ats_api_scheduling_init \ | 61 | test_ats_api_scheduling_init \ |
62 | test_ats_api_scheduling_add_address \ | 62 | test_ats_api_scheduling_add_address \ |
63 | test_ats_api_scheduling_add_session \ | ||
63 | test_ats_api_scheduling_update_address \ | 64 | test_ats_api_scheduling_update_address \ |
64 | test_ats_api_scheduling_destroy_address \ | 65 | test_ats_api_scheduling_destroy_address \ |
65 | test_ats_api_scheduling_destroy_session \ | 66 | test_ats_api_scheduling_destroy_session \ |
@@ -90,6 +91,13 @@ test_ats_api_scheduling_add_address_LDADD = \ | |||
90 | $(top_builddir)/src/testing/libgnunettesting.la \ | 91 | $(top_builddir)/src/testing/libgnunettesting.la \ |
91 | $(top_builddir)/src/ats/libgnunetats.la | 92 | $(top_builddir)/src/ats/libgnunetats.la |
92 | 93 | ||
94 | test_ats_api_scheduling_add_session_SOURCES = \ | ||
95 | test_ats_api_scheduling_add_session.c | ||
96 | test_ats_api_scheduling_add_session_LDADD = \ | ||
97 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
98 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
99 | $(top_builddir)/src/ats/libgnunetats.la | ||
100 | |||
93 | test_ats_api_scheduling_update_address_SOURCES = \ | 101 | test_ats_api_scheduling_update_address_SOURCES = \ |
94 | test_ats_api_scheduling_update_address.c | 102 | test_ats_api_scheduling_update_address.c |
95 | test_ats_api_scheduling_update_address_LDADD = \ | 103 | test_ats_api_scheduling_update_address_LDADD = \ |
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index b94a71656..b7f2012a5 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -210,8 +210,6 @@ disassemble_ats_information (const struct GNUNET_ATS_Information *src, | |||
210 | res ++; | 210 | res ++; |
211 | break; | 211 | break; |
212 | case GNUNET_ATS_QUALITY_NET_DISTANCE: | 212 | case GNUNET_ATS_QUALITY_NET_DISTANCE: |
213 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
214 | "Old ATS type %u %u\n", dest->atsp_distance, ntohl (src[i].type)); | ||
215 | dest->atsp_distance = ntohl (src[i].value); | 213 | dest->atsp_distance = ntohl (src[i].value); |
216 | res ++; | 214 | res ++; |
217 | break; | 215 | break; |
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c index 94d6f5536..a2a1bcee9 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.c +++ b/src/ats/gnunet-service-ats_addresses_simplistic.c | |||
@@ -469,7 +469,9 @@ GAS_simplistic_get_preferred_address (void *solver, | |||
469 | return NULL; | 469 | return NULL; |
470 | } | 470 | } |
471 | 471 | ||
472 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Suggesting address %p for peer `%s'\n", cur, GNUNET_i2s (peer)); | 472 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Suggesting %s address %p for peer `%s'\n", |
473 | (GNUNET_NO == cur->active) ? "inactive" : "active", | ||
474 | cur, GNUNET_i2s (peer)); | ||
473 | net_cur = (struct Network *) cur->solver_information; | 475 | net_cur = (struct Network *) cur->solver_information; |
474 | if (GNUNET_YES == cur->active) | 476 | if (GNUNET_YES == cur->active) |
475 | { | 477 | { |
diff --git a/src/ats/test_ats_api_scheduling_add_address.c b/src/ats/test_ats_api_scheduling_add_address.c index 902f3c15b..efbcb2da8 100644 --- a/src/ats/test_ats_api_scheduling_add_address.c +++ b/src/ats/test_ats_api_scheduling_add_address.c | |||
@@ -272,7 +272,7 @@ run (void *cls, | |||
272 | test_ats_count = 2; | 272 | test_ats_count = 2; |
273 | 273 | ||
274 | /* Adding address without session */ | 274 | /* Adding address without session */ |
275 | test_session = &test_addr; | 275 | test_session = NULL; |
276 | create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1); | 276 | create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1); |
277 | test_hello_address.peer = p.id; | 277 | test_hello_address.peer = p.id; |
278 | test_hello_address.transport_name = test_addr.plugin; | 278 | test_hello_address.transport_name = test_addr.plugin; |