Changeset b94aee2 in mod_gnutls for src

Timestamp:

Apr 28, 2018, 5:52:56 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

a314ec9

Parents:

2f949bc

Message:

Remove internal cache type enum

The cache type is now transparently passed to ap_lookup_provider(), so
mod_gnutls does not need to manage available cache types. The new
server variable sc->cache_enable exists to track whether the cache
should be used at all.

Location:

src

Files:

• gnutls_cache.c (modified) (7 diffs)
• gnutls_config.c (modified) (4 diffs)
• gnutls_hooks.c (modified) (2 diffs)

src/gnutls_cache.c

@@ -313 +313 @@
 {
     apr_status_t rv = APR_SUCCESS;
-    /* if GnuTLSCache was never explicitly set: */
-    if (sc->cache_type == mgs_cache_unset || sc->cache_type == mgs_cache_none)
-    {
-        sc->cache_type = mgs_cache_none;
+    /* GnuTLSCache was never explicitly set or is disabled: */
+    if (sc->cache_enable == GNUTLS_ENABLED_UNSET
+        || sc->cache_enable == GNUTLS_ENABLED_FALSE)
+    {
+        sc->cache_enable = GNUTLS_ENABLED_FALSE;
         /* Cache disabled, done. */
         return APR_SUCCESS;
@@ -324 +325 @@
         sc->cache_timeout = apr_time_from_sec(MGS_DEFAULT_CACHE_TIMEOUT);
 
-    /* initialize mutex only once */
+    /* initialize cache structure and mutex if needed */
     if (sc->cache == NULL)
     {
-        sc->cache = apr_palloc(pconf, sizeof(struct mgs_cache));
+        sc->cache = apr_pcalloc(pconf, sizeof(struct mgs_cache));
         rv = ap_global_mutex_create(&sc->cache->mutex, NULL,
                                     MGS_CACHE_MUTEX_NAME,
@@ -335 +336 @@
     }
 
-    char *pname = NULL;
-
-    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm)
-        pname = "dbm";
-    else if (sc->cache_type == mgs_cache_memcache)
-        pname = "memcache";
-    else if (sc->cache_type == mgs_cache_shmcb)
-        pname = "shmcb";
-
     /* Find the right socache provider */
     sc->cache->prov = ap_lookup_provider(AP_SOCACHE_PROVIDER_GROUP,
-                                         pname,
+                                         sc->cache_type,
                                          AP_SOCACHE_PROVIDER_VERSION);
     if (sc->cache->prov)
@@ -358 +350 @@
             ap_log_error(APLOG_MARK, APLOG_EMERG, APR_EGENERAL, s,
                          "Creating cache '%s:%s' failed: %s",
-                         pname, sc->cache_config, err);
+                         sc->cache_type, sc->cache_config, err);
             return HTTP_INSUFFICIENT_STORAGE;
         }
         ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, s,
-                     "%s: Socache '%s' created.", __func__, pname);
+                     "%s: Socache '%s' created.", __func__, sc->cache_type);
 
         // TODO: provide hints
@@ -371 +363 @@
             ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
                          "Initializing cache '%s:%s' failed!",
-                         pname, 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__,
-                     pname, sc->cache_config);
+                     sc->cache_type, sc->cache_config);
     }
     else
@@ -383 +375 @@
                      "Could not find socache provider '%s', please make sure "
                      "that the provider name is valid and the "
-                     "appropriate mod_socache submodule is loaded.", pname);
+                     "appropriate mod_socache submodule is loaded.",
+                     sc->cache_type);
         return HTTP_NOT_FOUND;
     }
@@ -409 +402 @@
 int mgs_cache_session_init(mgs_handle_t * ctxt)
 {
-    if (ctxt->sc->cache_type != mgs_cache_none)
+    if (ctxt->sc->cache_enable)
     {
         gnutls_db_set_retrieve_function(ctxt->session,

src/gnutls_config.c

@@ -594 +594 @@
     if (strcasecmp("none", type) == 0)
     {
-        sc->cache_type = mgs_cache_none;
+        sc->cache_enable = GNUTLS_ENABLED_FALSE;
+        sc->cache_type = NULL;
         sc->cache_config = NULL;
         return NULL;
     }
+
+    sc->cache_enable = GNUTLS_ENABLED_TRUE;
 
     /* Try to split socache "type:config" style configuration */
@@ -603 +606 @@
     if (sep)
     {
-        type = apr_pstrmemdup(parms->temp_pool, type, sep - type);
+        sc->cache_type = apr_pstrmemdup(parms->pool, type, sep - type);
         if (arg != NULL)
         {
@@ -612 +615 @@
         arg = ++sep;
     }
-
-    if (strcasecmp("dbm", type) == 0) {
-        sc->cache_type = mgs_cache_dbm;
-    } else if (strcasecmp("gdbm", type) == 0) {
-        sc->cache_type = mgs_cache_gdbm;
-    }
-    else if (strcasecmp("memcache", type) == 0) {
-        sc->cache_type = mgs_cache_memcache;
-    }
-    else if (strcasecmp("shmcb", type) == 0) {
-        sc->cache_type = mgs_cache_shmcb;
-    }
-    else {
-        return "Invalid Type for GnuTLSCache!";
-    }
+    else
+        sc->cache_type = apr_pstrdup(parms->pool, type);
 
     if (arg == NULL)
-        return "Invalid argument 2 for GnuTLSCache!";
-
-    if (sc->cache_type == mgs_cache_dbm
-        || sc->cache_type == mgs_cache_gdbm) {
-        sc->cache_config = ap_server_root_relative(parms->pool, arg);
-    } else {
+        sc->cache_config = "";
+    else
         sc->cache_config = apr_pstrdup(parms->pool, arg);
-    }
 
     return NULL;
@@ -880 +865 @@
     sc->priorities_str = NULL;
     sc->cache_timeout = MGS_TIMEOUT_UNSET;
-    sc->cache_type = mgs_cache_unset;
+    sc->cache_type = NULL;
+    sc->cache_enable = GNUTLS_ENABLED_UNSET;
     sc->cache_config = NULL;
     sc->cache = NULL;

src/gnutls_hooks.c

@@ -629 +629 @@
         sc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config, &gnutls_module);
         sc->cache_type = sc_base->cache_type;
+        sc->cache_enable = sc_base->cache_enable;
         sc->cache_config = sc_base->cache_config;
         sc->cache_timeout = sc_base->cache_timeout;
@@ -774 +775 @@
     }
 
-    if (sc->cache_type != mgs_cache_none) {
+    if (sc->cache_enable) {
         rv = mgs_cache_child_init(p, s, sc);
         if (rv != APR_SUCCESS) {