sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:5.4:900a05c4: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.4 Commit: 900a05c4ba32513ebb61428ef53a4d1705f58443 URL: https://github.com/kamailio/kamailio/commit/900a05c4ba32513ebb61428ef53a4d1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-26T11:16:32+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/900a05c4ba32513ebb61428ef53a4d1… Patch: https://github.com/kamailio/kamailio/commit/900a05c4ba32513ebb61428ef53a4d1… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index bd67b08983..74543b05d7 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -741,10 +741,13 @@ if (has_body("multipart/mixed")) { 4.23. append_to_reply(txt) - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + Kamailio (e.g., via sl_send_reply(...)). Meaning of the parameters is as follows: - * txt - String which may contains pseudo-variables. + * txt - String which may contains pseudo-variables. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, FAILURE_ROUTE, ERROR_ROUTE. @@ -757,12 +760,14 @@ append_to_reply("Foo: $rm at $Ts\r\n"); 4.24. append_hf(txt[, hdr]) - Appends 'txt' as header after first header field or after last 'hdr' - header field. + Appends 'txt' as header at the end of the all headers, or after last + header named 'hdr' if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be appended. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name after which the 'txt' is appended. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, @@ -776,12 +781,14 @@ append_hf("From-username: $fU\r\n", "Call-ID"); 4.25. insert_hf(txt[, hdr]) - Inserts 'txt' as header before the first header field or before first - 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before first + header named 'hdr'if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be inserted. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name before which the 'txt' is inserted. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

3 years, 8 months

git:5.4:7cd88cf0: textops: docs - some enhancements to basic header operations functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 7cd88cf05f25a5a5883d936285ac51f82911e9af URL: https://github.com/kamailio/kamailio/commit/7cd88cf05f25a5a5883d936285ac51f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:46+01:00 textops: docs - some enhancements to basic header operations functions (cherry picked from commit 374f0f05bdf27ddaf5d8652560738fbfb886c43c) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7cd88cf05f25a5a5883d936285ac51f… Patch: https://github.com/kamailio/kamailio/commit/7cd88cf05f25a5a5883d936285ac51f… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index a8685510a0..44540841d4 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -872,13 +872,15 @@ if (has_body("multipart/mixed")) { <function moreinfo="none">append_to_reply(txt)</function> </title> <para> - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + &kamailio; (e.g., via sl_send_reply(...)). </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - String which may contains - pseudo-variables. + pseudo-variables. Note that the value has to be ended with "\r\n" + (end of header characters sequence). </para> </listitem> </itemizedlist> @@ -902,15 +904,16 @@ append_to_reply("Foo: $rm at $Ts\r\n"); <function moreinfo="none">append_hf(txt[, hdr])</function> </title> <para> - Appends 'txt' as header after first header field or after - last 'hdr' header field. + Appends 'txt' as header at the end of the all headers, or after + last header named 'hdr' if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be appended. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem> @@ -939,15 +942,16 @@ append_hf("From-username: $fU\r\n", "Call-ID"); <function moreinfo="none">insert_hf(txt[, hdr])</function> </title> <para> - Inserts 'txt' as header before the first header field or before - first 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before + first header named 'hdr'if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be inserted. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem>

3 years, 8 months

git:5.4:82ff4f40: pv_headers: free hash entry in case of error

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 82ff4f40455a910ef42dd3692af5c1c9dfb8d4c1 URL: https://github.com/kamailio/kamailio/commit/82ff4f40455a910ef42dd3692af5c1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:36+01:00 pv_headers: free hash entry in case of error (cherry picked from commit 46c7a8c0bf2b4d5c00e22a751f95f13263686445) --- Modified: src/modules/pv_headers/pvh_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/82ff4f40455a910ef42dd3692af5c1c… Patch: https://github.com/kamailio/kamailio/commit/82ff4f40455a910ef42dd3692af5c1c… --- diff --git a/src/modules/pv_headers/pvh_hash.c b/src/modules/pv_headers/pvh_hash.c index 89f93f77b8..80297bcaaf 100644 --- a/src/modules/pv_headers/pvh_hash.c +++ b/src/modules/pv_headers/pvh_hash.c @@ -85,6 +85,7 @@ int pvh_str_hash_add_key(struct str_hash_table *ht, str *key) err: pvh_str_free(&e->key); + pkg_free(e); return -1; }

3 years, 8 months

