Changeset c7710cf in mod_gnutls for src/gnutls_proxy.c

Timestamp:

Dec 19, 2018, 1:09:13 PM (22 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

08c48d7

Parents:

564f33f

Message:

Immediately return from proxy_conn_set_alpn() if there is no proxy note

This is easier to read than wrapping the rest of the function in an
"if" block with a negative check for NULL.

File:

• src/gnutls_proxy.c (modified) (1 diff)

src/gnutls_proxy.c

@@ -323 +323 @@
     const char *proxy_alpn =
         apr_table_get(ctxt->c->notes, PROXY_ALPN_NOTE);
-    if (proxy_alpn != NULL)
-    {
-        // TODO: mod_ssl ssl_engine_io.c does some tokenization of
-        // the input string, so it looks like the API allows
-        // multiple protocols.
-        gnutls_datum_t alpn_proto = {
-            .data = (unsigned char *) apr_pstrdup(ctxt->c->pool, proxy_alpn),
-            .size = strlen(proxy_alpn)
-        };
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
-                      "%s: proxy module requests ALPN proto '%s', "
-                      "length %" APR_SIZE_T_FMT ".",
-                      __func__, proxy_alpn, strlen(proxy_alpn));
-        int ret = gnutls_alpn_set_protocols(ctxt->session,
-                                            &alpn_proto,
-                                            1 /* number of proposals */,
-                                            0 /* flags */);
-        if (ret != GNUTLS_E_SUCCESS)
-            ap_log_cerror(APLOG_MARK, APLOG_ERR, ret, ctxt->c,
-                          "Could not set ALPN proposal '%s' for proxy "
-                          "connection: %s (%d)",
-                          proxy_alpn, gnutls_strerror(ret), ret);
-    }
+    if (proxy_alpn == NULL)
+        return;
+
+    // TODO: mod_ssl ssl_engine_io.c does some tokenization of
+    // the input string, so it looks like the API allows
+    // multiple protocols.
+    gnutls_datum_t alpn_proto = {
+        .data = (unsigned char *) apr_pstrdup(ctxt->c->pool, proxy_alpn),
+        .size = strlen(proxy_alpn)
+    };
+    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
+                  "%s: proxy module requests ALPN proto '%s', "
+                  "length %" APR_SIZE_T_FMT ".",
+                  __func__, proxy_alpn, strlen(proxy_alpn));
+    int ret = gnutls_alpn_set_protocols(ctxt->session,
+                                        &alpn_proto,
+                                        1 /* number of proposals */,
+                                        0 /* flags */);
+    if (ret != GNUTLS_E_SUCCESS)
+        ap_log_cerror(APLOG_MARK, APLOG_ERR, ret, ctxt->c,
+                      "Could not set ALPN proposal '%s' for proxy "
+                      "connection: %s (%d)",
+                      proxy_alpn, gnutls_strerror(ret), ret);
 }