cost report is not used
authorChristian Grothoff <christian@grothoff.org>
Sat, 13 Aug 2011 10:40:10 +0000 (10:40 +0000)
committerChristian Grothoff <christian@grothoff.org>
Sat, 13 Aug 2011 10:40:10 +0000 (10:40 +0000)
src/include/gnunet_transport_plugin.h
src/transport/gnunet-service-transport-new.c
src/transport/gnunet-service-transport_plugins.c
src/transport/gnunet-service-transport_plugins.h

index fdd298e7f9e7aac00f58609c7d4b0f2d1f9d7cd2..b4784318843f7a4fa1b80a2dedf8d702de42845f 100644 (file)
@@ -158,26 +158,6 @@ typedef struct GNUNET_TIME_Relative (*GNUNET_TRANSPORT_TrafficReport) (void *cls
                                                                       size_t amount_recved);
 
 
-/**
- * Function called whenever the plugin has to notify ATS about costs for using this transport
- *
- * The cost will be passed as struct GNUNET_TRANSPORT_ATS_Cost_Information[]
- * This array is 0-terminated, so the last element will be a pair:
- * ((cost->cost_type==GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR) && cost->cost_value==0))
- *
- * @param cls closure
- * @param peer peer
- * @param addr peer address
- * @param addrlen address length
- * @param cost pointer to the first element of struct GNUNET_TRANSPORT_ATS_Cost_Information[]
- */
-typedef void (*GNUNET_TRANSPORT_CostReport) (void *cls,
-                                            const struct GNUNET_PeerIdentity *peer,
-                                             const void *addr,
-                                             uint16_t addrlen,
-                                            struct GNUNET_TRANSPORT_ATS_Information * cost);
-
-
 /**
  * Function that returns a HELLO message.
  */ 
@@ -236,11 +216,6 @@ struct GNUNET_TRANSPORT_PluginEnvironment
    */
   GNUNET_TRANSPORT_SessionEnd session_end;
 
-  /**
-   * Inform service about costs for using this transport plugin
-   */
-  GNUNET_TRANSPORT_CostReport cost_report;
-
   /**
    * What is the maximum number of connections that this transport
    * should allow?  Transports that do not have sessions (such as
index 7b9ffe2ee67289ec5c1b3fdf009db1c813771ece..eff799d03cdb6e462933114e9d8f848d6ba45613 100644 (file)
@@ -182,29 +182,6 @@ plugin_env_session_end (void *cls,
 }
 
 
-/**
- * Function called whenever the plugin has to notify ATS about costs for using this transport
- *
- * The cost will be passed as struct GNUNET_TRANSPORT_ATS_Cost_Information[]
- * This array is 0-terminated, so the last element will be a pair:
- * ((cost->cost_type==GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR) && cost->cost_value==0))
- *
- * @param cls closure
- * @param peer peer
- * @param addr peer address
- * @param addrlen address length
- * @param cost pointer to the first element of struct GNUNET_TRANSPORT_ATS_Cost_Information[]
- */
-static void 
-plugin_env_cost_notification (void *cls,
-                             const struct GNUNET_PeerIdentity *peer,
-                             const void *addr,
-                             uint16_t addrlen,
-                             struct GNUNET_TRANSPORT_ATS_Information * cost)
-{
-}
-
-
 /**
  * Function called when the service shuts down.  Unloads our plugins
  * and cancels pending validations.
@@ -303,8 +280,7 @@ run (void *cls,
   GST_blacklist_start (server);
   GST_plugins_load (&plugin_env_receive_callback,
                    &plugin_env_address_change_notification, 
-                   &plugin_env_session_end,
-                   &plugin_env_cost_notification);
+                   &plugin_env_session_end);
   GST_ats = GNUNET_ATS_init (GST_cfg,
                          NULL, // FIXME...
                          NULL); // FIXME...
index bacafa5f30b781ba438660d442b9e7f6c45b6c64..7fcc6f80d6c37e314939d6a63892eb65f46cb795 100644 (file)
@@ -89,13 +89,11 @@ static struct TransportPlugin *plugins_tail;
  * @param address_cb function to call when our public addresses changed
  * @param traffic_cb function to call for flow control
  * @param session_end_cb function to call when a session was terminated
- * @param cost_cb function to call about ATS cost changes
  */
 void 
 GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
                  GNUNET_TRANSPORT_AddressNotification address_cb,
-                 GNUNET_TRANSPORT_SessionEnd session_end_cb,
-                 GNUNET_TRANSPORT_CostReport cost_cb)
+                 GNUNET_TRANSPORT_SessionEnd session_end_cb)
 {
   struct TransportPlugin *plug;
   unsigned long long tneigh;
index ee93918c795e33e160b32fcc1abf4696832ca617..2852ab4bb5ab9a4694898bf2904526667d4f7994 100644 (file)
  *
  * @param recv_cb function to call when data is received
  * @param address_cb function to call when our public addresses changed
- * @param traffic_cb function to call for flow control
  * @param session_end_cb function to call when a session was terminated
- * @param cost_cb function to call about ATS cost changes
  */
 void 
 GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
                  GNUNET_TRANSPORT_AddressNotification address_cb,
-                 GNUNET_TRANSPORT_SessionEnd session_end_cb,
-                 GNUNET_TRANSPORT_CostReport cost_cb);
+                 GNUNET_TRANSPORT_SessionEnd session_end_cb);
 
 
 /**