From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 12 May 2022 12:50:09 +0000 (+0200)
Subject: MINOR: sink: Add a ref to sink in the sink_forward_target structure
X-Git-Tag: v2.6-dev11~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ae25ea24;p=thirdparty%2Fhaproxy.git

MINOR: sink: Add a ref to sink in the sink_forward_target structure

This change is required to be able to refactor the init stage of appctx. It
is now possible to directly get the sink from a forward target.
---

diff --git a/include/haproxy/sink-t.h b/include/haproxy/sink-t.h
index 399d87a4ba..a0de3d15a1 100644
--- a/include/haproxy/sink-t.h
+++ b/include/haproxy/sink-t.h
@@ -40,6 +40,7 @@ struct sink_forward_target {
 	struct server *srv;    // used server
 	struct appctx *appctx; // appctx of current session
 	size_t ofs;            // ring buffer reader offset
+	struct sink *sink;     // the associated sink
 	struct sink_forward_target *next;
 	__decl_thread(HA_SPINLOCK_T lock); // lock to protect current struct
 };
diff --git a/src/sink.c b/src/sink.c
index 59391859ee..681f363f82 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -1005,6 +1005,7 @@ struct sink *sink_new_from_logsrv(struct logsrv *logsrv)
 	/* insert into sink_forward_targets
 	 * list into sink
 	 */
+	sft->sink = sink;
 	sft->next = sink->sft;
 	sink->sft = sft;