[GNUnet-SVN] r21488 - in gnunet/src: ats mesh

[gnunet]

Author: grothoff
Date: 2012-05-15 02:56:10 +0200 (Tue, 15 May 2012)
New Revision: 21488

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
   gnunet/src/ats/perf_ats_mlp.c
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
-help seaspider some more

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-05-15 00:49:26 UTC 
(rev 21487)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-05-15 00:56:10 UTC 
(rev 21488)
@@ -1317,8 +1317,8 @@
     /* Check if defined quota could make problem unsolvable */
     if (((n_min * b_min) > quota_out) && (GNUNET_ATS_NET_UNSPECIFIED != 
quotas[c]))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Inconsistent quota configuration 
value `%s': " \
-          "outbound quota (%u Bps) too small for combination of minimum 
connections and minimum bandwidth per peer (%u * %u Bps = %u)\n", entry_out, 
quota_out, n_min, b_min, n_min * b_min);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Inconsistent quota configuration 
value `%s': " 
+                 "outbound quota (%u Bps) too small for combination of minimum 
connections and minimum bandwidth per peer (%u * %u Bps = %u)\n", entry_out, 
quota_out, n_min, b_min, n_min * b_min);
 
       GAS_mlp_done(mlp);
       mlp = NULL;

Modified: gnunet/src/ats/perf_ats_mlp.c
===================================================================
--- gnunet/src/ats/perf_ats_mlp.c       2012-05-15 00:49:26 UTC (rev 21487)
+++ gnunet/src/ats/perf_ats_mlp.c       2012-05-15 00:56:10 UTC (rev 21488)
@@ -178,7 +178,7 @@
 
 static void
 check (void *cls, char *const *args, const char *cfgfile,
-       const struct GNUNET_CONFIGURATION_Handle *cfg)
+       const  struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   unsigned int c = 0;
   unsigned int c2 = 0;
@@ -289,7 +289,7 @@
           GNUNET_assert (GNUNET_OK == ctx.lp_result);
           GNUNET_assert (GNUNET_OK == ctx.mlp_result);
           if (GNUNET_YES == numeric)
-            printf ("%u;%u;%llu;%llu\n",mlp->c_p, mlp->addr_in_problem, (long 
long unsigned int) ctx.lp_duration.rel_value, (long long unsigned int) 
ctx.mlp_duration.rel_value);
+            printf ("%u;%u;%llu;%llu\n",mlp->c_p, mlp->addr_in_problem, 
(unsigned long long) ctx.lp_duration.rel_value, (unsigned long long) 
ctx.mlp_duration.rel_value);
           else
             GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Problem solved for %u peers 
with %u address successfully (LP: %llu ms / MLP: %llu ms)\n",
                 mlp->c_p, mlp->addr_in_problem, ctx.lp_duration.rel_value, 
ctx.mlp_duration.rel_value);
@@ -312,13 +312,13 @@
           GNUNET_assert (GNUNET_OK == uctx.mlp_result);
           if (GNUNET_YES == numeric)
             printf ("%u;%u;%llu;%llu;%llu;%llu\n",mlp->c_p, 
mlp->addr_in_problem,
-                (long long unsigned int) ctx.lp_duration.rel_value, (long long 
unsigned int) ctx.mlp_duration.rel_value,
-                (long long unsigned int) uctx.lp_duration.rel_value, (long 
long unsigned int) uctx.mlp_duration.rel_value);
+                (unsigned long long) ctx.lp_duration.rel_value, (unsigned long 
long) ctx.mlp_duration.rel_value,
+                (unsigned long long) uctx.lp_duration.rel_value, (unsigned 
long long) uctx.mlp_duration.rel_value);
           else
             GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Updated problem solved for %u 
peers with %u address successfully (Initial: LP/MLP: %llu/%llu ms, Update: 
%llu/%llu ms)\n",
                 mlp->c_p, mlp->addr_in_problem,
-                (long long unsigned int) ctx.lp_duration.rel_value, (long long 
unsigned int) ctx.mlp_duration.rel_value,
-                (long long unsigned int) uctx.lp_duration.rel_value, (long 
long unsigned int) uctx.mlp_duration.rel_value);
+                (unsigned long long) ctx.lp_duration.rel_value, (unsigned long 
long) ctx.mlp_duration.rel_value,
+                (unsigned long long) uctx.lp_duration.rel_value, (unsigned 
long long) uctx.mlp_duration.rel_value);
         }
         else
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Solving updated problem with 
%u peers and %u addresses failed\n", c, c2);

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-05-15 00:49:26 UTC (rev 
21487)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-05-15 00:56:10 UTC (rev 
21488)
@@ -685,7 +685,7 @@
 
   GNUNET_DHT_put (dht_handle,   /* DHT handle */
                   &my_full_id.hashPubKey,       /* Key to use */
-                  10U,          /* Replication level */
+                  10,          /* Replication level */
                   GNUNET_DHT_RO_RECORD_ROUTE | 
GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,    /* DHT options */
                   GNUNET_BLOCK_TYPE_TEST,       /* Block type */
                   sizeof (my_full_id),  /* Size of the data */