[GNUnet-SVN] r26142 - in gnunet/src: ats include util

[gnunet]

Author: wachs
Date: 2013-02-15 17:06:59 +0100 (Fri, 15 Feb 2013)
New Revision: 26142

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
   gnunet/src/include/gnunet_ats_service.h
   gnunet/src/util/crypto_ecc.c
Log:
changes


Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2013-02-15 15:04:17 UTC 
(rev 26141)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2013-02-15 16:06:59 UTC 
(rev 26142)
@@ -1100,7 +1100,7 @@
     if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", 
entry_out, &quota_out_str))
     {
       res = GNUNET_NO;
-      if (0 == strcmp(quota_out_str, BIG_M_STRING))
+      if (0 == strcmp(quota_out_str, GNUNET_ATS_MaxBandwidthString))
       {
         out_dest[c] = GNUNET_ATS_MaxBandwidth;
         res = GNUNET_YES;
@@ -1134,7 +1134,7 @@
     if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", 
entry_in, &quota_in_str))
     {
       res = GNUNET_NO;
-      if (0 == strcmp(quota_in_str, BIG_M_STRING))
+      if (0 == strcmp(quota_in_str, GNUNET_ATS_MaxBandwidthString))
       {
         in_dest[c] = GNUNET_ATS_MaxBandwidth;
         res = GNUNET_YES;

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2013-02-15 
15:04:17 UTC (rev 26141)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2013-02-15 
16:06:59 UTC (rev 26142)
@@ -45,6 +45,8 @@
  * - Initialization
  *
  *
+ *
+ *
  * For each peer only a single is selected and marked as "active" in the 
address
  * struct.
  *

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2013-02-15 
15:04:17 UTC (rev 26141)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2013-02-15 
16:06:59 UTC (rev 26142)
@@ -28,8 +28,6 @@
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-ats_addresses.h"
 
-#define BIG_M_STRING "unlimited"
-
 /**
  * ATS simplistic solver
  *

Modified: gnunet/src/include/gnunet_ats_service.h
===================================================================
--- gnunet/src/include/gnunet_ats_service.h     2013-02-15 15:04:17 UTC (rev 
26141)
+++ gnunet/src/include/gnunet_ats_service.h     2013-02-15 16:06:59 UTC (rev 
26142)
@@ -59,7 +59,13 @@
  */
 #define GNUNET_ATS_DefaultBandwidth 65536
 
+
 /**
+ * Textual equivalent for GNUNET_ATS_MaxBandwidth
+ */
+#define GNUNET_ATS_MaxBandwidthString "unlimited"
+
+/**
  * Maximum bandwidth assigned to a network : 4095 MB/s
  */
 #define GNUNET_ATS_MaxBandwidth UINT32_MAX

Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c        2013-02-15 15:04:17 UTC (rev 26141)
+++ gnunet/src/util/crypto_ecc.c        2013-02-15 16:06:59 UTC (rev 26142)
@@ -1122,7 +1122,7 @@
   }
 #else
   /* use broken version, insecure! */
-  GNUNET_break (0);
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("To be implemented: not secure at 
the moment, please read README"));
   slen = sprintf ((char*) sdata_buf, "FIXME-this is not key material");
 #endif
   gcry_sexp_release (data);