[GNUnet-SVN] r14837 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-04-04 10:25:09 +0200 (Mon, 04 Apr 2011)
New Revision: 14837

Modified:
   gnunet/src/transport/gnunet-service-transport.c
Log:
moved define


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-04-04 08:22:39 UTC 
(rev 14836)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-04-04 08:25:09 UTC 
(rev 14837)
@@ -5598,7 +5598,24 @@
        double c_1;
 };
 
+struct ATS_ressource
+{
+       int atis_index;
+       char * config_parameter;
+};
 
+static struct ATS_ressource ressources[] =
+{
+               {1, "COST_FINANCIAL_PER_VOLUME"},
+               {2, "COST_FINANCIAL_PER_TIME"},
+               {3, "COST_COMPUTATIONAL"},
+               {4, "COST_ENERGY_CONSUMPTION"},
+               {5, "COST_CONNECT"},
+               {6, "COST_BANDWITH_AVAILABLE"},
+               {7, "COST_NETWORK_OVERHEAD"},
+};
+static int available_ressources = 7;
+
 struct ATS_info
 {
        struct GNUNET_CONTAINER_MultiHashMap * peers;
@@ -5650,7 +5667,6 @@
        return GNUNET_SYSERR;
 #else
        if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "glpk installed\n");
-#endif
 
        glp_prob *prob;
 
@@ -5692,7 +5708,7 @@
 
        if (c_mechs==0)
        {
-               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No addresses for bw 
distribution available\n", c_peers);
+               if (DEBUG_ATS) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No 
addresses for bw distribution available\n", c_peers);
                return 0;
        }
 
@@ -6145,7 +6161,7 @@
        GNUNET_free(peers);
 
        return c_mechs;
-
+#endif
 }
 
 void ats_calculate_bandwidth_distribution ()
@@ -6521,6 +6537,8 @@
 
   ats = ats_init();
 
+  struct ATS_ressource_cost test = {NULL,NULL, 1,1.5,1.5};
+
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Transport service ready.\n"));
 #endif