[GNUnet-SVN] r16484 - in gnunet/src: include transport

[gnunet]

Author: grothoff
Date: 2011-08-13 12:40:10 +0200 (Sat, 13 Aug 2011)
New Revision: 16484

Modified:
   gnunet/src/include/gnunet_transport_plugin.h
   gnunet/src/transport/gnunet-service-transport-new.c
   gnunet/src/transport/gnunet-service-transport_plugins.c
   gnunet/src/transport/gnunet-service-transport_plugins.h
Log:
cost report is not used

Modified: gnunet/src/include/gnunet_transport_plugin.h
===================================================================
--- gnunet/src/include/gnunet_transport_plugin.h        2011-08-13 10:37:53 UTC 
(rev 16483)
+++ gnunet/src/include/gnunet_transport_plugin.h        2011-08-13 10:40:10 UTC 
(rev 16484)
@@ -159,26 +159,6 @@
 
 
 /**
- * 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.
  */ 
 typedef const struct GNUNET_MessageHeader * 
(*GNUNET_TRANSPORT_GetHelloCallback)(void);
@@ -237,11 +217,6 @@
   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
    * UDP) can ignore this value.

Modified: gnunet/src/transport/gnunet-service-transport-new.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport-new.c 2011-08-13 10:37:53 UTC 
(rev 16483)
+++ gnunet/src/transport/gnunet-service-transport-new.c 2011-08-13 10:40:10 UTC 
(rev 16484)
@@ -183,29 +183,6 @@
 
 
 /**
- * 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 @@
   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...

Modified: gnunet/src/transport/gnunet-service-transport_plugins.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_plugins.c     2011-08-13 
10:37:53 UTC (rev 16483)
+++ gnunet/src/transport/gnunet-service-transport_plugins.c     2011-08-13 
10:40:10 UTC (rev 16484)
@@ -89,13 +89,11 @@
  * @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;

Modified: gnunet/src/transport/gnunet-service-transport_plugins.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_plugins.h     2011-08-13 
10:37:53 UTC (rev 16483)
+++ gnunet/src/transport/gnunet-service-transport_plugins.h     2011-08-13 
10:40:10 UTC (rev 16484)
@@ -40,15 +40,12 @@
  *
  * @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);
 
 
 /**