- replace deprecated INCLUDES with AM_CPPFLAGS

[oweals/gnunet.git] / src / experimentation / gnunet-daemon-experimentation_experiments.c

diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
index 28becc42d0df6f4031a6b42f1b212f2e821ac1f0..c787c34167f718eb9a5936cc6923f03c326c5bc8 100644 (file)
--- a/src/experimentation/gnunet-daemon-experimentation_experiments.c
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -38,7 +38,7 @@
  */
 struct Issuer
 {
-       struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey;
+       struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 };
 
 
@@ -86,7 +86,7 @@ int free_experiment (void *cls,
                                                                                 void *value)
 {
        struct Experiment *e = value;
-       GNUNET_CONTAINER_multihashmap_remove (experiments, key, value);
+       GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (experiments, key, value));
        GNUNET_free_non_null (e->description);
        GNUNET_free_non_null (e->name);
        GNUNET_free (e);
@@ -107,7 +107,7 @@ int free_issuer (void *cls,
                                                                 void *value)
 {
        struct Issuer *i = value;
-       GNUNET_CONTAINER_multihashmap_remove (valid_issuers, key, value);
+       GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (valid_issuers, key, value));
        GNUNET_free (i);
        return GNUNET_OK;
 }
@@ -158,7 +158,7 @@ find_it (void *cls,
 
        if (0 != strcmp(e->name, find_ctx->name))
                return GNUNET_OK;
-       if (e->version.abs_value != find_ctx->version.abs_value)
+       if (e->version.abs_value_us != find_ctx->version.abs_value_us)
                return GNUNET_OK;
 
        find_ctx->res = e;
@@ -272,8 +272,8 @@ int GNUNET_EXPERIMENTATION_experiments_add (struct Issuer *i,
                        e->name,
                        GNUNET_STRINGS_absolute_time_to_string (start),
                        GNUNET_STRINGS_absolute_time_to_string (stop),
-                       (long long unsigned int) frequency.rel_value / 1000,
-                       (long long unsigned int) duration.rel_value / 1000);
+                       (long long unsigned int) frequency.rel_value_us / 1000000LL,
+                       (long long unsigned int) duration.rel_value_us / 1000000LL);
        GNUNET_CONTAINER_multihashmap_put (experiments, &e->issuer.hashPubKey, e, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
   GNUNET_STATISTICS_set (GED_stats, "# experiments", GNUNET_CONTAINER_multihashmap_size (experiments), GNUNET_NO);
 
@@ -306,7 +306,7 @@ void exp_file_iterator (void *cls,
        struct GNUNET_TIME_Relative frequency;
        struct GNUNET_TIME_Relative duration;
 
-       GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Parsing section `%s'\n", name);
+       //GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Parsing section `%s'\n", name);
 
        /* Mandatory fields */
 
@@ -336,7 +336,7 @@ void exp_file_iterator (void *cls,
                        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Experiment `%s': Version missing or invalid \n"), name);
                        return;
        }
-       version.abs_value = number;
+       version.abs_value_us = number; // FIXME: what is this supposed to be? Version != TIME!???
 
        /* Required capabilities */
        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "CAPABILITIES", &number))
@@ -354,18 +354,17 @@ void exp_file_iterator (void *cls,
        /* Optional fields */
 
        /* Description */
-       GNUNET_CONFIGURATION_get_value_string (exp, name, "DESCRIPTION", &description);
+       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (exp, name, "DESCRIPTION", &description))
+               description = NULL;
 
-
-
-       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value))
+       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value_us))
                        start = GNUNET_TIME_UNIT_ZERO_ABS;
 
        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "FREQUENCY", &frequency))
                        frequency = EXP_DEFAULT_EXP_FREQ;
        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "DURATION", &duration))
                        duration = EXP_DEFAULT_EXP_DUR;
-       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "STOP", (long long unsigned int *)&stop.abs_value))
+       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "STOP", (long long unsigned int *)&stop.abs_value_us))
                        stop = GNUNET_TIME_UNIT_FOREVER_ABS;
 
        GNUNET_EXPERIMENTATION_experiments_add (i, name, issuer, version,
@@ -410,7 +409,7 @@ GED_experiments_start ()
        char *pubkey;
        char *pos;
        struct GNUNET_PeerIdentity issuer_ID;
-       struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pub;
+       struct GNUNET_CRYPTO_EccPublicSignKey pub;
        struct GNUNET_HashCode hash;
 
        /* Load valid issuer */
@@ -430,7 +429,7 @@ GED_experiments_start ()
                }
                else
                {
-                               GNUNET_log (GNUNET_ERROR_TYPE_INFO, "`%s' is a valid issuer \n", GNUNET_i2s (&issuer_ID));
+                               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' is a valid issuer \n", GNUNET_i2s (&issuer_ID));
                                i = GNUNET_malloc (sizeof (struct Issuer));
                                GNUNET_CONTAINER_multihashmap_put (valid_issuers, &issuer_ID.hashPubKey,
                                                i, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
@@ -449,7 +448,7 @@ GED_experiments_start ()
 
        if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (GED_cfg, "EXPERIMENTATION", "PUBKEY", &pubkey))
        {
-                       if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_key_from_string(pubkey, strlen (pubkey), &pub))
+                       if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_sign_key_from_string(pubkey, strlen (pubkey), &pub))
                        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid public key `%s'\n"), pubkey);
                        else
                        {
@@ -468,7 +467,7 @@ GED_experiments_start ()
        GSE_my_issuer_count = GNUNET_CONTAINER_multihashmap_size (valid_issuers);
        GSE_my_issuer = GNUNET_malloc (GSE_my_issuer_count * sizeof (struct Experimentation_Issuer));
        GNUNET_CONTAINER_multihashmap_iterate (valid_issuers, &create_issuer, GSE_my_issuer);
-       GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Daemon has %u issuers\n"), GSE_my_issuer_count);
+       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon has %u issuers\n", GSE_my_issuer_count);
 
   experiments = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
   /* Load experiments from file */