From 4fbf82cbde5283088bed34ff338edbff0e670b2d Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 13 Jun 2024 09:17:49 +0200 Subject: [PATCH] MT#60312 remove already applied patches * refresh patches Change-Id: I582067c3edec1d02ec39a25815916ebe5bf8d079 --- .../patches/debian/no_lib64_on_64_bits.patch | 2 +- debian/patches/series | 1 - ...on-t-call-free-on-empty-pcre-pointer.patch | 23 ------ debian/patches/upstream/multipart-sdp.patch | 14 +++- ...s_add_register_allow_with_port_check.patch | 16 ++-- .../rtpengine_rework_rtpp_flags.patch | 82 +++++++++---------- 6 files changed, 60 insertions(+), 78 deletions(-) delete mode 100644 debian/patches/upstream/dialplan-don-t-call-free-on-empty-pcre-pointer.patch diff --git a/debian/patches/debian/no_lib64_on_64_bits.patch b/debian/patches/debian/no_lib64_on_64_bits.patch index bd4d37795..1e33c53a4 100644 --- a/debian/patches/debian/no_lib64_on_64_bits.patch +++ b/debian/patches/debian/no_lib64_on_64_bits.patch @@ -7,7 +7,7 @@ Subject: no_lib64_on_64_bits 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Makefile.defs b/src/Makefile.defs -index 0f960b4..e76f3f7 100644 +index 07fa021..e30c350 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -454,15 +454,7 @@ endif diff --git a/debian/patches/series b/debian/patches/series index 37c1a3957..3d1626d13 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -38,7 +38,6 @@ upstream/rtpengine_rework_rtpp_flags.patch upstream/cfgutils-expose-optional-second-string-key-for-lock.patch upstream/cfgutils-initialize-the-optional-key.patch upstream/permissions_add_register_allow_with_port_check.patch -upstream/dialplan-don-t-call-free-on-empty-pcre-pointer.patch upstream/multipart-sdp.patch ### relevant for upstream sipwise/dialplan-don-t-stop-loading-rules-on-error.patch diff --git a/debian/patches/upstream/dialplan-don-t-call-free-on-empty-pcre-pointer.patch b/debian/patches/upstream/dialplan-don-t-call-free-on-empty-pcre-pointer.patch deleted file mode 100644 index d16019c98..000000000 --- a/debian/patches/upstream/dialplan-don-t-call-free-on-empty-pcre-pointer.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Victor Seva -Date: Thu, 30 May 2024 14:59:05 +0200 -Subject: dialplan: don't call free on empty pcre pointer - -fixes #3851 ---- - src/modules/dialplan/dp_repl.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c -index 42ba3b4..51cab40 100644 ---- a/src/modules/dialplan/dp_repl.c -+++ b/src/modules/dialplan/dp_repl.c -@@ -648,7 +648,8 @@ search_rule: - LM_DBG("match check skipped: [%.*s] %d\n", - re_list->expr.len, re_list->expr.s, rez); - rt = re_list->next; -- pcre2_match_data_free(pcre_md); -+ if(pcre_md) -+ pcre2_match_data_free(pcre_md); - pcre2_code_free(re_list->re); - pkg_free(re_list); - re_list = rt; diff --git a/debian/patches/upstream/multipart-sdp.patch b/debian/patches/upstream/multipart-sdp.patch index f88382b9d..6ab27d302 100644 --- a/debian/patches/upstream/multipart-sdp.patch +++ b/debian/patches/upstream/multipart-sdp.patch @@ -1,6 +1,16 @@ +From: Sipwise Development Team +Date: Thu, 13 Jun 2024 09:18:18 +0200 +Subject: multipart-sdp + +--- + src/modules/rtpengine/rtpengine.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c +index 84df238..e26d533 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c -@@ -4693,28 +4693,13 @@ +@@ -4696,28 +4696,13 @@ static int rtpengine_offer_answer(struct sip_msg *msg, void *d, pkg_free(newbody.s); } else { @@ -33,7 +43,7 @@ anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); } else { anchor = del_lump(msg, body.s - msg->buf, body.len, 0); -@@ -4727,6 +4712,21 @@ +@@ -4730,6 +4715,21 @@ static int rtpengine_offer_answer(struct sip_msg *msg, void *d, LM_ERR("insert_new_lump_after failed\n"); goto error_free; } diff --git a/debian/patches/upstream/permissions_add_register_allow_with_port_check.patch b/debian/patches/upstream/permissions_add_register_allow_with_port_check.patch index 5c81a0665..186112bdc 100644 --- a/debian/patches/upstream/permissions_add_register_allow_with_port_check.patch +++ b/debian/patches/upstream/permissions_add_register_allow_with_port_check.patch @@ -1,4 +1,3 @@ -From 534a35956b1a79598dcd2436248c5d7ce4e92da8 Mon Sep 17 00:00:00 2001 From: Donat Zenichev Date: Fri, 10 May 2024 09:43:28 +0200 Subject: [PATCH] permissions: introduce func `allow_register_include_port()` @@ -24,13 +23,13 @@ Full backwards compatibility is kept in place, no need for users of the module to change anything in their configuration or kamailio script itself. --- - src/modules/permissions/doc/permissions.xml | 7 + - .../permissions/doc/permissions_admin.xml | 142 ++++++++++++++++++ - src/modules/permissions/permissions.c | 63 ++++++-- + src/modules/permissions/doc/permissions.xml | 7 ++ + src/modules/permissions/doc/permissions_admin.xml | 142 ++++++++++++++++++++++ + src/modules/permissions/permissions.c | 63 ++++++++-- 3 files changed, 200 insertions(+), 12 deletions(-) diff --git a/src/modules/permissions/doc/permissions.xml b/src/modules/permissions/doc/permissions.xml -index 10b16ae1e9..a8adfdf944 100644 +index 10b16ae..a8adfdf 100644 --- a/src/modules/permissions/doc/permissions.xml +++ b/src/modules/permissions/doc/permissions.xml @@ -48,6 +48,13 @@ @@ -48,7 +47,7 @@ index 10b16ae1e9..a8adfdf944 100644 2003 diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml -index 4ddde99d62..494a7ecc0f 100644 +index 4ddde99..494a7ec 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -121,6 +121,8 @@ @@ -227,7 +226,7 @@ index 4ddde99d62..494a7ecc0f 100644 + diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c -index 2b860b81b2..f91f1a0f11 100644 +index 2b860b8..f91f1a0 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -123,6 +123,10 @@ static int allow_routing_2( @@ -365,6 +364,3 @@ index 2b860b81b2..f91f1a0f11 100644 } --- -2.34.1 - diff --git a/debian/patches/upstream/rtpengine_rework_rtpp_flags.patch b/debian/patches/upstream/rtpengine_rework_rtpp_flags.patch index e7ac32304..f8520bcbb 100644 --- a/debian/patches/upstream/rtpengine_rework_rtpp_flags.patch +++ b/debian/patches/upstream/rtpengine_rework_rtpp_flags.patch @@ -33,7 +33,7 @@ This brings a list of benifits, such as: 1 file changed, 600 insertions(+), 234 deletions(-) diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c -index c0727ed..b116c05 100644 +index 561384d..84df238 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -152,6 +152,11 @@ static const char *command_strings[] = { @@ -112,7 +112,7 @@ index c0727ed..b116c05 100644 {"rtpengine_query_v", (cmd_function)w_rtpengine_query_v, 2, fixup_rtpengine_query_v, fixup_free_rtpengine_query_v, ANY_ROUTE}, -@@ -2654,6 +2679,124 @@ static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, +@@ -2656,6 +2681,124 @@ static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, return 1; } @@ -237,7 +237,7 @@ index c0727ed..b116c05 100644 /** * Parse the flags string */ -@@ -2934,28 +3077,33 @@ error: +@@ -2936,28 +3079,33 @@ error: return -1; } @@ -278,7 +278,7 @@ index c0727ed..b116c05 100644 if(IS_SIP(msg) || IS_SIP_REPLY(msg)) { if(get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { -@@ -2972,54 +3120,70 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, +@@ -2974,54 +3122,70 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, return NULL; } } @@ -377,7 +377,7 @@ index c0727ed..b116c05 100644 if(!IS_SIP(msg) && !IS_SIP_REPLY(msg)) { /* check required values */ if(ng_flags.call_id.len == 0) { -@@ -3032,130 +3196,95 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, +@@ -3034,130 +3198,95 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, } } @@ -587,7 +587,7 @@ index c0727ed..b116c05 100644 if(bencbuf->error) { LM_ERR("out of memory - bencode failed\n"); -@@ -3334,12 +3463,19 @@ error: +@@ -3336,12 +3465,19 @@ error: } static int rtpp_function_call_simple( @@ -609,7 +609,7 @@ index c0727ed..b116c05 100644 if(!ret) return -1; -@@ -3361,12 +3497,12 @@ static int rtpengine_simple_wrap( +@@ -3363,12 +3499,12 @@ static int rtpengine_simple_wrap( static bencode_item_t *rtpp_function_call_ok(bencode_buffer_t *bencbuf, @@ -624,7 +624,7 @@ index c0727ed..b116c05 100644 if(!ret) return NULL; -@@ -4188,11 +4324,19 @@ static void parse_call_stats(bencode_item_t *dict, struct sip_msg *msg) +@@ -4191,11 +4327,19 @@ static void parse_call_stats(bencode_item_t *dict, struct sip_msg *msg) parse_call_stats_1(&side_B_mos_stats, dict, msg); } @@ -646,7 +646,7 @@ index c0727ed..b116c05 100644 if(!ret) return -1; parse_call_stats(ret, msg); -@@ -4200,11 +4344,19 @@ static int rtpengine_delete(struct sip_msg *msg, const char *flags) +@@ -4203,11 +4347,19 @@ static int rtpengine_delete(struct sip_msg *msg, const char *flags) return 1; } @@ -668,7 +668,7 @@ index c0727ed..b116c05 100644 if(!ret) return -1; parse_call_stats(ret, msg); -@@ -4251,9 +4403,15 @@ static int rtpengine_delete_wrap( +@@ -4254,9 +4406,15 @@ static int rtpengine_delete_wrap( static int rtpengine_rtpp_set_wrap_fparam(struct sip_msg *msg, int (*func)(struct sip_msg *msg, void *, int, enum rtpe_operation), @@ -685,7 +685,7 @@ index c0727ed..b116c05 100644 flags.s = NULL; if(str1) { -@@ -4261,15 +4419,25 @@ static int rtpengine_rtpp_set_wrap_fparam(struct sip_msg *msg, +@@ -4264,15 +4422,25 @@ static int rtpengine_rtpp_set_wrap_fparam(struct sip_msg *msg, LM_ERR("Error getting string parameter\n"); return -1; } @@ -713,7 +713,7 @@ index c0727ed..b116c05 100644 } static int rtpengine_query_wrap( -@@ -4281,7 +4449,7 @@ static int rtpengine_query_wrap( +@@ -4284,7 +4452,7 @@ static int rtpengine_query_wrap( static int rtpengine_query1_f(struct sip_msg *msg, char *str1, char *str2) { return rtpengine_rtpp_set_wrap_fparam( @@ -722,7 +722,7 @@ index c0727ed..b116c05 100644 } -@@ -4361,7 +4529,7 @@ static int set_rtpengine_set_f(struct sip_msg *msg, char *str1, char *str2) +@@ -4364,7 +4532,7 @@ static int set_rtpengine_set_f(struct sip_msg *msg, char *str1, char *str2) return 1; } @@ -731,7 +731,7 @@ index c0727ed..b116c05 100644 { int method; int nosdp; -@@ -4388,7 +4556,7 @@ static int rtpengine_manage(struct sip_msg *msg, const char *flags) +@@ -4391,7 +4559,7 @@ static int rtpengine_manage(struct sip_msg *msg, const char *flags) return -1; if(method & (METHOD_CANCEL | METHOD_BYE)) @@ -740,7 +740,7 @@ index c0727ed..b116c05 100644 if(msg->msg_flags & FL_SDP_BODY) nosdp = 0; -@@ -4397,9 +4565,9 @@ static int rtpengine_manage(struct sip_msg *msg, const char *flags) +@@ -4400,9 +4568,9 @@ static int rtpengine_manage(struct sip_msg *msg, const char *flags) if(msg->first_line.type == SIP_REQUEST) { if((method & (METHOD_ACK | METHOD_PRACK)) && nosdp == 0) @@ -752,7 +752,7 @@ index c0727ed..b116c05 100644 if(method == METHOD_INVITE && nosdp == 0) { msg->msg_flags |= FL_SDP_BODY; if(tmb.t_gett != NULL) { -@@ -4409,21 +4577,21 @@ static int rtpengine_manage(struct sip_msg *msg, const char *flags) +@@ -4412,21 +4580,21 @@ static int rtpengine_manage(struct sip_msg *msg, const char *flags) } } if(route_type == FAILURE_ROUTE) @@ -781,7 +781,7 @@ index c0727ed..b116c05 100644 } } return -1; -@@ -4438,13 +4606,13 @@ static int rtpengine_manage_wrap( +@@ -4441,13 +4609,13 @@ static int rtpengine_manage_wrap( static int rtpengine_manage1_f(struct sip_msg *msg, char *str1, char *str2) { return rtpengine_rtpp_set_wrap_fparam( @@ -797,7 +797,7 @@ index c0727ed..b116c05 100644 } static int rtpengine_offer_wrap( -@@ -4456,7 +4624,7 @@ static int rtpengine_offer_wrap( +@@ -4459,7 +4627,7 @@ static int rtpengine_offer_wrap( static int rtpengine_offer1_f(struct sip_msg *msg, char *str1, char *str2) { return rtpengine_rtpp_set_wrap_fparam( @@ -806,7 +806,7 @@ index c0727ed..b116c05 100644 } static int rtpengine_answer_wrap( -@@ -4467,19 +4635,21 @@ static int rtpengine_answer_wrap( +@@ -4470,19 +4638,21 @@ static int rtpengine_answer_wrap( static int rtpengine_answer1_f(struct sip_msg *msg, char *str1, char *str2) { @@ -831,7 +831,7 @@ index c0727ed..b116c05 100644 bencode_buffer_t bencbuf; bencode_item_t *dict; str body, newbody; -@@ -4489,7 +4659,11 @@ static int rtpengine_offer_answer(struct sip_msg *msg, const char *flags, +@@ -4492,7 +4662,11 @@ static int rtpengine_offer_answer(struct sip_msg *msg, const char *flags, str cl_field = STR_NULL; str cl_repl = STR_NULL; @@ -844,7 +844,7 @@ index c0727ed..b116c05 100644 if(!dict) return -1; -@@ -4573,7 +4747,7 @@ static int rtpengine_generic_f( +@@ -4576,7 +4750,7 @@ static int rtpengine_generic_f( struct sip_msg *msg, char *str1, enum rtpe_operation op) { return rtpengine_rtpp_set_wrap_fparam( @@ -853,7 +853,7 @@ index c0727ed..b116c05 100644 } static int start_recording_f(struct sip_msg *msg, char *str1, char *str2) -@@ -4619,6 +4793,9 @@ static int unsilence_media_f(struct sip_msg *msg, char *str1, char *str2) +@@ -4622,6 +4796,9 @@ static int unsilence_media_f(struct sip_msg *msg, char *str1, char *str2) static int rtpengine_play_media( struct sip_msg *msg, void *d, int more, enum rtpe_operation op) { @@ -863,7 +863,7 @@ index c0727ed..b116c05 100644 bencode_buffer_t bencbuf; long long duration; bencode_item_t *ret; -@@ -4626,7 +4803,11 @@ static int rtpengine_play_media( +@@ -4629,7 +4806,11 @@ static int rtpengine_play_media( pv_value_t val; int retval = 1; @@ -876,7 +876,7 @@ index c0727ed..b116c05 100644 if(!ret) return -1; if(media_duration_pvar) { -@@ -4652,7 +4833,7 @@ static int rtpengine_play_media( +@@ -4655,7 +4836,7 @@ static int rtpengine_play_media( static int play_media_f(struct sip_msg *msg, char *str1, char *str2) { return rtpengine_rtpp_set_wrap_fparam( @@ -885,7 +885,7 @@ index c0727ed..b116c05 100644 } static int stop_media_f(struct sip_msg *msg, char *str1, char *str2) -@@ -4690,7 +4871,7 @@ static int rtpengine_rtpstat_wrap( +@@ -4693,7 +4874,7 @@ static int rtpengine_rtpstat_wrap( param = parms[0]; res = parms[1]; @@ -894,7 +894,7 @@ index c0727ed..b116c05 100644 if(!dict) return -1; -@@ -4859,7 +5040,7 @@ static int rtpengine_query_v_wrap( +@@ -4862,7 +5043,7 @@ static int rtpengine_query_v_wrap( fmt = parms[0]; dst = parms[1]; @@ -903,7 +903,7 @@ index c0727ed..b116c05 100644 if(!dict) { return -1; } -@@ -4991,158 +5172,267 @@ static int set_rtp_inst_pvar(struct sip_msg *msg, const str *const uri) +@@ -4994,158 +5175,267 @@ static int set_rtp_inst_pvar(struct sip_msg *msg, const str *const uri) } /** @@ -1212,7 +1212,7 @@ index c0727ed..b116c05 100644 static int ki_set_rtpengine_set(sip_msg_t *msg, int r1) { -@@ -5219,6 +5509,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5222,6 +5512,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1225,7 +1225,7 @@ index c0727ed..b116c05 100644 { str_init("rtpengine"), str_init("rtpengine_offer0"), SR_KEMIP_INT, ki_rtpengine_offer0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, -@@ -5229,6 +5525,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5232,6 +5528,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1238,7 +1238,7 @@ index c0727ed..b116c05 100644 { str_init("rtpengine"), str_init("rtpengine_answer0"), SR_KEMIP_INT, ki_rtpengine_answer0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, -@@ -5239,6 +5541,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5242,6 +5544,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1251,7 +1251,7 @@ index c0727ed..b116c05 100644 { str_init("rtpengine"), str_init("rtpengine_delete0"), SR_KEMIP_INT, ki_rtpengine_delete0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, -@@ -5249,6 +5557,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5252,6 +5560,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1264,7 +1264,7 @@ index c0727ed..b116c05 100644 { str_init("rtpengine"), str_init("start_recording"), SR_KEMIP_INT, ki_start_recording, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, -@@ -5260,7 +5574,7 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5263,7 +5577,7 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1273,7 +1273,7 @@ index c0727ed..b116c05 100644 SR_KEMIP_INT, ki_block_media0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } -@@ -5270,6 +5584,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5273,6 +5587,12 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1286,7 +1286,7 @@ index c0727ed..b116c05 100644 { str_init("rtpengine"), str_init("unblock_media0"), SR_KEMIP_INT, ki_unblock_media0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, -@@ -5280,8 +5600,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5283,8 +5603,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1301,7 +1301,7 @@ index c0727ed..b116c05 100644 SR_KEMIP_INT, ki_silence_media0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } -@@ -5291,7 +5616,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5294,7 +5619,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1316,7 +1316,7 @@ index c0727ed..b116c05 100644 SR_KEMIP_INT, ki_unsilence_media0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } -@@ -5301,8 +5632,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5304,8 +5635,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1331,7 +1331,7 @@ index c0727ed..b116c05 100644 SR_KEMIP_INT, ki_block_dtmf0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } -@@ -5312,7 +5648,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5315,7 +5651,13 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1346,7 +1346,7 @@ index c0727ed..b116c05 100644 SR_KEMIP_INT, ki_unblock_dtmf0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } -@@ -5322,13 +5664,24 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5325,13 +5667,24 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1372,7 +1372,7 @@ index c0727ed..b116c05 100644 SR_KEMIP_INT, ki_stop_media0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } -@@ -5338,6 +5691,11 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5341,6 +5694,11 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1384,7 +1384,7 @@ index c0727ed..b116c05 100644 { str_init("rtpengine"), str_init("set_rtpengine_set"), SR_KEMIP_INT, ki_set_rtpengine_set, -@@ -5349,6 +5707,7 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5352,6 +5710,7 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -1392,7 +1392,7 @@ index c0727ed..b116c05 100644 { str_init("rtpengine"), str_init("rtpengine_query0"), SR_KEMIP_INT, ki_rtpengine_query0, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, -@@ -5359,7 +5718,14 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { +@@ -5362,7 +5721,14 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },