commit 1d9877700ed732278dc8c60fa16da6523273d6a0
author Christopher Faulet <cfaulet@haproxy.com> Tue Mar 29 18:03:35 2022 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Wed Apr 13 15:10:14 2022 +0200
tree ab892f98ff8595c39dab3727a4a11f767034fa42
parent 8da67aae3ef27776913f0f115f6e770870b597db

MINOR: stream-int/conn-stream: Move half-close timeout in the conn-stream

The half-close timeout (hcto) is now part of the conn-stream. It is a step
closer to the stream-interface removal.

src/stream_interface.c

diff --git a/src/stream_interface.c b/src/stream_interface.c
index b4d7cab..9be918b 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -237,8 +237,8 @@
 	oc->wex = TICK_ETERNITY;
 	si_done_get(si);
 
-	if (tick_isset(si->hcto)) {
-		ic->rto = si->hcto;
+	if (tick_isset(si->cs->hcto)) {
+		ic->rto = si->cs->hcto;
 		ic->rex = tick_add(now_ms, ic->rto);
 	}
 
@@ -1106,8 +1106,8 @@
 	oc->wex = TICK_ETERNITY;
 	si_done_get(si);
 
-	if (tick_isset(si->hcto)) {
-		ic->rto = si->hcto;
+	if (tick_isset(si->cs->hcto)) {
+		ic->rto = si->cs->hcto;
 		ic->rex = tick_add(now_ms, ic->rto);
 	}
 
@@ -1756,8 +1756,8 @@
 	oc->wex = TICK_ETERNITY;
 	si_done_get(si);
 
-	if (tick_isset(si->hcto)) {
-		ic->rto = si->hcto;
+	if (tick_isset(si->cs->hcto)) {
+		ic->rto = si->cs->hcto;
 		ic->rex = tick_add(now_ms, ic->rto);
 	}