Changeset a314ec9 in mod_gnutls

Timestamp:

Apr 29, 2018, 6:01:12 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

d8d6b1e

Parents:

b94aee2

git-author:

Fiona Klute <fiona.klute@…> (04/29/18 05:56:04)

git-committer:

Fiona Klute <fiona.klute@…> (04/29/18 06:01:12)

Message:

Store config pointer in struct mgs_cache for logging

This way the store/fetch log messages will be correct with multiple
caches.

Location:

src

Files:

• gnutls_cache.c (modified) (9 diffs)
• gnutls_cache.h (modified) (1 diff)

src/gnutls_cache.c

@@ -118 +118 @@
     if (rv != APR_SUCCESS)
     {
-        // TODO: clean up sc->cache_config reference
         ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, server,
                      "error storing in cache '%s:%s'",
-                     cache->prov->name, sc->cache_config);
+                     cache->prov->name, sc->cache->config);
         apr_pool_destroy(spool);
         return -1;
     }
 
-    // TODO: clean up sc->cache_config reference
     ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, server,
                  "stored %u bytes of data (%u byte key) in cache '%s:%s'",
                  data.size, key.size,
-                 cache->prov->name, sc->cache_config);
+                 cache->prov->name, sc->cache->config);
     apr_pool_destroy(spool);
     return 0;
@@ -169 +167 @@
 // 4K should be enough for OCSP responses and sessions alike
 #define SOCACHE_FETCH_BUF_SIZE 4096
-gnutls_datum_t mgs_cache_fetch(mgs_cache_t cache __attribute__((unused)),
-                               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)
 {
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
@@ -196 +193 @@
     if (rv != APR_SUCCESS)
     {
-        // TODO: clean up sc->cache_config references
         /* APR_NOTFOUND means there's no such object. */
         if (rv == APR_NOTFOUND)
             ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, server,
                          "requested entry not found in cache '%s:%s'.",
-                         cache->prov->name, sc->cache_config);
+                         cache->prov->name, sc->cache->config);
         else
             ap_log_error(APLOG_MARK, APLOG_WARNING, rv, server,
                          "error fetching from cache '%s:%s'",
-                         cache->prov->name, sc->cache_config);
+                         cache->prov->name, sc->cache->config);
         /* free unused buffer */
         gnutls_free(data.data);
@@ -213 +209 @@
     else
     {
-        // TODO: clean up sc->cache_config reference
         ap_log_error(APLOG_MARK, APLOG_TRACE1, rv, server,
                      "fetched %u bytes from cache '%s:%s'",
-                     data.size, cache->prov->name, sc->cache_config);
+                     data.size, cache->prov->name, sc->cache->config);
     }
     apr_pool_destroy(spool);
@@ -287 +282 @@
                      ctxt->c->base_server,
                      "error deleting from cache '%s:%s'",
-                     ctxt->sc->cache->prov->name, ctxt->sc->cache_config);
+                     ctxt->sc->cache->prov->name, ctxt->sc->cache->config);
         return -1;
     }
@@ -302 +297 @@
     ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, s,
                  "Cleaning up socache '%s:%s'",
-                 sc->cache->prov->name, sc->cache_config);
+                 sc->cache->prov->name, sc->cache->config);
     sc->cache->prov->destroy(sc->cache->socache, s);
     return APR_SUCCESS;
@@ -342 +337 @@
     if (sc->cache->prov)
     {
-        /* Cache found; create it, passing anything beyond the colon. */
+        /* Create and configure the cache instance. */
+        sc->cache->config = sc->cache_config;
         const char *err = sc->cache->prov->create(&sc->cache->socache,
-                                                  sc->cache_config,
+                                                  sc->cache->config,
                                                   ptemp, pconf);
         if (err != NULL)
@@ -350 +346 @@
             ap_log_error(APLOG_MARK, APLOG_EMERG, APR_EGENERAL, s,
                          "Creating cache '%s:%s' failed: %s",
-                         sc->cache_type, sc->cache_config, err);
+                         sc->cache_type, sc->cache->config, err);
             return HTTP_INSUFFICIENT_STORAGE;
         }
@@ -363 +359 @@
             ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
                          "Initializing cache '%s:%s' failed!",
-                         sc->cache_type, sc->cache_config);
+                         sc->cache_type, sc->cache->config);
             return HTTP_INSUFFICIENT_STORAGE;
         }
         ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, s,
                      "%s: socache '%s:%s' created.", __func__,
-                     sc->cache_type, sc->cache_config);
+                     sc->cache_type, sc->cache->config);
     }
     else

src/gnutls_cache.h

@@ -124 +124 @@
     /** The actual socache instance */
     ap_socache_instance_t *socache;
+    /** Cache configuration string (as passed to the socache create
+     * function, for logging) */
+    const char *config;
     /** Mutex for cache access (used only if the cache type is not
      * thread-safe) */