changes

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 8fedbd2df771296fead2747525c81db3dacd05f6..1419b6d988a2fa8ba1866c7481c375e7c40c3c72 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -60,6 +60,7 @@ gnunet_service_ats_DEPENDENCIES = \
 check_PROGRAMS = \
  test_ats_api_scheduling_init \
  test_ats_api_scheduling_add_address \
+ test_ats_api_scheduling_add_session \
  test_ats_api_scheduling_update_address \
  test_ats_api_scheduling_destroy_address \
  test_ats_api_scheduling_destroy_session \
@@ -90,6 +91,13 @@ test_ats_api_scheduling_add_address_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
+test_ats_api_scheduling_add_session_SOURCES = \
+ test_ats_api_scheduling_add_session.c
+test_ats_api_scheduling_add_session_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/ats/libgnunetats.la  
+
 test_ats_api_scheduling_update_address_SOURCES = \
  test_ats_api_scheduling_update_address.c
 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 b94a7165624726a85d3996ebb1efa54e6593662f..b7f2012a561ab08162a5a923257ae4fd44b234d3 100644 (file)
--- 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,
       res ++;
       break;
     case GNUNET_ATS_QUALITY_NET_DISTANCE:
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Old ATS type %u %u\n", dest->atsp_distance, ntohl (src[i].type));
       dest->atsp_distance = ntohl (src[i].value);
       res ++;
       break;

diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c
index 94d6f5536527101e114079e2270f7190a1f8cc20..a2a1bcee99e8ae8f4843911865182743b8f9725b 100644 (file)
--- 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,
     return NULL;
   }
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Suggesting address %p for peer `%s'\n", cur, GNUNET_i2s (peer));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Suggesting %s address %p for peer `%s'\n",
+      (GNUNET_NO == cur->active) ? "inactive" : "active",
+      cur, GNUNET_i2s (peer));
   net_cur = (struct Network *) cur->solver_information;
   if (GNUNET_YES == cur->active)
   {

diff --git a/src/ats/test_ats_api_scheduling_add_address.c b/src/ats/test_ats_api_scheduling_add_address.c
index 902f3c15be7ef8af859c1bd808460e53caf22fb0..efbcb2da81c7150677f01c4aaba79f1a0bea7839 100644 (file)
--- 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,
   test_ats_count = 2;
 
   /* Adding address without session */
-  test_session = &test_addr;
+  test_session = NULL;
   create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1);
   test_hello_address.peer = p.id;
   test_hello_address.transport_name = test_addr.plugin;