Changeset 1de1026 in mod_gnutls

Timestamp:

Dec 5, 2017, 1:18:49 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

fe21671

Parents:

994a5fb

Message:

mgs_get_ocsp_response(): Separate mgs_srvconf_rec* variable for readability

Having a separate variable instead of referencing ctxt every time
simplifies and shortens a lot of lines in this function. Technically
ctxt->sc is equal to the void *ptr parameter, but it's more explicit
this way, and also allows changing the custom pointer in the future
without changing the callback function.

File:

• src/gnutls_ocsp.c (modified) (4 diffs)

src/gnutls_ocsp.c

@@ -742 +742 @@
 {
     mgs_handle_t *ctxt = gnutls_session_get_ptr(session);
-    if (!ctxt->sc->ocsp_staple || ctxt->sc->cache == NULL)
+    mgs_srvconf_rec *sc = ctxt->sc;
+
+    if (!sc->ocsp_staple || sc->cache == NULL)
     {
         /* OCSP must be enabled and caching requires a cache. */
@@ -748 +750 @@
     }
 
-    *ocsp_response = ctxt->sc->cache->fetch(ctxt,
-                                            ctxt->sc->ocsp->fingerprint);
+    *ocsp_response = sc->cache->fetch(ctxt,
+                                      sc->ocsp->fingerprint);
     if (ocsp_response->size == 0)
     {
@@ -775 +777 @@
                   "No valid OCSP response in cache, trying to update.");
 
-    apr_status_t rv = apr_global_mutex_trylock(ctxt->sc->ocsp_mutex);
+    apr_status_t rv = apr_global_mutex_trylock(sc->ocsp_mutex);
     if (APR_STATUS_IS_EBUSY(rv))
     {
         /* Another thread is currently holding the mutex, wait. */
-        apr_global_mutex_lock(ctxt->sc->ocsp_mutex);
+        apr_global_mutex_lock(sc->ocsp_mutex);
         /* Check if this other thread updated the response we need. It
          * would be better to have a vhost specific mutex, but at the
          * moment there's no good way to integrate that with the
          * Apache Mutex directive. */
-        *ocsp_response = ctxt->sc->cache->fetch(ctxt,
-                                                ctxt->sc->ocsp->fingerprint);
+        *ocsp_response = sc->cache->fetch(ctxt,
+                                          sc->ocsp->fingerprint);
         if (ocsp_response->size > 0)
         {
             /* Got a valid response now, unlock mutex and return. */
-            apr_global_mutex_unlock(ctxt->sc->ocsp_mutex);
+            apr_global_mutex_unlock(sc->ocsp_mutex);
             return GNUTLS_E_SUCCESS;
         }
@@ -806 +808 @@
         /* cache failure to rate limit retries */
         mgs_cache_ocsp_failure(ctxt->c->base_server);
-        apr_global_mutex_unlock(ctxt->sc->ocsp_mutex);
+        apr_global_mutex_unlock(sc->ocsp_mutex);
         goto fail_cleanup;
     }
-    apr_global_mutex_unlock(ctxt->sc->ocsp_mutex);
+    apr_global_mutex_unlock(sc->ocsp_mutex);
 
     /* retry reading from cache */
-    *ocsp_response = ctxt->sc->cache->fetch(ctxt,
-                                            ctxt->sc->ocsp->fingerprint);
+    *ocsp_response = sc->cache->fetch(ctxt,
+                                      sc->ocsp->fingerprint);
     if (ocsp_response->size == 0)
     {