sr-dev January 2021

sr-dev@lists.kamailio.org

17 participants
185 discussions

[kamailio/kamailio] topos: update record-route set on re-invite (#2594)
by Balajee SV 07 Jan '21

07 Jan '21

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  topos: update record-route set on re-invite Detailed information mentioned in https://github.com/kamailio/kamailio/issues/2554 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2594 -- Commit Summary -- * topos: update record-route set on re-invite -- File Changes -- M src/modules/topos/doc/topos_admin.xml (20) M src/modules/topos/topos_mod.c (2) M src/modules/topos/tps_msg.c (32) M src/modules/topos/tps_storage.h (4) M src/modules/topos_redis/topos_redis_storage.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2594.patch https://github.com/kamailio/kamailio/pull/2594.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2594

2 4

git:master:5bc9ea49: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 5bc9ea49112207d7ff61687f64653b55444a2ecf URL: https://github.com/kamailio/kamailio/commit/5bc9ea49112207d7ff61687f64653b5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-01-07T10:31:12+01:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/5bc9ea49112207d7ff61687f64653b5… Patch: https://github.com/kamailio/kamailio/commit/5bc9ea49112207d7ff61687f64653b5… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 339ecd4f5d..1dcff2ad07 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -39,6 +39,7 @@ Daniel-Constantin Mierla 3.12. cparam_name (int) 3.13. a_contact_avp (str) 3.14. b_contact_avp (str) + 3.15. rr_update (int) 4. Event Routes @@ -61,8 +62,9 @@ Daniel-Constantin Mierla 1.12. Set cparam_name parameter 1.13. Set a_contact_avp parameter 1.14. Set b_contact_avp parameter - 1.15. Usage of event_route[topos:msg-outgoing] - 1.16. Usage of event_route[topos:msg-sending] + 1.15. Set rr_update parameter + 1.16. Usage of event_route[topos:msg-outgoing] + 1.17. Usage of event_route[topos:msg-sending] Chapter 1. Admin Guide @@ -90,6 +92,7 @@ Chapter 1. Admin Guide 3.12. cparam_name (int) 3.13. a_contact_avp (str) 3.14. b_contact_avp (str) + 3.15. rr_update (int) 4. Event Routes @@ -150,6 +153,7 @@ Chapter 1. Admin Guide 3.12. cparam_name (int) 3.13. a_contact_avp (str) 3.14. b_contact_avp (str) + 3.15. rr_update (int) 3.1. storage (str) @@ -356,6 +360,18 @@ modparam("topos", "a_contact_avp", "$avp(tps-act)") modparam("topos", "b_contact_avp", "$avp(tps-bct)") ... +3.15. rr_update (int) + + If set to 1, topos module will track and update record route changes on + re-invite. + + Default value is 0 (do not update record route changes within dialog). + + Example 1.15. Set rr_update parameter +... +modparam("topos", "rr_update", 1) +... + 4. Event Routes 4.1. event_route[topos:msg-outgoing] @@ -373,7 +389,7 @@ modparam("topos", "b_contact_avp", "$avp(tps-bct)") reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.15. Usage of event_route[topos:msg-outgoing] + Example 1.16. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -392,7 +408,7 @@ event_route[topos:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.16. Usage of event_route[topos:msg-sending] + Example 1.17. Usage of event_route[topos:msg-sending] ... event_route[topos:msg-sending] { if(is_request() and $fU=="alice") {

1 0

git:master:6a837651: topos: db storage of record route based on rr_update param
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 6a837651c6e0fe281ac4a6a62434f82046610b0e URL: https://github.com/kamailio/kamailio/commit/6a837651c6e0fe281ac4a6a62434f82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-07T10:24:13+01:00 topos: db storage of record route based on rr_update param --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/6a837651c6e0fe281ac4a6a62434f82… Patch: https://github.com/kamailio/kamailio/commit/6a837651c6e0fe281ac4a6a62434f82… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b506a94b97..e23352962e 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1492,6 +1492,29 @@ int tps_db_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, nr_ucols++; } } + if(sd->b_tag.len>0 && ((mode & TPS_DBU_BRR) || (mode & TPS_DBU_ARR))) { + if(((md->direction == TPS_DIR_DOWNSTREAM) && (msg->first_line.type==SIP_REPLY)) || + ((md->direction == TPS_DIR_UPSTREAM) && (msg->first_line.type==SIP_REQUEST))) { + if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_BRR)) { + db_ucols[nr_ucols] = &td_col_b_rr; + db_uvals[nr_ucols].type = DB1_STR; + db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->b_rr); + nr_ucols++; + } + } else { + if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_ARR)) { + db_ucols[nr_ucols] = &td_col_a_rr; + db_uvals[nr_ucols].type = DB1_STR; + db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->a_rr); + nr_ucols++; + db_ucols[nr_ucols] = &td_col_s_rr; + db_uvals[nr_ucols].type = DB1_STR; + db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->s_rr); + nr_ucols++; + } + } + } + if(nr_ucols==0) { return 0; }

1 0

git:master:fca3a26d: topos_redis: coherent indentation
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: fca3a26de881c71de080da0fe5eb799a5e14f684 URL: https://github.com/kamailio/kamailio/commit/fca3a26de881c71de080da0fe5eb799… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-07T10:24:13+01:00 topos_redis: coherent indentation --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fca3a26de881c71de080da0fe5eb799… Patch: https://github.com/kamailio/kamailio/commit/fca3a26de881c71de080da0fe5eb799… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 3ed090a26c..47205c8f13 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1283,20 +1283,19 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, } } - if(sd->b_tag.len>0 && ((mode & TPS_DBU_BRR) || (mode & TPS_DBU_ARR))) { - if(((md->direction == TPS_DIR_DOWNSTREAM) && (msg->first_line.type==SIP_REPLY)) || - ((md->direction == TPS_DIR_UPSTREAM) && (msg->first_line.type==SIP_REQUEST))) { - if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_BRR)) { - TPS_REDIS_SET_ARGS(&md->b_rr, argc, &td_key_b_rr, argv, argvlen); - } - } - else { - if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_ARR)) { - TPS_REDIS_SET_ARGS(&md->a_rr, argc, &td_key_a_rr, argv, argvlen); - TPS_REDIS_SET_ARGS(&md->s_rr, argc, &td_key_s_rr, argv, argvlen); - } - } - } + if(sd->b_tag.len>0 && ((mode & TPS_DBU_BRR) || (mode & TPS_DBU_ARR))) { + if(((md->direction == TPS_DIR_DOWNSTREAM) && (msg->first_line.type==SIP_REPLY)) || + ((md->direction == TPS_DIR_UPSTREAM) && (msg->first_line.type==SIP_REQUEST))) { + if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_BRR)) { + TPS_REDIS_SET_ARGS(&md->b_rr, argc, &td_key_b_rr, argv, argvlen); + } + } else { + if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_ARR)) { + TPS_REDIS_SET_ARGS(&md->a_rr, argc, &td_key_a_rr, argv, argvlen); + TPS_REDIS_SET_ARGS(&md->s_rr, argc, &td_key_s_rr, argv, argvlen); + } + } + } if(argc<=2) { return 0;

1 0

git:master:d859f8bf: topos_redis: do rr update for requests within dialog based of flags
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: d859f8bfdd9adc89c29095c4e5de9d29c4333de0 URL: https://github.com/kamailio/kamailio/commit/d859f8bfdd9adc89c29095c4e5de9d2… Author: balajee <balajee.sv(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-07T10:24:13+01:00 topos_redis: do rr update for requests within dialog based of flags --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/d859f8bfdd9adc89c29095c4e5de9d2… Patch: https://github.com/kamailio/kamailio/commit/d859f8bfdd9adc89c29095c4e5de9d2… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index fe366403c8..3ed090a26c 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1283,6 +1283,21 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, } } + if(sd->b_tag.len>0 && ((mode & TPS_DBU_BRR) || (mode & TPS_DBU_ARR))) { + if(((md->direction == TPS_DIR_DOWNSTREAM) && (msg->first_line.type==SIP_REPLY)) || + ((md->direction == TPS_DIR_UPSTREAM) && (msg->first_line.type==SIP_REQUEST))) { + if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_BRR)) { + TPS_REDIS_SET_ARGS(&md->b_rr, argc, &td_key_b_rr, argv, argvlen); + } + } + else { + if(((sd->iflags&TPS_IFLAG_DLGON) == 0) && (mode & TPS_DBU_ARR)) { + TPS_REDIS_SET_ARGS(&md->a_rr, argc, &td_key_a_rr, argv, argvlen); + TPS_REDIS_SET_ARGS(&md->s_rr, argc, &td_key_s_rr, argv, argvlen); + } + } + } + if(argc<=2) { return 0; }

1 0

git:master:cef21707: topos: docs for rr_update parameter
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: cef21707658c746746bab32def68723c22987a1c URL: https://github.com/kamailio/kamailio/commit/cef21707658c746746bab32def68723… Author: balajee <balajee.sv(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-07T10:24:13+01:00 topos: docs for rr_update parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cef21707658c746746bab32def68723… Patch: https://github.com/kamailio/kamailio/commit/cef21707658c746746bab32def68723… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index f5d438ec1c..959e7e0f3e 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -410,6 +410,26 @@ modparam("topos", "a_contact_avp", "$avp(tps-act)") ... modparam("topos", "b_contact_avp", "$avp(tps-bct)") ... +</programlisting> + </example> + </section> + <section id="topos.p.rr_update"> + <title><varname>rr_update</varname> (int)</title> + <para> + If set to 1, topos module will track and update record + route changes on re-invite. + </para> + <para> + <emphasis> + Default value is 0 (do not update record route changes within dialog). + </emphasis> + </para> + <example> + <title>Set <varname>rr_update</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "rr_update", 1) +... </programlisting> </example> </section>

1 0

git:master:4f2a6628: topos: added rr_update modparam
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 4f2a66282c4cd361984f50dd148859fe595ba745 URL: https://github.com/kamailio/kamailio/commit/4f2a66282c4cd361984f50dd148859f… Author: balajee <balajee.sv(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-07T10:24:13+01:00 topos: added rr_update modparam - control if record-route should be updated for requests within dialog --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/4f2a66282c4cd361984f50dd148859f… Patch: https://github.com/kamailio/kamailio/commit/4f2a66282c4cd361984f50dd148859f…

1 0

git:master:90fe4d79: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 90fe4d793d6bbf58760b0279149d210755d28e01 URL: https://github.com/kamailio/kamailio/commit/90fe4d793d6bbf58760b0279149d210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-01-07T09:16:24+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/90fe4d793d6bbf58760b0279149d210… Patch: https://github.com/kamailio/kamailio/commit/90fe4d793d6bbf58760b0279149d210…

1 0

git:master:9629dbce: textops: docs for ends_with() function
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 9629dbce67bc3f1528a055eaa4ed221bc4d00060 URL: https://github.com/kamailio/kamailio/commit/9629dbce67bc3f1528a055eaa4ed221… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-06T15:34:02+01:00 textops: docs for ends_with() function --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9629dbce67bc3f1528a055eaa4ed221… Patch: https://github.com/kamailio/kamailio/commit/9629dbce67bc3f1528a055eaa4ed221… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 44540841d4..e9acba3869 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1695,6 +1695,31 @@ if (starts_with("$rU", "+358")) </example> </section> + <section id="textops.f.ends_with"> + <title> + <function moreinfo="none">ends_with(str1, str2)</function> + </title> + <para> + The function returns <emphasis>true</emphasis> if the first string ends + with the second string. The parameters can contain variables. + </para> + <para> + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, + FAILURE_ROUTE and BRANCH_ROUTE. + </para> + <example> + <title><function>ends_with</function> usage</title> + <programlisting format="linespecific"> +... +if (ends_with("$rU", "8800")) +{ + # do interesting stuff here +} +... +</programlisting> + </example> + </section> + <section id="textops.f.set_body_multipart"> <title> <function moreinfo="none">set_body_multipart([txt,content_type][,boundary])</function>

1 0

git:master:88c25b39: textops: added ends_with(str, suffix) function
by Daniel-Constantin Mierla 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 88c25b39c5bc1c7390a29176f76b8ede5b27802d URL: https://github.com/kamailio/kamailio/commit/88c25b39c5bc1c7390a29176f76b8ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-06T15:29:45+01:00 textops: added ends_with(str, suffix) function - exported to kemi --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/88c25b39c5bc1c7390a29176f76b8ed… Patch: https://github.com/kamailio/kamailio/commit/88c25b39c5bc1c7390a29176f76b8ed… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 5f9361f5b2..6f3c6f9b5e 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -136,6 +136,7 @@ static int in_list_prefix_f(struct sip_msg* _msg, char* _subject, char* _list, static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); +static int ends_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); @@ -316,6 +317,9 @@ static cmd_export_t cmds[]={ {"starts_with", (cmd_function)starts_with_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"ends_with", (cmd_function)ends_with_f, 2, + fixup_spve_spve, 0, + ANY_ROUTE}, {"is_audio_on_hold", (cmd_function)is_audio_on_hold_f, 0, 0, 0, ANY_ROUTE}, @@ -4220,6 +4224,49 @@ static int ki_starts_with(sip_msg_t *msg, str *s1, str *s2 ) return -2; } +static int ends_with_f(struct sip_msg *msg, char *str1, char *str2 ) +{ + str s1; + str s2; + int ret; + + if(fixup_get_svalue(msg, (gparam_p)str1, &s1)!=0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)str2, &s2)!=0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + if(s2.len > s1.len) { + return -1; + } + ret = strncmp(s1.s + s1.len - s2.len, s2.s, s2.len); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + +static int ki_ends_with(sip_msg_t *msg, str *vstr, str *vsuffix ) +{ + int ret; + + if(vstr==NULL || vsuffix==NULL) { + return -1; + } + if(vsuffix->len > vstr->len) { + return -1; + } + ret = strncmp(vstr->s + vstr->len - vsuffix->len, vsuffix->s, vsuffix->len); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + static int ki_is_audio_on_hold(sip_msg_t *msg) { int sdp_session_num = 0, sdp_stream_num; @@ -4903,6 +4950,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("ends_with"), + SR_KEMIP_INT, ki_ends_with, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("is_audio_on_hold"), SR_KEMIP_INT, ki_is_audio_on_hold, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2021