[GNUnet-SVN] r25384 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-12-11 11:50:05 +0100 (Tue, 11 Dec 2012)
New Revision: 25384

Modified:
   gnunet/src/ats/Makefile.am
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
   gnunet/src/ats/test_ats_api_scheduling_add_address.c
Log:
changes


Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2012-12-11 10:41:09 UTC (rev 25383)
+++ gnunet/src/ats/Makefile.am  2012-12-11 10:50:05 UTC (rev 25384)
@@ -60,6 +60,7 @@
 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 @@
   $(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 = \

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-11 10:41:09 UTC 
(rev 25383)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-11 10:50:05 UTC 
(rev 25384)
@@ -210,8 +210,6 @@
       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;

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-11 
10:41:09 UTC (rev 25383)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-11 
10:50:05 UTC (rev 25384)
@@ -469,7 +469,9 @@
     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)
   {

Modified: gnunet/src/ats/test_ats_api_scheduling_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_add_address.c        2012-12-11 
10:41:09 UTC (rev 25383)
+++ gnunet/src/ats/test_ats_api_scheduling_add_address.c        2012-12-11 
10:50:05 UTC (rev 25384)
@@ -272,7 +272,7 @@
   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;