upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-14 06:32:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

MINOR: stconn: Simplify sc_abort/sc_shutdown by merging calls to se_shutdown

Browse source 
Calls to se_shutdown were no the same between applets and mux endpoints.
Only the SHUTW flag was not the same. However, on the multiplexers are
sensitive to the true SHUTW flag. The applets handle all of them the same
way. So calls to se_shutdown() from sc_abort() and sc_shutdown() can be
merged to always use the multiplexer version.
This commit is contained in:
Christopher Faulet 2026-03-09 18:40:39 +01:00
parent fb1bc592f5
commit b2b0d1a8be
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/stconn.c
View file

@ -581,10 +581,8 @@ void sc_abort(struct stconn *sc)
return;
if (sc->flags & SC_FL_SHUT_DONE) {
if (sc_ep_test(sc, SE_FL_T_MUX))
if (sc_ep_test(sc, SE_FL_T_MUX|SE_FL_T_APPLET))
se_shutdown(sc->sedesc, SE_SHR_RESET|SE_SHW_SILENT);
else if (sc_ep_test(sc, SE_FL_T_APPLET))
se_shutdown(sc->sedesc, SE_SHR_RESET|SE_SHW_NORMAL);
sc->state = SC_ST_DIS;
if (sc->flags & SC_FL_ISBACK)
@ -639,10 +637,8 @@ void sc_shutdown(struct stconn *sc)
return;
}
if (sc_ep_test(sc, SE_FL_T_MUX))
if (sc_ep_test(sc, SE_FL_T_MUX|SE_FL_T_APPLET))
se_shutdown(sc->sedesc, SE_SHR_RESET|((sc->flags & SC_FL_NOLINGER) ? SE_SHW_SILENT : SE_SHW_NORMAL));
else if (sc_ep_test(sc, SE_FL_T_APPLET))
se_shutdown(sc->sedesc, SE_SHR_RESET|SE_SHW_NORMAL);
sc->state = SC_ST_DIS;
break;