Changeset 3aff94d in mod_gnutls

Timestamp:

Oct 31, 2018, 3:20:28 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

b47dc70

Parents:

267a27a

Message:

Include cache status in mod_status reports

Location:

src

Files:

• gnutls_cache.c (modified) (2 diffs)
• gnutls_cache.h (modified) (1 diff)
• gnutls_hooks.c (modified) (2 diffs)

src/gnutls_cache.c

@@ -34 +34 @@
 
 #include <ap_socache.h>
+#include <mod_status.h>
 #include <apr_escape.h>
 #include <util_mutex.h>
@@ -519 +520 @@
     return 0;
 }
+
+
+
+int mgs_cache_status(mgs_cache_t cache, const char *header_title,
+                     request_rec *r, int flags)
+{
+    if (!(flags & AP_STATUS_SHORT))
+        ap_rprintf(r, "<h3>%s:</h3>\n", header_title);
+    else
+        ap_rprintf(r, "%s:\n", header_title);
+
+    if (cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_lock(cache->mutex);
+    cache->prov->status(cache->socache, r, flags);
+    if (cache->prov->flags & AP_SOCACHE_FLAG_NOTMPSAFE)
+        apr_global_mutex_unlock(cache->mutex);
+
+    return OK;
+}

src/gnutls_cache.h

@@ -163 +163 @@
 };
 
+/**
+ * Write cache status to a mod_status report
+ *
+ * @param cache the cache to report on
+ *
+ * @param header_title string to prefix the report with to distinguish
+ * caches
+ *
+ * @param r status output is added to the response for this request
+ *
+ * @param flags request flags, used to toggle "short status" mode
+ *
+ * @return request status, currently always `OK`
+ */
+int mgs_cache_status(mgs_cache_t cache, const char *header_title,
+                     request_rec *r, int flags);
+
 #endif /** __MOD_GNUTLS_CACHE_H__ */

src/gnutls_hooks.c

@@ -28 +28 @@
 #include "http_vhost.h"
 #include "ap_mpm.h"
-#include "mod_status.h"
+#include <mod_status.h>
 #include <util_mutex.h>
 #include <apr_escape.h>
@@ -1995 +1995 @@
         ap_rputs("</dl>\n", r);
 
+    if (sc->ocsp_cache)
+        mgs_cache_status(sc->ocsp_cache, "GnuTLS OCSP Cache", r, flags);
+    if (sc->cache_enable)
+        mgs_cache_status(sc->cache, "GnuTLS Session Cache", r, flags);
+
     return OK;
 }