1 files changed, 134 insertions, 134 deletions

diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 9c5e90db..f3f8bee9 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -27,15 +27,15 @@
 #include <GNUnet/gnunet_protocols.h>
 #include "functions.h"
 
-#define FUNCTIONS_DEBUG NO
+#define FUNCTIONS_DEBUG GNUNET_NO
 
 static StatPair *lastStatValues;
 
 static unsigned int lsv_size;
 
-static struct ClientServerConnection *sock;
+static struct GNUNET_ClientServerConnection *sock;
 
-static struct MUTEX *lock;
+static struct GNUNET_Mutex *lock;
 
 static long connectionGoal;
 
@@ -47,12 +47,12 @@ static struct GE_Context *ectx;
 
 static struct GC_Configuration *cfg;
 
-static struct CronManager *cron;
+static struct GNUNET_CronManager *cron;
 
 static int
 getStatValue (long long *value,
               long long *lvalue,
-              cron_t * dtime, const char *optName, int monotone)
+              GNUNET_CronTime * dtime, const char *optName, int monotone)
 {
   unsigned int i;
 
@@ -68,9 +68,9 @@ getStatValue (long long *value,
             *lvalue = lastStatValues[i].lvalue;
           if (dtime != NULL)
             *dtime = lastStatValues[i].delta;
-          if ((monotone == YES) && (lvalue != NULL) && (*lvalue > *value))
-            return SYSERR;      /* gnunetd restart? */
-          return OK;
+          if ((monotone == GNUNET_YES) && (lvalue != NULL) && (*lvalue > *value))
+            return GNUNET_SYSERR;      /* gnunetd restart? */
+          return GNUNET_OK;
         }
     }
 #if FUNCTIONS_DEBUG
@@ -78,7 +78,7 @@ getStatValue (long long *value,
           GE_DEBUG | GE_DEVELOPER | GE_REQUEST,
           "Statistic not found: `%s'\n", optName);
 #endif
-  return SYSERR;
+  return GNUNET_SYSERR;
 }
 
 static void
@@ -88,13 +88,13 @@ updateConnectionGoal (void *unused)
   char *availableDown;
   char *availableUp;
 
-  MUTEX_LOCK (lock);
-  cmh = getConfigurationOptionValue (sock, "gnunetd", "connection-max-hosts");
-  availableDown = getConfigurationOptionValue (sock,
+  GNUNET_mutex_lock (lock);
+  cmh = GNUNET_get_daemon_configuration_value (sock, "gnunetd", "connection-max-hosts");
+  availableDown = GNUNET_get_daemon_configuration_value (sock,
                                                "LOAD", "MAXNETDOWNBPSTOTAL");
-  availableUp = getConfigurationOptionValue (sock,
+  availableUp = GNUNET_get_daemon_configuration_value (sock,
                                              "LOAD", "MAXNETUPBPSTOTAL");
-  MUTEX_UNLOCK (lock);
+  GNUNET_mutex_unlock (lock);
   if (cmh == NULL)
     connectionGoal = 0;
   else
@@ -108,9 +108,9 @@ updateConnectionGoal (void *unused)
   else
     bandup = atol (availableUp);
 
-  FREENONNULL (cmh);
-  FREENONNULL (availableDown);
-  FREENONNULL (availableUp);
+  GNUNET_free_non_null (cmh);
+  GNUNET_free_non_null (availableDown);
+  GNUNET_free_non_null (availableUp);
 }
 
 static int
@@ -119,11 +119,11 @@ getConnectedNodesStat (const void *closure, gfloat ** data)
   long long val;
 
   if (connectionGoal == 0)
-    return SYSERR;
-  if (OK != getStatValue (&val, NULL, NULL, "# of connected peers", NO))
-    return SYSERR;
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&val, NULL, NULL, "# of connected peers", GNUNET_NO))
+    return GNUNET_SYSERR;
   data[0][0] = ((gfloat) val) / connectionGoal;
-  return OK;
+  return GNUNET_OK;
 }
 
 static int
@@ -134,21 +134,21 @@ getLoadStat (const void *closure, gfloat ** data)
   long long valu;
   long long vald;
 
-  if (OK != getStatValue (&valc, NULL, NULL, "% of allowed cpu load", NO))
-    return SYSERR;
-  if (OK != getStatValue (&vali, NULL, NULL, "% of allowed io load", NO))
-    return SYSERR;
-  if (OK != getStatValue (&valu,
-                          NULL, NULL, "% of allowed network load (up)", NO))
-    return SYSERR;
-  if (OK != getStatValue (&vald,
-                          NULL, NULL, "% of allowed network load (down)", NO))
-    return SYSERR;
+  if (GNUNET_OK != getStatValue (&valc, NULL, NULL, "% of allowed cpu load", GNUNET_NO))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&vali, NULL, NULL, "% of allowed io load", GNUNET_NO))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&valu,
+                          NULL, NULL, "% of allowed network load (up)", GNUNET_NO))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&vald,
+                          NULL, NULL, "% of allowed network load (down)", GNUNET_NO))
+    return GNUNET_SYSERR;
   data[0][0] = (gfloat) valc / 100.0;
   data[0][1] = (gfloat) vali / 100.0;
   data[0][2] = (gfloat) valu / 100.0;
   data[0][3] = (gfloat) vald / 100.0;
-  return OK;
+  return GNUNET_OK;
 }
 
 static int
@@ -157,15 +157,15 @@ getQuotaStat (const void *closure, gfloat ** data)
   long long allowed;
   long long have;
 
-  if (OK != getStatValue (&allowed,
-                          NULL, NULL, "# bytes allowed in datastore", NO))
-    return SYSERR;
+  if (GNUNET_OK != getStatValue (&allowed,
+                          NULL, NULL, "# bytes allowed in datastore", GNUNET_NO))
+    return GNUNET_SYSERR;
   if (allowed == 0)
-    return SYSERR;
-  if (OK != getStatValue (&have, NULL, NULL, "# bytes in datastore", NO))
-    return SYSERR;
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO))
+    return GNUNET_SYSERR;
   data[0][0] = ((gfloat) have) / allowed;
-  return OK;
+  return GNUNET_OK;
 }
 
 static int
@@ -183,43 +183,43 @@ getTrafficRecvStats (const void *closure, gfloat ** data)
   long long lqueries;
   long long lhellos;
   long long lrlimit;
-  cron_t dtime;
+  GNUNET_CronTime dtime;
   char *buffer;
 
-  if (OK != getStatValue (&total, &ltotal, &dtime, "# bytes received", YES))
-    return SYSERR;
-  if (OK != getStatValue (&noise,
-                          &lnoise, NULL, "# bytes of noise received", YES))
-    return SYSERR;
-  buffer = MALLOC (512);
-  SNPRINTF (buffer, 512, "# bytes received of type %d", P2P_PROTO_gap_RESULT);
-  if (OK != getStatValue (&content, &lcontent, NULL, buffer, YES))
+  if (GNUNET_OK != getStatValue (&total, &ltotal, &dtime, "# bytes received", GNUNET_YES))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&noise,
+                          &lnoise, NULL, "# bytes of noise received", GNUNET_YES))
+    return GNUNET_SYSERR;
+  buffer = GNUNET_malloc (512);
+  GNUNET_snprintf (buffer, 512, "# bytes received of type %d", P2P_PROTO_gap_RESULT);
+  if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
     {
       content = 0;
       lcontent = 0;
     }
-  SNPRINTF (buffer, 512, "# bytes received of type %d", p2p_PROTO_hello);
-  if (OK != getStatValue (&hellos, &lhellos, NULL, buffer, YES))
+  GNUNET_snprintf (buffer, 512, "# bytes received of type %d", p2p_PROTO_hello);
+  if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
     {
       hellos = 0;
       lhellos = 0;
     }
-  SNPRINTF (buffer, 512, "# bytes received of type %d", P2P_PROTO_gap_QUERY);
-  if (OK != getStatValue (&queries, &lqueries, NULL, buffer, YES))
+  GNUNET_snprintf (buffer, 512, "# bytes received of type %d", P2P_PROTO_gap_QUERY);
+  if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
     {
       queries = 0;
       lqueries = 0;
     }
-  if (OK != getStatValue (&rlimit,
+  if (GNUNET_OK != getStatValue (&rlimit,
                           &lrlimit,
-                          NULL, "# total bytes per second receive limit", NO))
+                          NULL, "# total bytes per second receive limit", GNUNET_NO))
     {
       rlimit = 0;
       lrlimit = 0;
     }
-  FREE (buffer);
+  GNUNET_free (buffer);
   if (banddown == 0)
-    return SYSERR;
+    return GNUNET_SYSERR;
 
   total -= ltotal;
   noise -= lnoise;
@@ -234,18 +234,18 @@ getTrafficRecvStats (const void *closure, gfloat ** data)
       data[0][3] = 0.0;
       data[0][4] = 0.0;
       data[0][5] = 0.0;
