MEDIUM: counters: use sc0/sc1/sc2 instead of sc1/sc2/sc3
It was a bit inconsistent to have gpc start at 0 and sc start at 1,
so make sc start at zero like gpc. No previous release was issued
with sc3 anyway, so no existing setup should be affected.
diff --git a/include/proto/proto_tcp.h b/include/proto/proto_tcp.h
index 0712764..4644452 100644
--- a/include/proto/proto_tcp.h
+++ b/include/proto/proto_tcp.h
@@ -64,7 +64,7 @@
*/
static inline int tcp_trk_idx(int trk_action)
{
- return trk_action - TCP_ACT_TRK_SC1;
+ return trk_action - TCP_ACT_TRK_SC0;
}
#endif /* _PROTO_PROTO_TCP_H */
diff --git a/include/proto/session.h b/include/proto/session.h
index 5188639..cc1242d 100644
--- a/include/proto/session.h
+++ b/include/proto/session.h
@@ -87,7 +87,7 @@
if (!s->stkctr[i].entry)
continue;
- if (!(s->flags & (SN_BE_TRACK_SC1 << i)))
+ if (!(s->flags & (SN_BE_TRACK_SC0 << i)))
continue;
ptr = stktable_data_ptr(s->stkctr[i].table, s->stkctr[i].entry, STKTABLE_DT_CONN_CUR);
@@ -173,7 +173,7 @@
if (!s->stkctr[i].entry)
continue;
- if (!(s->flags & (SN_BE_TRACK_SC1 << i)))
+ if (!(s->flags & (SN_BE_TRACK_SC0 << i)))
continue;
ptr = stktable_data_ptr(s->stkctr[i].table, s->stkctr[i].entry, STKTABLE_DT_HTTP_REQ_CNT);
diff --git a/include/types/proto_tcp.h b/include/types/proto_tcp.h
index c9fd1e4..a820462 100644
--- a/include/types/proto_tcp.h
+++ b/include/types/proto_tcp.h
@@ -33,9 +33,9 @@
TCP_ACT_ACCEPT = 1,
TCP_ACT_REJECT = 2,
TCP_ACT_EXPECT_PX = 3,
- TCP_ACT_TRK_SC1 = 4, /* TCP request tracking : must be contiguous */
- TCP_ACT_TRK_SC2 = 5,
- TCP_ACT_TRK_SC3 = 6,
+ TCP_ACT_TRK_SC0 = 4, /* TCP request tracking : must be contiguous */
+ TCP_ACT_TRK_SC1 = 5,
+ TCP_ACT_TRK_SC2 = 6,
};
struct tcp_rule {
diff --git a/include/types/session.h b/include/types/session.h
index efdcaa6..00ed4cb 100644
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -91,9 +91,9 @@
#define SN_COMP_READY 0x00100000 /* the compression is initialized */
/* session tracking flags: these ones must absolutely be contiguous. See also s->stkctr */
-#define SN_BE_TRACK_SC1 0x00200000 /* backend tracks stick-counter 1 */
-#define SN_BE_TRACK_SC2 0x00400000 /* backend tracks stick-counter 2 */
-#define SN_BE_TRACK_SC3 0x00800000 /* backend tracks stick-counter 3 */
+#define SN_BE_TRACK_SC0 0x00200000 /* backend tracks stick-counter 0 */
+#define SN_BE_TRACK_SC1 0x00400000 /* backend tracks stick-counter 1 */
+#define SN_BE_TRACK_SC2 0x00800000 /* backend tracks stick-counter 2 */
#define SN_BE_TRACK_ANY 0x00E00000 /* union of all SN_BE_TRACK_* above */