From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 25 Oct 2021 09:41:53 +0000 (+0200)
Subject: CLEANUP: lua: Remove any ambiguities about lua txn execution context flags
X-Git-Tag: v2.5-dev12~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24a58fbd7ea0d8cdf28defc2d6f93e5e05b36793;p=thirdparty%2Fhaproxy.git

CLEANUP: lua: Remove any ambiguities about lua txn execution context flags

Flags used to set the execution context of a lua txn are used as an enum. It is
not uncommon but there are few flags otherwise. So to remove ambiguities, a
comment and a _NONE value are added to have a clear definition of supported
values.

This patch should fix the issue #1429. No backport needed.
---

diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index 3d33834c76..e4853d3479 100644
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -65,8 +65,15 @@ struct stream;
 #define HLUA_F_AS_STRING    0x01
 #define HLUA_F_MAY_USE_HTTP 0x02
 
+/* HLUA TXN flags */
 #define HLUA_TXN_NOTERM   0x00000001
 /* 0x00000002 .. 0x00000008 unused */
+
+/* The execution context (enum), bits values from 0x00000010 to
+ * 0x00000030. These flags are mutually exclusives. Only one must be set at a
+ * time.
+ */
+#define HLUA_TXN_SMP_NONE 0x00000000 /* No specific execution context */
 #define HLUA_TXN_SMP_CTX  0x00000010 /* Executed from a sample fecth context */
 #define HLUA_TXN_ACT_CTX  0x00000020 /* Executed from a action context */
 #define HLUA_TXN_FLT_CTX  0x00000030 /* Executed from a filter context */