MINOR: proxy: rename PR_CAP_LUA to PR_CAP_INT

This patch renames the proxy capability "LUA" to "INT" so it could be
used for any internal proxy.

Every proxy that are not user defined should use this flag.

diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index aa3de2cca70c2155f0fd23b2e68c7fa221d1bcf2..ba6a5fa4cff3b33416849a3641bdb1fc2c3b0415 100644 (file)
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -69,7 +69,7 @@ enum PR_SRV_STATE_FILE {
 #define PR_CAP_BE      0x0002
 #define PR_CAP_LISTEN  (PR_CAP_FE|PR_CAP_BE)
 #define PR_CAP_DEF     0x0004           /* defaults section */
-#define PR_CAP_LUA     0x0008           /* internal proxy used by lua engine */
+#define PR_CAP_INT     0x0008           /* internal proxy (used by lua engine) */
 #define PR_CAP_LB      0x0010           /* load-balancing capabilities, i.e. listen/frontend/backend proxies */
 
 /* bits for proxy->options */

diff --git a/src/hlua.c b/src/hlua.c
index f8657c502ff59afee25db02fe6b30e2220006041..6a9073e311b4b609ff8b7377faefc9842c593d8e 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -9221,7 +9221,7 @@ void hlua_init(void) {
        hlua_states[1] = hlua_init_state(1);
 
        /* Proxy and server configuration initialisation. */
-       socket_proxy = alloc_new_proxy("LUA-SOCKET", PR_CAP_FE|PR_CAP_BE|PR_CAP_LUA, &errmsg);
+       socket_proxy = alloc_new_proxy("LUA-SOCKET", PR_CAP_FE|PR_CAP_BE|PR_CAP_INT, &errmsg);
        if (!socket_proxy) {
                fprintf(stderr, "Lua init: %s\n", errmsg);
                exit(1);

diff --git a/src/proxy.c b/src/proxy.c
index f6988436907ab52b1e68a69de7553498eb1bac00..10762e296c43e366d4f4fd5fa633f2eccccb2172 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1345,13 +1345,13 @@ void proxy_preset_defaults(struct proxy *defproxy)
 {
        defproxy->mode = PR_MODE_TCP;
        defproxy->disabled = 0;
-       if (!(defproxy->cap & PR_CAP_LUA)) {
+       if (!(defproxy->cap & PR_CAP_INT)) {
                defproxy->maxconn = cfg_maxpconn;
                defproxy->conn_retries = CONN_RETRIES;
        }
        defproxy->redispatch_after = 0;
        defproxy->options = PR_O_REUSE_SAFE;
-       if (defproxy->cap & PR_CAP_LUA)
+       if (defproxy->cap & PR_CAP_INT)
                defproxy->options2 |= PR_O2_INDEPSTR;
        defproxy->max_out_conns = MAX_SRV_LIST;
 
@@ -1384,7 +1384,7 @@ void proxy_preset_defaults(struct proxy *defproxy)
        quic_transport_params_init(&defproxy->defsrv.quic_params, 0);
 #endif
 
-       if (defproxy->cap & PR_CAP_LUA)
+       if (defproxy->cap & PR_CAP_INT)
                defproxy->timeout.connect = 5000;
 }
 
@@ -1481,7 +1481,7 @@ struct proxy *alloc_new_proxy(const char *name, unsigned int cap, char **errmsg)
        curproxy->id = strdup(name);
        curproxy->cap = cap;
 
-       if (!(cap & PR_CAP_LUA))
+       if (!(cap & PR_CAP_INT))
                proxy_store_name(curproxy);
 
  done: