From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 11 Dec 2012 10:50:05 +0000 (+0000)
Subject: changes
X-Git-Tag: initial-import-from-subversion-38251~10503
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=89163e2587082ac3bc6b4275c445fbc23b7be391;p=oweals%2Fgnunet.git

changes
---

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 = \
 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 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,
       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 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,
     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 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,
   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;