Changeset ae08186 in mod_gnutls

Timestamp:

Jun 5, 2016, 3:42:31 PM (2 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, upstream

Children:

1d1361f

Parents:

f785704

git-author:

Thomas Klute <thomas2.klute@…> (06/04/16 20:28:38)

git-committer:

Thomas Klute <thomas2.klute@…> (06/05/16 15:42:31)

Message:

DBM cache: Separate session caching and generic store operation

File:

• src/gnutls_cache.c (modified) (5 diffs)

src/gnutls_cache.c

@@ -427 +427 @@
 }
 
-static int dbm_cache_store(void *baton, gnutls_datum_t key,
-        gnutls_datum_t data) {
+static int dbm_cache_store(void *baton, apr_datum_t key,
+                           gnutls_datum_t data, apr_time_t expiry)
+{
     apr_dbm_t *dbm;
-    apr_datum_t dbmkey;
     apr_datum_t dbmval;
     mgs_handle_t *ctxt = baton;
     apr_status_t rv;
-    apr_time_t expiry;
     apr_pool_t *spool;
-
-    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &dbmkey) < 0)
-        return -1;
 
     /* we expire dbm only on every store
@@ -450 +446 @@
     dbmval.dptr = (char *) apr_palloc(spool, dbmval.dsize);
 
-    expiry = apr_time_now() + ctxt->sc->cache_timeout;
-
+    /* prepend expiration time */
     memcpy((char *) dbmval.dptr, &expiry, sizeof (apr_time_t));
     memcpy((char *) dbmval.dptr + sizeof (apr_time_t),
@@ -468 +463 @@
     }
 
-    rv = apr_dbm_store(dbm, dbmkey, dbmval);
+    rv = apr_dbm_store(dbm, key, dbmval);
 
     if (rv != APR_SUCCESS) {
@@ -485 +480 @@
 
     return 0;
+}
+
+static int dbm_cache_store_session(void *baton, gnutls_datum_t key,
+                                   gnutls_datum_t data)
+{
+    mgs_handle_t *ctxt = baton;
+    apr_datum_t dbmkey;
+
+    if (mgs_session_id2dbm(ctxt->c, key.data, key.size, &dbmkey) < 0)
+        return -1;
+
+    apr_time_t expiry = apr_time_now() + ctxt->sc->cache_timeout;
+
+    return dbm_cache_store(baton, dbmkey, data, expiry);
 }
 
@@ -614 +623 @@
                 dbm_cache_delete);
         gnutls_db_set_store_function(ctxt->session,
-                dbm_cache_store);
+                dbm_cache_store_session);
         gnutls_db_set_ptr(ctxt->session, ctxt);
     }