git:5.4:aa0573d2: alias_db: clang format the code

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: aa0573d2afa3c1a0afa76b8fd1e0de952c487a01 URL: https://github.com/kamailio/kamailio/commit/aa0573d2afa3c1a0afa76b8fd1e0de9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:27+01:00 alias_db: clang format the code (cherry picked from commit 3dca5cd2c7f018189b6784a7e87807df1de7589e) --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/aa0573d2afa3c1a0afa76b8fd1e0de9… Patch: https://github.com/kamailio/kamailio/commit/aa0573d2afa3c1a0afa76b8fd1e0de9…

3 years, 8 months

git:5.4:5114cc77: alias_db: removed history from top comments

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 5114cc77cb61744843ed8b535d9804fcdf61e635 URL: https://github.com/kamailio/kamailio/commit/5114cc77cb61744843ed8b535d9804f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:11+01:00 alias_db: removed history from top comments - missing copyright header (cherry picked from commit 7ae0caaffd3d6e523fd32501401213521a1881e5) --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/5114cc77cb61744843ed8b535d9804f… Patch: https://github.com/kamailio/kamailio/commit/5114cc77cb61744843ed8b535d9804f…

3 years, 8 months

git:5.4:83005d4f: alias_db: set ending zero in a single place

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 83005d4fafd5d055e4125a83c24d1c6cd0eed058 URL: https://github.com/kamailio/kamailio/commit/83005d4fafd5d055e4125a83c24d1c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T11:00:01+01:00 alias_db: set ending zero in a single place (cherry picked from commit dc1bb5b1861de279b450ab550888dd748b77463f) --- Modified: src/modules/alias_db/alookup.c --- Diff: https://github.com/kamailio/kamailio/commit/83005d4fafd5d055e4125a83c24d1c6… Patch: https://github.com/kamailio/kamailio/commit/83005d4fafd5d055e4125a83c24d1c6… --- diff --git a/src/modules/alias_db/alookup.c b/src/modules/alias_db/alookup.c index 28dd916999..faa5f6739e 100644 --- a/src/modules/alias_db/alookup.c +++ b/src/modules/alias_db/alookup.c @@ -163,19 +163,18 @@ static int alias_db_query(struct sip_msg* _msg, str table, (char*)RES_ROWS(db_res)[i].values[1].val.str_val.s, RES_ROWS(db_res)[i].values[1].val.str_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.str_val.len; - useruri_buf[user_s.len] = '\0'; break; case DB1_BLOB: strncpy(user_s.s, (char*)RES_ROWS(db_res)[i].values[1].val.blob_val.s, RES_ROWS(db_res)[i].values[1].val.blob_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.blob_val.len; - useruri_buf[user_s.len] = '\0'; break; default: LM_ERR("unknown type of DB user column\n"); goto err_server; } + useruri_buf[user_s.len] = '\0'; user_s.s = useruri_buf; /* set the URI */ LM_DBG("new URI [%d] is [%.*s]\n", i, user_s.len ,user_s.s );

3 years, 8 months

git:5.4:dfa7bf13: rtp_media_server: state transition improvement

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: dfa7bf13fb0e5513cd3b1558765ba32e9300a120 URL: https://github.com/kamailio/kamailio/commit/dfa7bf13fb0e5513cd3b1558765ba32… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:59:47+01:00 rtp_media_server: state transition improvement - fix disconnection while in bridge, to keep thing simple for now the second leg is automaticaly disconnected. (cherry picked from commit e419bad759dc817ba673563ec4e79681f685dc28) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/dfa7bf13fb0e5513cd3b1558765ba32… Patch: https://github.com/kamailio/kamailio/commit/dfa7bf13fb0e5513cd3b1558765ba32…

3 years, 8 months

git:5.4:407586be: rtp_media_server: fix dialog_list_mutex

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 407586bec91fac11311809d2693e521ad82394dc URL: https://github.com/kamailio/kamailio/commit/407586bec91fac11311809d2693e521… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:59:35+01:00 rtp_media_server: fix dialog_list_mutex issue 2522 (cherry picked from commit 750cb7fc131afa254952536bdb200d55e2cc8955) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/407586bec91fac11311809d2693e521… Patch: https://github.com/kamailio/kamailio/commit/407586bec91fac11311809d2693e521…

3 years, 8 months