-      return OK;
+      return GNUNET_OK;
     }
-  data[0][0] = ((gfloat) noise) / (banddown * dtime / cronSECONDS);     /* red */
-  data[0][1] = ((gfloat) (content + noise)) / (banddown * dtime / cronSECONDS); /* green */
-  data[0][2] = ((gfloat) (queries + content + noise)) / (banddown * dtime / cronSECONDS);       /* yellow */
-  data[0][3] = ((gfloat) (queries + content + noise + hellos)) / (banddown * dtime / cronSECONDS);      /* blue */
-  data[0][4] = ((gfloat) total) / (banddown * dtime / cronSECONDS);     /* gray */
+  data[0][0] = ((gfloat) noise) / (banddown * dtime / GNUNET_CRON_SECONDS);     /* red */
+  data[0][1] = ((gfloat) (content + noise)) / (banddown * dtime / GNUNET_CRON_SECONDS); /* green */
+  data[0][2] = ((gfloat) (queries + content + noise)) / (banddown * dtime / GNUNET_CRON_SECONDS);       /* yellow */
+  data[0][3] = ((gfloat) (queries + content + noise + hellos)) / (banddown * dtime / GNUNET_CRON_SECONDS);      /* blue */
+  data[0][4] = ((gfloat) total) / (banddown * dtime / GNUNET_CRON_SECONDS);     /* gray */
   data[0][5] = (gfloat) rlimit / banddown;      /* magenta */
 #if 0
   printf ("I: %f %f %f %f\n", data[0][0], data[0][1], data[0][2]);
 #endif
-  return OK;
+  return GNUNET_OK;
 }
 
 static int
@@ -263,45 +263,45 @@ getTrafficSendStats (const void *closure, gfloat ** data)
   long long lqueries;
   long long lhellos;
   long long lslimit;
-  cron_t dtime;
+  GNUNET_CronTime dtime;
   char *buffer;
 
-  if (OK != getStatValue (&total,
-                          &ltotal, &dtime, "# bytes transmitted", YES))
-    return SYSERR;
-  if (OK != getStatValue (&noise, &lnoise, NULL, "# bytes noise sent", YES))
-    return SYSERR;
-  buffer = MALLOC (512);
-  SNPRINTF (buffer,
+  if (GNUNET_OK != getStatValue (&total,
+                          &ltotal, &dtime, "# bytes transmitted", GNUNET_YES))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&noise, &lnoise, NULL, "# bytes noise sent", GNUNET_YES))
+    return GNUNET_SYSERR;
+  buffer = GNUNET_malloc (512);
+  GNUNET_snprintf (buffer,
             512, "# bytes transmitted of type %d", P2P_PROTO_gap_RESULT);
-  if (OK != getStatValue (&content, &lcontent, NULL, buffer, YES))
+  if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
     {
       content = 0;
       lcontent = 0;
     }
-  SNPRINTF (buffer,
+  GNUNET_snprintf (buffer,
             512, "# bytes transmitted of type %d", P2P_PROTO_gap_QUERY);
-  if (OK != getStatValue (&queries, &lqueries, NULL, buffer, YES))
+  if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
     {
       queries = 0;
       lqueries = 0;
     }
-  SNPRINTF (buffer, 512, "# bytes transmitted of type %d", p2p_PROTO_hello);
-  if (OK != getStatValue (&hellos, &lhellos, NULL, buffer, YES))
+  GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d", p2p_PROTO_hello);
+  if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
     {
       queries = 0;
       lqueries = 0;
     }
-  if (OK != getStatValue (&slimit,
+  if (GNUNET_OK != getStatValue (&slimit,
                           &lslimit,
-                          NULL, "# total bytes per second send limit", NO))
+                          NULL, "# total bytes per second send limit", GNUNET_NO))
     {
       slimit = 0;
       lslimit = 0;
     }
-  FREE (buffer);
+  GNUNET_free (buffer);
   if (bandup == 0)
-    return SYSERR;
+    return GNUNET_SYSERR;
   total -= ltotal;
   noise -= lnoise;
   queries -= lqueries;
@@ -315,25 +315,25 @@ getTrafficSendStats (const void *closure, gfloat ** data)
       data[0][3] = 0.0;
       data[0][4] = 0.0;
       data[0][5] = 0.0;
-      return OK;
+      return GNUNET_OK;
     }
