Changeset 398d1a0 in mod_gnutls

Timestamp:

Jan 28, 2015, 7:34:35 AM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

4261999

Parents:

4fefa39

Message:

Improved logging for gnutls_io_input_read

• Log if something tried to read from a NULL session
• Use ap_log_cerror instead of ap_log_error for existing log messages, because TLS input is connection specific

File:

• src/gnutls_io.c (modified) (6 diffs)

src/gnutls_io.c

@@ -184 +184 @@
 
 static apr_status_t gnutls_io_input_read(mgs_handle_t * ctxt,
-        char *buf, apr_size_t * len) {
+        char *buf, apr_size_t * len)
+{
     apr_size_t wanted = *len;
     apr_size_t bytes = 0;
@@ -223 +224 @@
 
     if (ctxt->session == NULL) {
+        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, ctxt->c,
+                      "%s: GnuTLS session is NULL!", __func__);
         return APR_EGENERAL;
     }
@@ -268 +271 @@
             if (rc == GNUTLS_E_REHANDSHAKE) {
                 /* A client has asked for a new Hankshake. Currently, we don't do it */
-                ap_log_error(APLOG_MARK, APLOG_INFO,
+                ap_log_cerror(APLOG_MARK, APLOG_INFO,
                         ctxt->input_rc,
-                        ctxt->c->base_server,
+                        ctxt->c,
                         "GnuTLS: Error reading data. Client Requested a New Handshake."
                         " (%d) '%s'", rc,
@@ -276 +279 @@
             } else if (rc == GNUTLS_E_WARNING_ALERT_RECEIVED) {
                 rc = gnutls_alert_get(ctxt->session);
-                ap_log_error(APLOG_MARK, APLOG_INFO,
+                ap_log_cerror(APLOG_MARK, APLOG_INFO,
                         ctxt->input_rc,
-                        ctxt->c->base_server,
+                        ctxt->c,
                         "GnuTLS: Warning Alert From Client: "
                         " (%d) '%s'", rc,
@@ -284 +287 @@
             } else if (rc == GNUTLS_E_FATAL_ALERT_RECEIVED) {
                 rc = gnutls_alert_get(ctxt->session);
-                ap_log_error(APLOG_MARK, APLOG_INFO,
+                ap_log_cerror(APLOG_MARK, APLOG_INFO,
                         ctxt->input_rc,
-                        ctxt->c->base_server,
+                        ctxt->c,
                         "GnuTLS: Fatal Alert From Client: "
                         "(%d) '%s'", rc,
@@ -295 +298 @@
                 /* Some Other Error. Report it. Die. */
                 if (gnutls_error_is_fatal(rc)) {
-                    ap_log_error(APLOG_MARK,
+                    ap_log_cerror(APLOG_MARK,
                             APLOG_INFO,
                             ctxt->input_rc,
-                            ctxt->c->base_server,
+                            ctxt->c,
                             "GnuTLS: Error reading data. (%d) '%s'",
                             rc,