git:5.4:a5ee9476: rtp_media_server: fix issue 2524

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: a5ee9476c8f403c42a6bc80d2228b49a39a0ca5b URL: https://github.com/kamailio/kamailio/commit/a5ee9476c8f403c42a6bc80d2228b49… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:58:57+01:00 rtp_media_server: fix issue 2524 - fix completion without failure route - rms_bridge automaticaly append missing ';' is not present (cherry picked from commit 2ea4f685ea8b7dbca13b4fd521441088f8318d1f) --- Modified: src/modules/rtp_media_server/docker/rtp_media_server.sh Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a5ee9476c8f403c42a6bc80d2228b49… Patch: https://github.com/kamailio/kamailio/commit/a5ee9476c8f403c42a6bc80d2228b49… --- diff --git a/src/modules/rtp_media_server/docker/rtp_media_server.sh b/src/modules/rtp_media_server/docker/rtp_media_server.sh index 02b842ad25..8f31f20623 100755 --- a/src/modules/rtp_media_server/docker/rtp_media_server.sh +++ b/src/modules/rtp_media_server/docker/rtp_media_server.sh @@ -4,7 +4,7 @@ CONTAINER=rtp_media_server IMAGE=rtp_media_server:latest docker stop ${CONTAINER} docker rm ${CONTAINER} -docker run -d --net=host --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" +docker run -d --net=host --privileged --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" echo "" echo "manual steps required to start Kamailio in the container:" @@ -13,3 +13,8 @@ echo " set the listen IP in /etc/kamailio.cfg" echo " docker exec -it rtp_media_server bash" echo " kamailio -m 64 -D -dd -f /etc/kamailio.cfg" echo "" + +# ulimit -c unlimited +# echo "/tmp/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern +# sysctl -w kernel.core_pattern=core +# apt-get update && apt-get install -i gdb diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 99eca96484..5913921752 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -489,6 +489,8 @@ static void bridge_cb(struct cell *ptrans, int ntype, struct tmcb_params *pcbp) return; } else if(ntype == TMCB_LOCAL_COMPLETED) { LM_NOTICE("COMPLETED [%d]\n", pcbp->code); + if (pcbp->code >= 300) + return; } else if(ntype == TMCB_LOCAL_RESPONSE_IN){ LM_NOTICE("RESPONSE [%d]\n", pcbp->code); if (pcbp->code != 180 && pcbp->code != 183) @@ -892,7 +894,13 @@ static int rms_bridge_f(struct sip_msg *msg, char *_target, char *_route) if(!rms_str_dup(&a->param, &target, 1)) { goto error; } - + if (a->param.s[a->param.len-1] != ';') { + a->param.s = shm_realloc(a->param.s, a->param.len + 2); + a->param.s[a->param.len]=';'; + a->param.len++; + a->param.s[a->param.len]= '\0'; + LM_NOTICE("remote >>> target[%.*s]\n", a->param.len, a->param.s); + } a->route.len = route.len; a->route.s = route.s;

3 years, 8 months

git:5.4:dc2336f5: tmx: Allow $T_branch(flags) in onreply_route

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: dc2336f541eb27d0a034f4c72a26c40270cfea70 URL: https://github.com/kamailio/kamailio/commit/dc2336f541eb27d0a034f4c72a26c40… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T10:57:44+01:00 tmx: Allow $T_branch(flags) in onreply_route (cherry picked from commit d161d4523fc6b0619defe918bc204cc7a9cae073) --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/dc2336f541eb27d0a034f4c72a26c40… Patch: https://github.com/kamailio/kamailio/commit/dc2336f541eb27d0a034f4c72a26c40… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1aa1dc0cff..3e977c9877 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -805,14 +805,24 @@ int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, " in MODE_ONFAILURE\n", branch); return pv_get_null(msg, param, res); } - res->ri = t->uac[branch].branch_flags; - res->flags = PV_VAL_INT; - LM_DBG("branch flags is [%u]\n", res->ri); + break; + case TM_ONREPLY_ROUTE: + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) { + LM_ERR("no reply branch\n"); + return pv_get_null(msg, param, res); + } + branch = tcx->branch_index; break; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return pv_get_null(msg, param, res); } + if(branch<0 || branch>=t->nr_of_outgoings) { + return pv_get_null(msg, param, res); + } + LM_DBG("branch flags is [%u]\n", t->uac[branch].branch_flags); + return pv_get_uintval(msg, param, res, t->uac[branch].branch_flags); break; case 6: /* $T_branch(uri) */ if (get_route_type() != TM_ONREPLY_ROUTE) {

3 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020