-  data[0][0] = ((gfloat) noise) / (bandup * dtime / cronSECONDS);       /* red */
-  data[0][1] = ((gfloat) (noise + content)) / (bandup * dtime / cronSECONDS);   /* green */
-  data[0][2] = ((gfloat) (noise + content + queries)) / (bandup * dtime / cronSECONDS); /* yellow */
-  data[0][3] = ((gfloat) (noise + content + queries + hellos)) / (bandup * dtime / cronSECONDS);        /* blue */
-  data[0][4] = ((gfloat) total) / (bandup * dtime / cronSECONDS);       /* grey */
+  data[0][0] = ((gfloat) noise) / (bandup * dtime / GNUNET_CRON_SECONDS);       /* red */
+  data[0][1] = ((gfloat) (noise + content)) / (bandup * dtime / GNUNET_CRON_SECONDS);   /* green */
+  data[0][2] = ((gfloat) (noise + content + queries)) / (bandup * dtime / GNUNET_CRON_SECONDS); /* yellow */
+  data[0][3] = ((gfloat) (noise + content + queries + hellos)) / (bandup * dtime / GNUNET_CRON_SECONDS);        /* blue */
+  data[0][4] = ((gfloat) total) / (bandup * dtime / GNUNET_CRON_SECONDS);       /* grey */
   data[0][5] = ((gfloat) slimit) / bandup;      /* magenta */
 #if 0
   printf ("O: %f %f %f %f\n", data[0][0], data[0][1], data[0][2], data[0][3]);
 #endif
-  return OK;
+  return GNUNET_OK;
 }
 
 
 static int
 getEffectivenessStats (const void *closure, gfloat ** data)
 {
-  static cron_t last;
+  static GNUNET_CronTime last;
   static double lastdata;
   static double lastavg;
   long long total;
@@ -342,31 +342,31 @@ getEffectivenessStats (const void *closure, gfloat ** data)
   long long ltotal;
   long long lsuccess;
   long long llocal;
-  cron_t now;
+  GNUNET_CronTime now;
 
-  now = get_time ();
-  if (now < last + 2 * cronMINUTES)
+  now = GNUNET_get_time ();
+  if (now < last + 2 * GNUNET_CRON_MINUTES)
     {
       data[0][0] = lastdata;
       data[0][1] = lastavg;
-      return OK;
+      return GNUNET_OK;
     }
   last = now;
-  if (OK != getStatValue (&total,
+  if (GNUNET_OK != getStatValue (&total,
                           &ltotal,
                           NULL,
                           "# gap requests forwarded (counting each peer)",
-                          YES))
-    return SYSERR;
-  if (OK != getStatValue (&success,
+                          GNUNET_YES))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&success,
                           &lsuccess,
-                          NULL, "# gap routing successes (total)", YES))
-    return SYSERR;
-  if (OK != getStatValue (&local,
+                          NULL, "# gap routing successes (total)", GNUNET_YES))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK != getStatValue (&local,
                           &llocal,
                           NULL,
-                          "# gap requests processed: local result", YES))
-    return SYSERR;
+                          "# gap requests processed: local result", GNUNET_YES))
+    return GNUNET_SYSERR;
   total -= ltotal;
   data[0][0] = 0.0;
   if (ltotal + total > 0)
@@ -377,18 +377,18 @@ getEffectivenessStats (const void *closure, gfloat ** data)
   else
     {
       data[0][1] = 0.0;
-      return OK;
+      return GNUNET_OK;
     }
   if (total == 0)
-    return OK;
+    return GNUNET_OK;
   success -= lsuccess;
   local -= llocal;
   if (success <= local)
-    return OK;
+    return GNUNET_OK;
   success -= local;
   lsuccess -= llocal;
   data[0][0] = lastdata = 1.0 * success / total;
-  return OK;
+  return GNUNET_OK;
 }
 
 static int
@@ -401,7 +401,7 @@ statsProcessor (const char *optName, unsigned long long value, void *data)
    * this will predict correctly).
    */
   static unsigned int last;
-  cron_t *delta = data;
+  GNUNET_CronTime *delta = data;
   int j;
   int found;
 
@@ -425,14 +425,14 @@ statsProcessor (const char *optName, unsigned long long value, void *data)
   if (found == -1)
     {
       found = lsv_size;
-      GROW (lastStatValues, lsv_size, lsv_size + 1);
-      lastStatValues[found].statName = STRDUP (optName);
+      GNUNET_array_grow (lastStatValues, lsv_size, lsv_size + 1);
+      lastStatValues[found].statName = GNUNET_strdup (optName);
     }
   lastStatValues[found].lvalue = lastStatValues[found].value;
   lastStatValues[found].value = value;
   lastStatValues[found].delta = *delta;
   last = found + 1;
