[GNUnet-SVN] r19085 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-01-11 14:18:59 +0100 (Wed, 11 Jan 2012)
New Revision: 19085

Modified:
   gnunet/src/ats/ats.conf
   gnunet/src/ats/gnunet-service-ats_addresses.c
Log:
mlp configuration


Modified: gnunet/src/ats/ats.conf
===================================================================
--- gnunet/src/ats/ats.conf     2012-01-11 12:41:23 UTC (rev 19084)
+++ gnunet/src/ats/ats.conf     2012-01-11 13:18:59 UTC (rev 19085)
@@ -10,7 +10,7 @@
 UNIXPATH = /tmp/gnunet-service-ats.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
-
+MLP = NO
 WAN_QUOTA_IN = 65536
 WAN_QUOTA_OUT = 65536
 # ATS options

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2012-01-11 12:41:23 UTC 
(rev 19084)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2012-01-11 13:18:59 UTC 
(rev 19085)
@@ -75,6 +75,12 @@
 
 };
 
+enum ATS_Mode
+{
+       SIMPLE,
+       MLP
+};
+
 static struct GNUNET_CONTAINER_MultiHashMap *addresses;
 
 static unsigned long long wan_quota_in;
@@ -83,6 +89,8 @@
 
 static unsigned int active_addr_count;
 
+static int ats_mode;
+
 /**
  * Update a bandwidth assignment for a peer.  This trivial method currently
  * simply assigns the same share to all active connections.
@@ -480,6 +488,33 @@
                  GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
                                                       "WAN_QUOTA_OUT",
                                                       &wan_quota_out));
+
+
+
+  switch (GNUNET_CONFIGURATION_get_value_yesno (cfg, "ats", "MLP"))
+  {
+       /* MLP = YES */
+       case GNUNET_YES:
+#if !HAVE_LIBGLPK
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP mode was configured, 
but libglpk is not installed, switching to simple mode");
+               ats_mode = SIMPLE;
+               break;
+#else
+               ats_mode = MLP;
+#endif
+               break;
+       /* MLP = NO */
+       case GNUNET_NO:
+               ats_mode = SIMPLE;
+               break;
+       /* No configuration value */
+       case GNUNET_SYSERR:
+               ats_mode = SIMPLE;
+               break;
+       default:
+               break;
+  }
+
   addresses = GNUNET_CONTAINER_multihashmap_create (128);
 }