From 66cbf83d90ac341fba5cc7717f3e059edaab15f0 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 9 Dec 2024 10:37:03 +0100 Subject: [PATCH] MT#61441 rtpengine: use upstream commit from master Change-Id: I0f31579ae986a4f65b98cafc0029d396f8e35284 --- debian/patches/series | 2 +- .../sipwise/rtpengine_add_sip_code.patch | 2 +- ..._totag_to_ng_message_when_rtpp_flags.patch | 11 --------- ...o-tag-for-NG-message-when-rtpp-flags.patch | 24 +++++++++++++++++++ 4 files changed, 26 insertions(+), 13 deletions(-) delete mode 100644 debian/patches/sipwise/rtpengine_always_add_totag_to_ng_message_when_rtpp_flags.patch create mode 100644 debian/patches/upstream/rtpengine-use-to-tag-for-NG-message-when-rtpp-flags.patch diff --git a/debian/patches/series b/debian/patches/series index fb6cf8ba5..2ed48d573 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,6 +39,7 @@ upstream/cfgutils-initialize-the-optional-key.patch upstream/permissions_add_register_allow_with_port_check.patch upstream/multipart-sdp.patch upstream/dialog-don-t-complain-if-dst_var-doesn-t-exist.patch +upstream/rtpengine-use-to-tag-for-NG-message-when-rtpp-flags.patch ### relevant for upstream sipwise/dialplan-don-t-stop-loading-rules-on-error.patch sipwise/kamctl-TMPDIR-config.patch @@ -56,7 +57,6 @@ sipwise/http_client-add-method-parameter-to-http_connect.patch sipwise/lost-add-method-parameter-to-http_connect-calls.patch sipwise/rtpengine_add_sip_code.patch ### active development -sipwise/rtpengine_always_add_totag_to_ng_message_when_rtpp_flags.patch # ### Don't just put stuff in any order ### use gbp pq import/export tooling to help maintain patches diff --git a/debian/patches/sipwise/rtpengine_add_sip_code.patch b/debian/patches/sipwise/rtpengine_add_sip_code.patch index 0a4223484..5b6cbaf7d 100644 --- a/debian/patches/sipwise/rtpengine_add_sip_code.patch +++ b/debian/patches/sipwise/rtpengine_add_sip_code.patch @@ -7,7 +7,7 @@ Subject: rtpengine_add_sip_code 1 file changed, 2 insertions(+) diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c -index e26d533..5fe506d 100644 +index 97eff5b..1bb3ca5 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3278,6 +3278,8 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, diff --git a/debian/patches/sipwise/rtpengine_always_add_totag_to_ng_message_when_rtpp_flags.patch b/debian/patches/sipwise/rtpengine_always_add_totag_to_ng_message_when_rtpp_flags.patch deleted file mode 100644 index c126b1ad8..000000000 --- a/debian/patches/sipwise/rtpengine_always_add_totag_to_ng_message_when_rtpp_flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/modules/rtpengine/rtpengine.c -+++ b/src/modules/rtpengine/rtpengine.c -@@ -3179,7 +3179,7 @@ static bencode_item_t *rtpp_function_cal - */ - - /* affects to-tag parsing */ -- ng_flags.to = (op == OP_DELETE) ? 0 : 1; -+ ng_flags.to = (!parse_by_module || op != OP_DELETE) ? 1 : 0; - - /* module specific parsing */ - if(parse_by_module && flags && parse_flags(&ng_flags, msg, &op, flags->s)) diff --git a/debian/patches/upstream/rtpengine-use-to-tag-for-NG-message-when-rtpp-flags.patch b/debian/patches/upstream/rtpengine-use-to-tag-for-NG-message-when-rtpp-flags.patch new file mode 100644 index 000000000..012ff2889 --- /dev/null +++ b/debian/patches/upstream/rtpengine-use-to-tag-for-NG-message-when-rtpp-flags.patch @@ -0,0 +1,24 @@ +From: Donat Zenichev +Date: Fri, 22 Nov 2024 09:49:40 +0100 +Subject: rtpengine: use to-tag for NG message when rtpp-flags + +Always use to-tag for NG message with rtpp-flags, +if presented. This change is caused by the processing +logic being moved to rtpengine with rtpp-flags. +--- + src/modules/rtpengine/rtpengine.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c +index e26d533..97eff5b 100644 +--- a/src/modules/rtpengine/rtpengine.c ++++ b/src/modules/rtpengine/rtpengine.c +@@ -3179,7 +3179,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, + */ + + /* affects to-tag parsing */ +- ng_flags.to = (op == OP_DELETE) ? 0 : 1; ++ ng_flags.to = (!parse_by_module || op != OP_DELETE) ? 1 : 0; + + /* module specific parsing */ + if(parse_by_module && flags && parse_flags(&ng_flags, msg, &op, flags->s))