MT#61441 rtpengine: use upstream commit from master

Change-Id: I0f31579ae986a4f65b98cafc0029d396f8e35284

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

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,

debian/patches/sipwise/rtpengine_always_add_totag_to_ng_message_when_rtpp_flags.patch

@@ -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))

debian/patches/upstream/rtpengine-use-to-tag-for-NG-message-when-rtpp-flags.patch

@@ -0,0 +1,24 @@
+From: Donat Zenichev <dzenichev@sipwise.com>
+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))