-  return OK;
+  return GNUNET_OK;
 }
 
 /**
@@ -441,16 +441,16 @@ statsProcessor (const char *optName, unsigned long long value, void *data)
 static void
 updateStatValues (void *unused)
 {
-  static cron_t lastUpdate;
-  cron_t now;
-  cron_t delta;
+  static GNUNET_CronTime lastUpdate;
+  GNUNET_CronTime now;
+  GNUNET_CronTime delta;
 
-  now = get_time ();
+  now = GNUNET_get_time ();
   delta = now - lastUpdate;
-  MUTEX_LOCK (lock);
-  if (OK == STATS_getStatistics (ectx, sock, &statsProcessor, &delta))
+  GNUNET_mutex_lock (lock);
+  if (GNUNET_OK == STATS_getStatistics (ectx, sock, &statsProcessor, &delta))
     lastUpdate = now;
-  MUTEX_UNLOCK (lock);
+  GNUNET_mutex_unlock (lock);
 }
 
 
@@ -461,7 +461,7 @@ StatEntry stats[] = {
    &getConnectedNodesStat,
    NULL,
    1,
-   NO,
+   GNUNET_NO,
    }
   ,
   {
@@ -471,7 +471,7 @@ StatEntry stats[] = {
    &getLoadStat,
    NULL,
    4,
-   NO,
+   GNUNET_NO,
    }
   ,
   {
@@ -480,7 +480,7 @@ StatEntry stats[] = {
    &getQuotaStat,
    NULL,
    1,
-   NO,
+   GNUNET_NO,
    }
   ,
   {
@@ -510,7 +510,7 @@ StatEntry stats[] = {
    &getEffectivenessStats,
    NULL,
    2,
-   NO,
+   GNUNET_NO,
    }
   ,
   {
@@ -519,7 +519,7 @@ StatEntry stats[] = {
    NULL,
    NULL,
    0,
-   NO,
+   GNUNET_NO,
    }
   ,
 };
@@ -535,16 +535,16 @@ init_functions (struct GE_Context *e, struct GC_Configuration *c)
                                      "GNUNET-GTK",
                                      "STATS-INTERVAL",
                                      1,
-                                     99 * cronYEARS,
-                                     30 * cronSECONDS, &UPDATE_INTERVAL);
-  sock = client_connection_create (ectx, cfg);
-  lock = MUTEX_CREATE (NO);
+                                     99 * GNUNET_CRON_YEARS,
+                                     30 * GNUNET_CRON_SECONDS, &UPDATE_INTERVAL);
+  sock = GNUNET_client_connection_create (ectx, cfg);
+  lock = GNUNET_mutex_create (GNUNET_NO);
   cron = gnunet_gtk_get_cron ();
-  cron_add_job (cron,
+  GNUNET_cron_add_job (cron,
                 &updateStatValues, UPDATE_INTERVAL, UPDATE_INTERVAL, NULL);
-  cron_add_job (cron,
+  GNUNET_cron_add_job (cron,
                 &updateConnectionGoal,
-                5 * cronMINUTES, 5 * cronMINUTES, NULL);
+                5 * GNUNET_CRON_MINUTES, 5 * GNUNET_CRON_MINUTES, NULL);
 }
 
 void
@@ -552,13 +552,13 @@ done_functions ()
 {
   int i;
 
-  cron_del_job (cron, &updateConnectionGoal, 5 * cronMINUTES, NULL);
-  cron_del_job (cron, &updateStatValues, UPDATE_INTERVAL, NULL);
-  MUTEX_DESTROY (lock);
-  connection_destroy (sock);
+  GNUNET_cron_del_job (cron, &updateConnectionGoal, 5 * GNUNET_CRON_MINUTES, NULL);
+  GNUNET_cron_del_job (cron, &updateStatValues, UPDATE_INTERVAL, NULL);
+  GNUNET_mutex_destroy (lock);
+  GNUNET_client_connection_destroy (sock);
   for (i = 0; i < lsv_size; i++)
-    FREE (lastStatValues[i].statName);
-  GROW (lastStatValues, lsv_size, 0);
+    GNUNET_free (lastStatValues[i].statName);
+  GNUNET_array_grow (lastStatValues, lsv_size, 0);
   sock = NULL;
 }