Changeset ded2291 in mod_gnutls for src/gnutls_cache.h

Timestamp:

Apr 24, 2018, 1:13:28 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

41f9bcb

Parents:

6bbd378

Message:

Switch generic cache store/fetch function pointers to constant functions

Using socache takes care of the different cache types, so this layer
of abstraction is no longer needed. Add a currently unused mgs_cache_t
parameter to allow for multiple mod_gnutls caches in the future.

File:

• src/gnutls_cache.h (modified) (4 diffs)

src/gnutls_cache.h

@@ -82 +82 @@
 
 /**
- * Generic store function for the mod_gnutls object cache.
+ * Store function for the mod_gnutls object caches.
  *
+ * @param cache the cache to store the entry in
  * @param s server associated with the cache entry
  * @param key key for the cache entry
@@ -91 +92 @@
  * @return `-1` on error, `0` on success
  */
-typedef int (*cache_store_func)(server_rec *s, gnutls_datum_t key,
-                                gnutls_datum_t data, apr_time_t expiry);
+int mgs_cache_store(mgs_cache_t cache, server_rec *server, gnutls_datum_t key,
+                    gnutls_datum_t data, apr_time_t expiry);
+
 /**
- * Generic fetch function for the mod_gnutls object cache.
+ * Fetch function for the mod_gnutls object caches.
  *
  * *Warning*: The `data` element of the returned `gnutls_datum_t` is
  * allocated using `gnutls_malloc()` for compatibility with the GnuTLS
  * session caching API, and must be released using `gnutls_free()`.
+ *
+ * @param cache the cache to fetch from
  *
  * @param server server context for the request
@@ -109 +113 @@
  * @return the requested cache entry, or `{NULL, 0}`
  */
-typedef gnutls_datum_t (*cache_fetch_func)(server_rec *server,
-                                           gnutls_datum_t key,
-                                           apr_pool_t *pool);
+gnutls_datum_t mgs_cache_fetch(mgs_cache_t cache, server_rec *server,
+                               gnutls_datum_t key, apr_pool_t *pool);
+
 /**
  * Internal cache configuration structure
@@ -120 +124 @@
     /** The actual socache instance */
     ap_socache_instance_t *socache;
-    /** Store function for this cache */
-    cache_store_func store;
-    /** Fetch function for this cache */
-    cache_fetch_func fetch;
     /** Mutex for cache access (used only if the cache type is not
      * thread-safe) */