Merge branch 'master' of gnunet.org:gnunet

[oweals/gnunet.git] / src / ats / gnunet-service-ats_preferences.h

diff --git a/src/ats/gnunet-service-ats_preferences.h b/src/ats/gnunet-service-ats_preferences.h
index 1715288d73a276c34f34f5c27ecac1afd59e5d65..fe01aa573bffcea96393bccdef02b5847a3e210e 100644 (file)
--- a/src/ats/gnunet-service-ats_preferences.h
+++ b/src/ats/gnunet-service-ats_preferences.h
@@ -1,6 +1,6 @@
 /*
  This file is part of GNUnet.
- (C) 2011-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2014 GNUnet e.V.
 
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 /**
  * @file ats/gnunet-service-ats_preferences.h
@@ -32,23 +32,26 @@
 #include "gnunet_statistics_service.h"
 #include "ats.h"
 
-
+/**
+ * Default preference value we assume if we know nothing.
+ */
 #define DEFAULT_ABS_PREFERENCE 0.0
 
+/**
+ * Default relative preference value we assume if we know nothing.
+ */
 #define DEFAULT_REL_PREFERENCE 0.0
 
 
 /**
  * Handle 'preference change' messages from clients.
  *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
+ * @param client the client that sent the request
+ * @param msg the request message
  */
 void
-GAS_handle_preference_change (void *cls,
-                              struct GNUNET_SERVER_Client *client,
-                              const struct GNUNET_MessageHeader *message);
+GAS_handle_preference_change (struct GNUNET_SERVICE_Client *client,
+                             const struct ChangePreferenceMessage *msg);
 
 
 /**
@@ -65,31 +68,17 @@ void
 GAS_preference_done (void);
 
 
-/**
- * Normalize an updated preference value
- *
- * @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_abs the normalized score
- */
-void
-GAS_normalization_normalize_preference (struct GNUNET_SERVER_Client *client,
-                                        const struct GNUNET_PeerIdentity *peer,
-                                        enum GNUNET_ATS_PreferenceKind kind,
-                                        float score_abs);
-
 /**
  * Get the normalized preference values for a specific peer.
  *
  * @param cls ignored
  * @param id the peer
  * @return pointer to the values, can be indexed
- *  with GNUNET_ATS_PreferenceKind, NULL if peer does not exist
+ *  with `enum GNUNET_ATS_PreferenceKind`, never NULL
  */
 const double *
-GAS_normalization_get_preferences_by_peer (void *cls,
-                                          const struct GNUNET_PeerIdentity *id);
+GAS_preference_get_by_peer (void *cls,
+                            const struct GNUNET_PeerIdentity *id);
 
 
 /**
@@ -98,7 +87,7 @@ GAS_normalization_get_preferences_by_peer (void *cls,
  * @param client the disconnecting client
  */
 void
-GAS_normalization_preference_client_disconnect (struct GNUNET_SERVER_Client *client);
+GAS_preference_client_disconnect (struct GNUNET_SERVICE_Client *client);
 
 
 #endif