TT#78500 update patches merged upstream

Change-Id: I428ca0fb34ea5b02e9286fe40bcae48dfa185ff9

debian/patches/series

@@ -72,7 +72,8 @@ upstream/cfgt-use-snprintf-instead-of-sprintf.patch
 upstream/tm_add_proportional_load_contacts_by_q_value.patch
 upstream/avpops-add-avp_subst_pv-documentation.patch
 upstream/avpops-add-avp_subst_pv.patch
-sipwise/fix_incorrect_branch_id_via_branch_next.patch
+upstream/rtpengine-update-fix-via-branch-next-ID-generation.patch
+upstream/rtpengine-t38-options.patch
 ### relevant for upstream
 sipwise/fix_error_in_cfgt_module.patch
 sipwise/pv_headers-store-To-info-in-xavp_parsed_name.r-on-re.patch
@@ -97,4 +98,3 @@ sipwise/pua_dialoginfo-local_identity_dlg_var.patch
 ## git checkout -- debian/
 ### git commit + git-review as usual
 ###
-sipwise/rtpengine-t38-options.patch

debian/patches/upstream/rtpengine-t38-options.patch

@@ -1,6 +1,17 @@
+From 6ab1431464f97e856812e0f69d77bc96e3dd8f57 Mon Sep 17 00:00:00 2001
+From: Richard Fuchs <rfuchs@sipwise.com>
+Date: Wed, 25 Mar 2020 09:00:40 -0400
+Subject: [PATCH] rtpengine: add support for new T.38 options
+
+---
+ src/modules/rtpengine/rtpengine.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c
+index 6d821aee7a..7be7968660 100644
 --- a/src/modules/rtpengine/rtpengine.c
 +++ b/src/modules/rtpengine/rtpengine.c
-@@ -117,6 +117,7 @@
+@@ -118,6 +118,7 @@ enum {
  struct ng_flags_parse {
  	int via, to, packetize, transport, directional;
  	bencode_item_t *dict, *flags, *direction, *replace, *rtcp_mux, *sdes,
@@ -8,7 +19,7 @@
  		       *codec, *codec_strip, *codec_offer, *codec_transcode, *codec_mask;
  	str call_id, from_tag, to_tag;
  };
-@@ -2112,6 +2113,10 @@
+@@ -2125,6 +2126,10 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu
  			bencode_list_add_str(ng_flags->sdes, &s);
  			goto next;
  		}
@@ -19,7 +30,7 @@
  		if (str_key_val_prefix(&key, "rtcp-mux", &val, &s)) {
  			bencode_list_add_str(ng_flags->rtcp_mux, &s);
  			goto next;
-@@ -2389,6 +2394,7 @@
+@@ -2402,6 +2407,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_
  		ng_flags.replace = bencode_list(bencbuf);
  		ng_flags.rtcp_mux = bencode_list(bencbuf);
  		ng_flags.sdes = bencode_list(bencbuf);
@@ -27,7 +38,7 @@
  		ng_flags.codec = bencode_dictionary(bencbuf);
  
  		if (read_sdp_pvar!= NULL) {
-@@ -2442,6 +2448,8 @@
+@@ -2455,6 +2461,8 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_
  		bencode_dictionary_add(ng_flags.dict, "rtcp-mux", ng_flags.rtcp_mux);
  	if (ng_flags.sdes && ng_flags.sdes->child)
  		bencode_dictionary_add(ng_flags.dict, "SDES", ng_flags.sdes);

debian/patches/upstream/rtpengine-update-fix-via-branch-next-ID-generation.patch

@@ -1,6 +1,18 @@
+From ad3ae0133f321e357cf09f65f2067ed10d9c64a2 Mon Sep 17 00:00:00 2001
+From: Richard Fuchs <rfuchs@sipwise.com>
+Date: Tue, 28 Jan 2020 09:13:11 -0500
+Subject: [PATCH] rtpengine: update/fix via-branch=next ID generation
+
+- via-branch=next should not use a hard-coded branch index of zero, but
+instead use the actual branch index from the tm module
+- also adds via-branch=auto-next and via-branch=auto-extra for easier
+processing in scripts
+---
+diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c
+index 9399f94e00..4db1461f0d 100644
 --- a/src/modules/rtpengine/rtpengine.c
 +++ b/src/modules/rtpengine/rtpengine.c
-@@ -2255,6 +2255,10 @@
+@@ -2268,6 +2268,10 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu
  						ng_flags->via = -1;
  					else if (str_eq(&val, "next"))
  						ng_flags->via = -2;
@@ -11,7 +23,7 @@
  					else
  						goto error;
  					goto next;
-@@ -2350,6 +2354,8 @@
+@@ -2363,6 +2367,8 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_
  	char md5[MD5_LEN];
  	char branch_buf[MAX_BRANCH_PARAM_LEN];
  	bencode_item_t *result;
@@ -20,7 +32,7 @@
  
  	/*** get & init basic stuff needed ***/
  
-@@ -2440,11 +2446,21 @@
+@@ -2453,11 +2459,21 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_
  	bencode_dictionary_add_str(ng_flags.dict, "call-id", &ng_flags.call_id);
  
  	if (ng_flags.via) {
@@ -44,7 +56,7 @@
  			case 1:
  			case 2:
  				ret = get_via_branch(msg, ng_flags.via, &viabranch);
-@@ -2456,10 +2472,16 @@
+@@ -2469,10 +2485,16 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_
  			case -2:
  				if (!char_msg_val(msg, md5))
  					break;
@@ -79,3 +91,6 @@
  				This can be used to create one media session per branch
  				on the &rtp; proxy. When sending a subsequent <quote>delete</quote> command to
  				the &rtp; proxy, you can then stop just the session for a specific branch when
+-- 
+2.20.1
+