From: Willy Tarreau <w@1wt.eu>
Date: Sat, 4 Apr 2015 14:24:42 +0000 (+0200)
Subject: REORG: stktable: move the stkctr_* functions from stream to sticktable
X-Git-Tag: v1.6-dev2~254
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7698c9080ab059525602ba7ac0bae693a3ca2a58;p=thirdparty%2Fhaproxy.git

REORG: stktable: move the stkctr_* functions from stream to sticktable

These ones are not stream-specific at all and will be needed outside of
stream, so let's move them to stick_tables where struct stkctr is defined.
---

diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 11b98dfe99..de9fd52ead 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -135,4 +135,34 @@ static inline void stksess_kill_if_expired(struct stktable *t, struct stksess *t
 		stksess_kill(t, ts);
 }
 
+/* sets the stick counter's entry pointer */
+static inline void stkctr_set_entry(struct stkctr *stkctr, struct stksess *entry)
+{
+	stkctr->entry = caddr_from_ptr(entry, 0);
+}
+
+/* returns the entry pointer from a stick counter */
+static inline struct stksess *stkctr_entry(struct stkctr *stkctr)
+{
+	return caddr_to_ptr(stkctr->entry);
+}
+
+/* returns the two flags from a stick counter */
+static inline unsigned int stkctr_flags(struct stkctr *stkctr)
+{
+	return caddr_to_data(stkctr->entry);
+}
+
+/* sets up to two flags at a time on a composite address */
+static inline void stkctr_set_flags(struct stkctr *stkctr, unsigned int flags)
+{
+	stkctr->entry = caddr_set_flags(stkctr->entry, flags);
+}
+
+/* returns the two flags from a stick counter */
+static inline void stkctr_clr_flags(struct stkctr *stkctr, unsigned int flags)
+{
+	stkctr->entry = caddr_clr_flags(stkctr->entry, flags);
+}
+
 #endif /* _PROTO_STICK_TABLE_H */
diff --git a/include/proto/stream.h b/include/proto/stream.h
index eade028505..cb16615238 100644
--- a/include/proto/stream.h
+++ b/include/proto/stream.h
@@ -86,36 +86,6 @@ static inline enum obj_type *strm_orig(const struct stream *strm)
 	return strm->sess->origin;
 }
 
-/* sets the stick counter's entry pointer */
-static inline void stkctr_set_entry(struct stkctr *stkctr, struct stksess *entry)
-{
-	stkctr->entry = caddr_from_ptr(entry, 0);
-}
-
-/* returns the entry pointer from a stick counter */
-static inline struct stksess *stkctr_entry(struct stkctr *stkctr)
-{
-	return caddr_to_ptr(stkctr->entry);
-}
-
-/* returns the two flags from a stick counter */
-static inline unsigned int stkctr_flags(struct stkctr *stkctr)
-{
-	return caddr_to_data(stkctr->entry);
-}
-
-/* sets up to two flags at a time on a composite address */
-static inline void stkctr_set_flags(struct stkctr *stkctr, unsigned int flags)
-{
-	stkctr->entry = caddr_set_flags(stkctr->entry, flags);
-}
-
-/* returns the two flags from a stick counter */
-static inline void stkctr_clr_flags(struct stkctr *stkctr, unsigned int flags)
-{
-	stkctr->entry = caddr_clr_flags(stkctr->entry, flags);
-}
-
 /* Remove the refcount from the stream to the tracked counters, and clear the
  * pointer to ensure this is only performed once. The caller is responsible for
  * ensuring that the pointer is valid first.