January 2021 - sr-dev - kamailio.org

git:5.4:b0a629ef: secsipid: use pkg-config when available
by Victor Seva 07 Jan '21

07 Jan '21

Module: kamailio Branch: 5.4 Commit: b0a629ef9b366f4946dd1e73ce4aed2e028c119b URL: https://github.com/kamailio/kamailio/commit/b0a629ef9b366f4946dd1e73ce4aed2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-07T12:35:20+01:00 secsipid: use pkg-config when available (cherry picked from commit 231a6eceeb67318cf4708a765b47df6c336350da) --- Modified: src/modules/secsipid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b0a629ef9b366f4946dd1e73ce4aed2… Patch: https://github.com/kamailio/kamailio/commit/b0a629ef9b366f4946dd1e73ce4aed2… --- diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile index ec8ad07980..13012cd248 100644 --- a/src/modules/secsipid/Makefile +++ b/src/modules/secsipid/Makefile @@ -7,8 +7,14 @@ include ../../Makefile.defs auto_gen= NAME=secsipid.so -DEFS+= -I. -LIBS+= -L. -lsecsipid +BUILDER = $(shell which pkg-config) +ifeq ($(BUILDER),) + DEFS+= -I. + LIBS = -L. -lsecsipid +else + DEFS+= $(shell pkg-config --cflags secsipid-1) + LIBS = $(shell pkg-config --libs secsipid-1) +endif ifeq ($(OS), darwin) LIBS+= -framework CoreFoundation -framework Security -lpthread

1 0

git:master:231a6ece: secsipid: use pkg-config when available
by Victor Seva 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 231a6eceeb67318cf4708a765b47df6c336350da URL: https://github.com/kamailio/kamailio/commit/231a6eceeb67318cf4708a765b47df6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-07T12:17:23+01:00 secsipid: use pkg-config when available --- Modified: src/modules/secsipid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/231a6eceeb67318cf4708a765b47df6… Patch: https://github.com/kamailio/kamailio/commit/231a6eceeb67318cf4708a765b47df6… --- diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile index 1ac4cdb87c..752c07c855 100644 --- a/src/modules/secsipid/Makefile +++ b/src/modules/secsipid/Makefile @@ -7,8 +7,14 @@ include ../../Makefile.defs auto_gen= NAME=secsipid.so -DEFS+= -I. -LIBS+= -L. -lsecsipid +BUILDER = $(shell which pkg-config) +ifeq ($(BUILDER),) + DEFS+= -I. + LIBS = -L. -lsecsipid +else + DEFS+= $(shell pkg-config --cflags secsipid-1) + LIBS = $(shell pkg-config --libs secsipid-1) +endif ifeq ($(OS), darwin) LIBS+= -framework CoreFoundation -framework Security -lpthread

1 0

git:master:b6042756: pkg/kamailio/deb: add bullseye
by Victor Seva 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: b604275696b03e4a9a5ff5b1c6a7687711d58bb0 URL: https://github.com/kamailio/kamailio/commit/b604275696b03e4a9a5ff5b1c6a7687… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-07T11:37:16+01:00 pkg/kamailio/deb: add bullseye --- Added: pkg/kamailio/deb/bullseye/changelog Added: pkg/kamailio/deb/bullseye/compat Added: pkg/kamailio/deb/bullseye/control Added: pkg/kamailio/deb/bullseye/copyright Added: pkg/kamailio/deb/bullseye/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/bullseye/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio.README.Debian Added: pkg/kamailio/deb/bullseye/kamailio.default Added: pkg/kamailio/deb/bullseye/kamailio.examples Added: pkg/kamailio/deb/bullseye/kamailio.init Added: pkg/kamailio/deb/bullseye/kamailio.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio.postinst Added: pkg/kamailio/deb/bullseye/kamailio.service Added: pkg/kamailio/deb/bullseye/rules Added: pkg/kamailio/deb/bullseye/source.lintian-overrides Added: pkg/kamailio/deb/bullseye/source/format Added: pkg/kamailio/deb/bullseye/watch Added: pkg/kamailio/deb/debian/backports/bullseye --- Diff: https://github.com/kamailio/kamailio/commit/b604275696b03e4a9a5ff5b1c6a7687… Patch: https://github.com/kamailio/kamailio/commit/b604275696b03e4a9a5ff5b1c6a7687…

1 0

[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