From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 16 Mar 2022 09:01:26 +0000 (+0100)
Subject: BUG/MEDIUM: sink: Properly get the stream-int in appctx callback functions
X-Git-Tag: v2.6-dev4~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53fa787a076e6d9de5a3a7eb9a6b1bbc0831723b;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: sink: Properly get the stream-int in appctx callback functions

The appctx owner is not a stream-interface anymore. It is now a
conn-stream. However, sink code was not updated accordingly. It is now
fixed.

It is 2.6-specific, no backport is needed.
---

diff --git a/src/sink.c b/src/sink.c
index aa0ecfa26e..dd6f6b04a0 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -294,7 +294,7 @@ void sink_setup_proxy(struct proxy *px)
  */
 static void sink_forward_io_handler(struct appctx *appctx)
 {
-	struct stream_interface *si = appctx->owner;
+	struct stream_interface *si = cs_si(appctx->owner);
 	struct stream *s = si_strm(si);
 	struct sink *sink = strm_fe(s)->parent;
 	struct sink_forward_target *sft = appctx->ctx.sft.ptr;
@@ -433,7 +433,7 @@ close:
  */
 static void sink_forward_oc_io_handler(struct appctx *appctx)
 {
-	struct stream_interface *si = appctx->owner;
+	struct stream_interface *si = cs_si(appctx->owner);
 	struct stream *s = si_strm(si);
 	struct sink *sink = strm_fe(s)->parent;
 	struct sink_forward_target *sft = appctx->ctx.sft.ptr;
@@ -580,7 +580,7 @@ void __sink_forward_session_deinit(struct sink_forward_target *sft)
 	if (!sft->appctx)
 		return;
 
-	si = sft->appctx->owner;
+	si = cs_si(sft->appctx->owner);
 	if (!si)
 		return;