From c6b903d51931ec803ee43df85e30228475e80e5a Mon Sep 17 00:00:00 2001 From: Donat Zenichev Date: Fri, 2 Aug 2024 12:26:06 +0200 Subject: [PATCH] MT#60476 treat force_inc_sdp_ver independently Don't treat the `force_inc_sdp_ver` flag as the `replace_sdp_version` one, but consider it as a separate option flag. Correct usage of it accordingly. Additionally: change sdp_version_check() func signature to use `force_increase` as bool. Change-Id: I9ed772a5a3535d887dda5a5a116b6326c8f5f46a --- daemon/call_interfaces.c | 1 - daemon/sdp.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index dc9f12ed4..d9d06df9b 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -842,7 +842,6 @@ static void call_ng_flags_replace(sdp_ng_flags *out, str *s, helper_arg arg) { switch (__csh_lookup(s)) { case CSH_LOOKUP("force-increment-sdp-ver"): out->force_inc_sdp_ver = 1; - out->replace_sdp_version = 1; break; case CSH_LOOKUP("origin"): out->replace_origin = 1; diff --git a/daemon/sdp.c b/daemon/sdp.c index 80d85f321..dd78e9816 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -2919,7 +2919,7 @@ static void sdp_version_replace(struct sdp_chopper *chop, sdp_sessions_q *sessio static void sdp_version_check(struct sdp_chopper *chop, sdp_sessions_q *sessions, struct call_monologue *monologue, - unsigned int force_increase) + bool force_increase) { /* We really expect only a single session here, but we treat all the same regardless, * and use the same version number on all of them */ @@ -3441,8 +3441,8 @@ int sdp_replace(struct sdp_chopper *chop, sdp_sessions_q *sessions, * - if the force_inc_sdp_ver (force-increment-sdp-ver) flag is set additionally to replace_sdp_version, * which forces version increase regardless changes in the SDP information. */ - if (flags->replace_sdp_version || flags->replace_origin_full) - sdp_version_check(chop, sessions, monologue, flags->force_inc_sdp_ver); + if (flags->force_inc_sdp_ver || flags->replace_sdp_version || flags->replace_origin_full) + sdp_version_check(chop, sessions, monologue, !!flags->force_inc_sdp_ver); return 0;