CLEANUP: listener: replace all uses of bind_conf->is_ssl with BC_O_USE_SSL

The new flag will now replace this boolean variable that was only set and
tested.

diff --git a/include/haproxy/listener-t.h b/include/haproxy/listener-t.h
index f22f3b2fcfc315524d0a2e1d710dd49452890f5d..54546d197fdc3a7c17f39da4114050b75dbe4bc2 100644 (file)
--- a/include/haproxy/listener-t.h
+++ b/include/haproxy/listener-t.h
@@ -113,6 +113,10 @@ enum li_status {
  * maxconn setting to the global.maxsock value so that its resources are reserved.
  */
 
+/* flags used with bind_conf->options */
+#define BC_O_USE_SSL            0x00000001 /* SSL is being used on this bind_conf */
+
+
 /* flags used with bind_conf->ssl_options */
 #ifdef USE_OPENSSL
 #define BC_SSL_O_NONE           0x0000
@@ -177,7 +181,6 @@ struct bind_conf {
        const struct mux_proto_list *mux_proto; /* the mux to use for all incoming connections (specified by the "proto" keyword) */
        struct xprt_ops *xprt;     /* transport-layer operations for all listeners */
        uint options;              /* set of BC_O_* flags */
-       int is_ssl;                /* SSL is required for these listeners */
        int generate_certs;        /* 1 if generate-certificates option is set, else 0 */
        int level;                 /* stats access level (ACCESS_LVL_*) */
        int severity_output;       /* default severity output format in cli feedback messages */

diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index 6530775a99f43b8bcab5fba1057619a02e0f1dd3..33d0bdb92b77ab3112588f5f15f2626f55530138 100644 (file)
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -1118,7 +1118,7 @@ static int bind_parse_ssl(char **args, int cur_arg, struct proxy *px, struct bin
        /* Do not change the xprt for QUIC. */
        if (conf->xprt != xprt_get(XPRT_QUIC))
                conf->xprt = &ssl_sock;
-       conf->is_ssl = 1;
+       conf->options |= BC_O_USE_SSL;
 
        if (global_ssl.listen_default_ciphers && !conf->ssl_conf.ciphers)
                conf->ssl_conf.ciphers = strdup(global_ssl.listen_default_ciphers);

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 1e0f5edb1cc696d6cd30e474a4bfb32364cfb8aa..9def9b96e0d5be28e5bac75246be53ecaa8eafbc 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3960,14 +3960,14 @@ out_uri_auth_compat:
 
                        /* smart accept mode is automatic in HTTP mode */
                        if ((curproxy->options2 & PR_O2_SMARTACC) ||
-                           ((curproxy->mode == PR_MODE_HTTP || listener->bind_conf->is_ssl) &&
+                           ((curproxy->mode == PR_MODE_HTTP || (listener->bind_conf->options & BC_O_USE_SSL)) &&
                             !(curproxy->no_options2 & PR_O2_SMARTACC)))
                                listener->options |= LI_O_NOQUICKACK;
                }
 
                /* Release unused SSL configs */
                list_for_each_entry(bind_conf, &curproxy->conf.bind, by_fe) {
-                       if (!bind_conf->is_ssl && bind_conf->xprt->destroy_bind_conf)
+                       if (!(bind_conf->options & BC_O_USE_SSL) && bind_conf->xprt->destroy_bind_conf)
                                bind_conf->xprt->destroy_bind_conf(bind_conf);
                }
 

diff --git a/src/connection.c b/src/connection.c
index e92089e09b7e896d7ad136251331358cff167eef..2ead7147002dd5f165955c1ebc05e090459cdc3f 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -366,7 +366,7 @@ int conn_update_alpn(struct connection *conn, const struct ist alpn, int force)
                        struct session *sess = conn->owner;
                        struct listener *li = sess->listener;
 
-                       if (li->bind_conf && li->bind_conf->is_ssl) {
+                       if (li->bind_conf && li->bind_conf->options & BC_O_USE_SSL) {
                                ctx_alpn_str = li->bind_conf->ssl_conf.alpn_str;
                                ctx_alpn_len = li->bind_conf->ssl_conf.alpn_len;
                        }

diff --git a/src/listener.c b/src/listener.c
index 3b7b8cfae3d3b0a2ee17d8bfbe133ee5e6e1a11a..6c71c1b4b85b3361113db11cca9a7ae46229cea2 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -152,7 +152,7 @@ struct task *accept_queue_process(struct task *t, void *context, unsigned int st
                if (!(li->options & LI_O_UNLIMITED)) {
                        HA_ATOMIC_UPDATE_MAX(&global.sps_max,
                                             update_freq_ctr(&global.sess_per_sec, 1));
-                       if (li->bind_conf && li->bind_conf->is_ssl) {
+                       if (li->bind_conf && li->bind_conf->options & BC_O_USE_SSL) {
                                HA_ATOMIC_UPDATE_MAX(&global.ssl_max,
                                                     update_freq_ctr(&global.ssl_per_sec, 1));
                        }
@@ -843,7 +843,8 @@ void listener_accept(struct listener *l)
                        max_accept = max;
        }
 #ifdef USE_OPENSSL
-       if (!(l->options & LI_O_UNLIMITED) && global.ssl_lim && l->bind_conf && l->bind_conf->is_ssl) {
+       if (!(l->options & LI_O_UNLIMITED) && global.ssl_lim &&
+           l->bind_conf && l->bind_conf->options & BC_O_USE_SSL) {
                int max = freq_ctr_remain(&global.ssl_per_sec, global.ssl_lim, 0);
 
                if (unlikely(!max)) {
@@ -1126,7 +1127,8 @@ void listener_accept(struct listener *l)
                        HA_ATOMIC_UPDATE_MAX(&global.sps_max, count);
                }
 #ifdef USE_OPENSSL
-               if (!(l->options & LI_O_UNLIMITED) && l->bind_conf && l->bind_conf->is_ssl) {
+               if (!(l->options & LI_O_UNLIMITED) &&
+                   l->bind_conf && l->bind_conf->options & BC_O_USE_SSL) {
                        count = update_freq_ctr(&global.ssl_per_sec, 1);
                        HA_ATOMIC_UPDATE_MAX(&global.ssl_max, count);
                }

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index a27949d5f1959d0a7bf419280b317660a4793ceb..507bc0ce374c1f09a228a93cd4723a0160162b23 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -5445,7 +5445,7 @@ int ssl_sock_prepare_bind_conf(struct bind_conf *bind_conf)
        int alloc_ctx;
        int err;
 
-       if (!bind_conf->is_ssl) {
+       if (!(bind_conf->options & BC_O_USE_SSL)) {
                if (bind_conf->default_ctx) {
                        ha_warning("Proxy '%s': A certificate was specified but SSL was not enabled on bind '%s' at [%s:%d] (use 'ssl').\n",
                                   px->id, bind_conf->arg, bind_conf->file, bind_conf->line);