adding client reference

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 31d4f68082f791d5798512a92098afe94a191117..ed33c2dfd3ca82e8240a03eea5cb98d164e39424 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -929,20 +929,21 @@ GAS_addresses_handle_backoff_reset (struct GAS_Addresses_Handle *handle,
 
 void
 GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
+                                 void *client,
                                  const struct GNUNET_PeerIdentity *peer,
                                  enum GNUNET_ATS_PreferenceKind kind,
                                  float score)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received `%s' for peer `%s'\n",
+              "Received `%s' for peer `%s' for client %p\n",
               "CHANGE PREFERENCE",
-              GNUNET_i2s (peer));
+              GNUNET_i2s (peer), client);
 
   if (GNUNET_NO == handle->running)
     return;
 
   /* Tell solver about update */
-  handle->s_pref (handle->solver, peer, kind, score);
+  handle->s_pref (handle->solver, client, peer, kind, score);
 }
 
 static unsigned int

diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index a9aac2094aae48b2db46cc61c4874fb8374e0988..b774cff48ef08804c114694cb9d05a1446fbca89 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -182,6 +182,7 @@ typedef void *
 
 typedef void
 (*GAS_solver_address_change_preference) (void *solver,
+                                         void *client,
                                          const struct GNUNET_PeerIdentity *peer,
                                          enum GNUNET_ATS_PreferenceKind kind,
                                          float score);
@@ -290,6 +291,7 @@ GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
 
 void
 GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
+                                 void *client,
                                  const struct GNUNET_PeerIdentity *peer,
                                  enum GNUNET_ATS_PreferenceKind kind,
                                  float score);

diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index 8e852ad75197c4e836fc926f927e7e14dd814f33..e754842f9fd6cc6e6b08e51145a840c49e7ff041 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -1776,6 +1776,7 @@ GAS_mlp_get_preferred_address (void *solver,
  */
 void
 GAS_mlp_address_change_preference (void *solver,
+                                   void *client,
                                    const struct GNUNET_PeerIdentity *peer,
                                    enum GNUNET_ATS_PreferenceKind kind,
                                    float score)

diff --git a/src/ats/gnunet-service-ats_addresses_mlp.h b/src/ats/gnunet-service-ats_addresses_mlp.h
index 2f09bd269f94364b529c48e0a3840635c0440b79..428c67d3fb3a0fb3f82eab6a5b6b132c86ff5fde 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses_mlp.h
+++ b/src/ats/gnunet-service-ats_addresses_mlp.h
@@ -400,6 +400,7 @@ GAS_mlp_address_delete (void *solver,
  */
 void
 GAS_mlp_address_change_preference (void *solver,
+                                   void *client,
                                    const struct GNUNET_PeerIdentity *peer,
                                    enum GNUNET_ATS_PreferenceKind kind,
                                    float score);

diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c
index ddadcb55c0357344d110b4ba2f7108764df95b87..c14b5d60dff23d0ee9705bf63b80ad3bc2eaa4fd 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses_simplistic.c
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.c
@@ -843,12 +843,14 @@ GAS_simplistic_get_preferred_address (void *solver,
  * Changes the preferences for a peer in the problem
  *
  * @param solver the solver handle
+ * @param client the client with this preference
  * @param peer the peer to change the preference for
  * @param kind the kind to change the preference
  * @param score the score
  */
 void
 GAS_simplistic_address_change_preference (void *solver,
+                                   void *client,
                                    const struct GNUNET_PeerIdentity *peer,
                                    enum GNUNET_ATS_PreferenceKind kind,
                                    float score)

diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.h b/src/ats/gnunet-service-ats_addresses_simplistic.h
index 0a3eee4bd3da023819214c23eb8a1ed88d946f03..eab221cbf8204d153be0ceb3653039ab867c8093 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses_simplistic.h
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.h
@@ -135,12 +135,14 @@ GAS_simplistic_get_preferred_address (void *solver,
  * Changes the preferences for a peer in the problem
  *
  * @param solver the solver handle
+ * @param client the client with this preference
  * @param peer the peer to change the preference for
  * @param kind the kind to change the preference
  * @param score the score
  */
 void
 GAS_simplistic_address_change_preference (void *solver,
+                                   void *client,
                                    const struct GNUNET_PeerIdentity *peer,
                                    enum GNUNET_ATS_PreferenceKind kind,
                                    float score);

diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index 6ebd021cf8c1966fa00a2570bc7681fb5b214a3f..35f0223a2f3cc1a7d644f0e979078befdee7ebb5 100644 (file)
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -587,7 +587,9 @@ GAS_handle_preference_change (void *cls,
                             1, GNUNET_NO);
   pi = (const struct PreferenceInformation *) &msg[1];
   for (i = 0; i < nump; i++)
-    GAS_addresses_change_preference (GSA_addresses, &msg->peer,
+    GAS_addresses_change_preference (GSA_addresses,
+                                     client,
+                                     &msg->peer,
                                      (enum GNUNET_ATS_PreferenceKind)
                                      ntohl (pi[i].preference_kind),
                                      pi[i].preference_value);

diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index 7b4a07e15e24168731fe7f7bf1bfaa873ff8231b..e5e43ed064a3ec5551aa2b0ce6edcae3116f42e4 100644 (file)
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -7,7 +7,7 @@ DEFAULTSERVICES = ats
 UNIXPATH = /tmp/test-ats-scheduling-arm.sock
 
 [ats]
-#PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25
+PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25
 AUTOSTART = YES
 PORT = 12002
 HOSTNAME = localhost