Changeset 7511bfa in mod_gnutls for src

Timestamp:

Jun 3, 2016, 3:09:41 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

379a297

Parents:

8913410

Message:

Use ap_log_cerror() instead of ap_log_error() where reasonable

Probably old code from when ap_log_cerror() did not exist.

Location:

src

Files:

• gnutls_hooks.c (modified) (3 diffs)
• gnutls_io.c (modified) (4 diffs)

src/gnutls_hooks.c

@@ -619 +619 @@
 }
 
-static int vhost_cb(void *baton, conn_rec * conn __attribute__((unused)), server_rec * s) {
+static int vhost_cb(void *baton, conn_rec *conn, server_rec * s)
+{
     mgs_srvconf_rec *tsc;
     vhost_cb_rec *x = baton;
@@ -637 +638 @@
         ret = gnutls_x509_crt_check_hostname(tsc->certs_x509_crt_chain[0], s->server_hostname);
         if (0 == ret)
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                         "GnuTLS: the certificate doesn't match requested hostname "
-                         "'%s'", s->server_hostname);
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, conn,
+                          "GnuTLS: the certificate doesn't match requested "
+                          "hostname '%s'", s->server_hostname);
     } else {
-        ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
-                     "GnuTLS: SNI request for '%s' but no X.509 certs available at all",
-                     s->server_hostname);
+        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, conn,
+                      "GnuTLS: SNI request for '%s' but no X.509 certs "
+                      "available at all",
+                      s->server_hostname);
     }
         return check_server_aliases(x, s, tsc);
@@ -671 +673 @@
 
     if (sni_type != GNUTLS_NAME_DNS) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, 0,
-                ctxt->c->base_server,
-                "GnuTLS: Unknown type '%d' for SNI: "
-                "'%s'", sni_type, sni_name);
+        ap_log_cerror(APLOG_MARK, APLOG_CRIT, 0, ctxt->c,
+                      "GnuTLS: Unknown type '%d' for SNI: '%s'",
+                      sni_type, sni_name);
         return NULL;
     }

src/gnutls_io.c

@@ -59 +59 @@
     case HTTP_BAD_REQUEST:
         /* log the situation */
-        ap_log_error(APLOG_MARK, APLOG_INFO, 0,
-                     f->c->base_server,
-                     "GnuTLS handshake failed: HTTP spoken on HTTPS port; "
-                     "trying to send HTML error page");
+        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, f->c,
+                      "GnuTLS handshake failed: HTTP spoken on HTTPS port; "
+                      "trying to send HTML error page");
         mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
             ap_get_module_config(f->c->base_server->module_config,
@@ -417 +416 @@
                 || ret == GNUTLS_E_FATAL_ALERT_RECEIVED) {
             errcode = gnutls_alert_get(ctxt->session);
-            ap_log_error(APLOG_MARK, APLOG_INFO, 0,
-                    ctxt->c->base_server,
-                    "GnuTLS: Handshake Alert (%d) '%s'.",
-                    errcode,
-                    gnutls_alert_get_name(errcode));
+            ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, ctxt->c,
+                          "GnuTLS: Handshake Alert (%d) '%s'.",
+                          errcode, gnutls_alert_get_name(errcode));
         }
 
         if (!gnutls_error_is_fatal(ret)) {
-            ap_log_error(APLOG_MARK, APLOG_INFO, 0,
-                    ctxt->c->base_server,
-                    "GnuTLS: Non-Fatal Handshake Error: (%d) '%s'",
-                    ret, gnutls_strerror(ret));
+            ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, ctxt->c,
+                          "GnuTLS: Non-Fatal Handshake Error: (%d) '%s'",
+                          ret, gnutls_strerror(ret));
             goto tryagain;
         }
@@ -470 +466 @@
     if (rv != 0) {
         /* the client did not want to rehandshake. goodbye */
-        ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
-                ctxt->c->base_server,
-                "GnuTLS: Client Refused Rehandshake request.");
+        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, ctxt->c,
+                      "GnuTLS: Client Refused Rehandshake request.");
         return -1;
     }
@@ -722 +717 @@
                 if (ret < 0) {
                     /* error sending output */
-                    ap_log_error(APLOG_MARK,
-                            APLOG_INFO,
-                            ctxt->output_rc,
-                            ctxt->c->base_server,
-                            "GnuTLS: Error writing data."
-                            " (%d) '%s'",
-                            (int) ret,
-                            gnutls_strerror(ret));
+                    ap_log_cerror(APLOG_MARK, APLOG_INFO, ctxt->output_rc,
+                                  ctxt->c,
+                                  "GnuTLS: Error writing data. (%d) '%s'",
+                                  ret, gnutls_strerror(ret));
                     if (ctxt->output_rc == APR_SUCCESS) {
                         ctxt->output_rc =