mark out todos

src/exchange/taler-exchange-httpd.c

@@ -148,37 +148,9 @@ int TEH_check_invariants_flag;
 bool TEH_suicide;
 
 /**
- * The global manifest with the list supported extensions, sorted by
+ * Global register of extensions
- * TALER_Extension_Type.
- *
- * TODO: This needs to become a dynamic list, once we have a model for
- * extensions as plugins.
- **/
-const struct TALER_Extension TEH_extensions[] = {
-  [TALER_Extension_AgeRestriction] = {
-    .type = TALER_Extension_AgeRestriction,
-    .name = "age_restriction",
-    .critical = false,
-    .config = NULL, // disabled per default
-    /* TODO:
-    .parse_config = &TALER_Extension_AgeRestriction_parse_config,
-    .config_to_json = &TALER_Extension_AgeRestriction_config_to_json,
  */
-  },
+struct TALER_Extension *TEH_extensions;
-  [TALER_Extension_Peer2Peer] = {
-    .type = TALER_Extension_Peer2Peer,
-    .name = "peer2peer",
-    .critical = false,
-    .config = NULL, // disabled per default
-  },
-  /* terminator */
-  [TALER_Extension_Max] = {
-    .type = TALER_Extension_Max,
-    .name = NULL,
-    .critical = false,
-    .config = NULL,
-  },
-};
 
 /**
  * Value to return from main()

src/exchange/taler-exchange-httpd.h

@@ -204,7 +204,7 @@ extern struct GNUNET_CURL_Context *TEH_curl_ctx;
 /**
  * The manifest of the available extensions, NULL terminated
  */
-extern const struct TALER_Extension TEH_extensions[];
+extern struct TALER_Extension *TEH_extensions;
 
 /**
  * @brief Struct describing an URL and the handler for it.

src/exchange/taler-exchange-httpd_extensions.c

@@ -26,6 +26,47 @@
 #include "taler_mhd_lib.h"
 #include <jansson.h>
 
+/**
+ * Create a list with the extensions for Age Restriction and Peer2Peer
+ *
+ * TODO oec
+ */
+static struct TALER_Extension *
+register_known_extensions ()
+{
+  /* TODO oec
+   * - create list of correct size, or linked list?
+   * - fill data for age restriction and peer2peer
+   * - set function pointers for parser and json-converter
+   * - set function pointers for notimplemented?
+   */
+/**
+ * The global manifest with the list supported extensions, sorted by
+ * TALER_Extension_Type.
+ *
+ * TODO: This needs to become a dynamic list, once we have a model for
+ * extensions as plugins.
+struct TALER_Extension *TEH_extensions[] = {
+  [TALER_Extension_AgeRestriction] = {
+    .type = TALER_Extension_AgeRestriction,
+    .name = "age_restriction",
+    .critical = false,
+    .config = NULL, // disabled per default
+    // .parse_config = &TALER_Extension_AgeRestriction_parse_config,
+    // .config_to_json = &TALER_Extension_AgeRestriction_config_to_json,
+  },
+  [TALER_Extension_Peer2Peer] = {
+    .type = TALER_Extension_Peer2Peer,
+    .name = "peer2peer",
+    .critical = false,
+    .config = NULL, // disabled per default
+  },
+};
+ **/
+
+  return NULL;
+}
+
 
 /**
  * Handler listening for extensions updates by other exchange
@@ -85,7 +126,7 @@ extension_update_event_cb (void *cls,
     }
 
     /*
-     * TODO:
+     * TODO oec:
      * - parse string as json
      * - update global config
      */
@@ -98,6 +139,8 @@ extension_update_event_cb (void *cls,
 enum GNUNET_GenericReturnValue
 TEH_extensions_init ()
 {
+  // TEH_extensions = register_known_extensions();
+
   struct GNUNET_DB_EventHeaderP ev = {
     .size = htons (sizeof (ev)),
     .type = htons (TALER_DBEVENT_EXCHANGE_EXTENSIONS_UPDATED),

src/exchange/taler-exchange-httpd_management_extensions.c

@@ -179,6 +179,7 @@ TEH_handler_management_post_extensions (
   };
   MHD_RESULT ret;
 
+  // Parse the top level json structure
   {
     enum GNUNET_GenericReturnValue res;
 
@@ -191,6 +192,7 @@ TEH_handler_management_post_extensions (
       return MHD_YES; /* failure */
   }
 
+  // Ensure we have two arrays of the same size
   if (! (json_is_array (extensions) &&
          json_is_array (extensions_sigs)) )
   {
@@ -223,6 +225,7 @@ TEH_handler_management_post_extensions (
   sec.extensions_sigs = GNUNET_new_array (sec.num_extensions,
                                           struct TALER_MasterSignatureP);
 
+  // Now parse individual extensions and signatures from those arrays.
   for (unsigned int i = 0; i<sec.num_extensions; i++)
   {
     // 1. parse the extension out of the json
@@ -327,6 +330,7 @@ TEH_handler_management_post_extensions (
      */
     json_incref (sec.extensions[i].config);
     GNUNET_JSON_parse_free (ext_spec);
+
   } /* for-loop */
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,