From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Thu, 5 Dec 2024 12:09:52 +0000 (+0100)
Subject: CLEANUP: stktable: add some stktable flags polishing
X-Git-Tag: v3.2-dev1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae9d8d40d0bc510ffef19a9a77d5837dc55609d1;p=thirdparty%2Fhaproxy.git

CLEANUP: stktable: add some stktable flags polishing

Better late than never, commit 1f73d35 ("MINOR: stktable: implement
"recv-only" table option") implemented stktable flags and initial
definitions, but it lacks some comments plus the flag is stored as
16bits but the SKT_FL_ definition width allows for only 8bits so
it is a bit confusing, let's fix that
---

diff --git a/include/haproxy/stick_table-t.h b/include/haproxy/stick_table-t.h
index 43b6e5e8f7..2340cdf59f 100644
--- a/include/haproxy/stick_table-t.h
+++ b/include/haproxy/stick_table-t.h
@@ -155,11 +155,12 @@ struct stksess {
 	/* WARNING! do not put anything after <keys>, it's used by the key */
 };
 
-#define STK_FL_NONE      0x00
-#define STK_FL_RECV_ONLY 0x01      /* table is assumed to be remotely updated only
+/* stktable struct flags */
+#define STK_FL_NONE      0x0000
+#define STK_FL_RECV_ONLY 0x0001    /* table is assumed to be remotely updated only
                                     * (never updated locally)
                                     */
-#define STK_FL_NOPURGE   0x02      /* if non-zero, don't purge sticky sessions when full */
+#define STK_FL_NOPURGE   0x0002    /* if non-zero, don't purge sticky sessions when full */
 
 /* stick table */
 struct stktable {
@@ -189,7 +190,7 @@ struct stktable {
 	int data_ofs[STKTABLE_DATA_TYPES]; /* negative offsets of present data types, or 0 if absent */
 	unsigned int data_nbelem[STKTABLE_DATA_TYPES]; /* to store nb_elem in case of array types */
 	unsigned int brates_factor; /* Factor used for IN/OUT bytes rates */
-	uint16_t flags;
+	uint16_t flags; /* STK_FL_* flags */
 	/* 2-bytes hole */
 	union {
 		int i;