- sr-dev - kamailio.org

git:5.4:cab4d20a: pkg: version set to 5.4.8 for rpms and apline
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: cab4d20aad64eae480ddc7cc84f6e50e6c14db15 URL: https://github.com/kamailio/kamailio/commit/cab4d20aad64eae480ddc7cc84f6e50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:31:45+01:00 pkg: version set to 5.4.8 for rpms and apline --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cab4d20aad64eae480ddc7cc84f6e50… Patch: https://github.com/kamailio/kamailio/commit/cab4d20aad64eae480ddc7cc84f6e50… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index b9d6a15066..a85e00af85 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.7 +pkgver=5.4.8 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f99f13696d..ee9c08e0b8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.7 +%define ver 5.4.8 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v.5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Hello, I am planning to release a new version from branch 5.4, respectively 5.4.8, sometime next week, likely on Wednesday or Thursday (Mar 9/10, 2022). If anyone is aware of issues not yet reported to bug tracker or missing backports, report them in order to try to get the fixes in this release. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online March 28-31, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 3

git:5.4:0e545fa3: cplc: manage case where TZ environment variable is not set.
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: 0e545fa3dd8221c76a6abe11b7a90a752be30e6c URL: https://github.com/kamailio/kamailio/commit/0e545fa3dd8221c76a6abe11b7a90a7… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:12:51+01:00 cplc: manage case where TZ environment variable is not set. (cherry picked from commit 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866) (cherry picked from commit 67d888c80f5c9e96da72a1dab234f2a70782f635) --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/0e545fa3dd8221c76a6abe11b7a90a7… Patch: https://github.com/kamailio/kamailio/commit/0e545fa3dd8221c76a6abe11b7a90a7… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index 9bb90dc5db..035d8d06e4 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* free structs that I don't need any more */ cpl_ac_tm_free( &att ); @@ -848,7 +848,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -857,7 +857,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

1 0

git:5.5:67d888c8: cplc: manage case where TZ environment variable is not set.
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.5 Commit: 67d888c80f5c9e96da72a1dab234f2a70782f635 URL: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:09:38+01:00 cplc: manage case where TZ environment variable is not set. (cherry picked from commit 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866) --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… Patch: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index c3c8572f4c..e2d15bfbb3 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* reset flags */ flags &= (1<<7); @@ -850,7 +850,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -859,7 +859,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

1 0

git:master:3719888c: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 07 Mar '22

07 Mar '22

Module: kamailio Branch: master Commit: 3719888c2d6df492e48a07e04682930abba07e71 URL: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-07T14:16:19+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… Patch: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 84a7c37eba..e9039e5341 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -53,6 +53,7 @@ Patric Marschall 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 4. Changes from usrloc module @@ -124,8 +125,9 @@ Patric Marschall 1.26. Set db_update_as_insert parameter 1.27. Set default_db_type parameter 1.28. Set matching_mode parameter - 1.29. Set db_mode parameter - 1.30. Example database content - reg_table (locdb) table + 1.29. Set UTC_timestamps parameter + 1.30. Set db_mode parameter + 1.31. Example database content - reg_table (locdb) table Chapter 1. User's Guide @@ -167,6 +169,7 @@ Chapter 1. User's Guide 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 4. Changes from usrloc module @@ -285,6 +288,7 @@ Warning 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 3.1. write_db_url (string) @@ -680,6 +684,17 @@ modparam("p_usrloc", "matching_mode", 2) kamcmd cfg.set_now_int p_usrloc matching_mode 2 kamcmd cfg.get p_usrloc matching_mode +3.29. UTC_timestamps(int) + + Enables UTC timestamps for expires and last_modified columns. + + Default value is 0 (disabled). + + Example 1.29. Set UTC_timestamps parameter +... +modparam("p_usrloc", "UTC_timestamps", 1) +... + 4. Changes from usrloc module 4.1. db_mode (integer) @@ -702,7 +717,7 @@ kamcmd cfg.get p_usrloc matching_mode Default value is 3. - Example 1.29. Set db_mode parameter + Example 1.30. Set db_mode parameter ... modparam("p_usrloc", "db_mode", 2) ... @@ -736,7 +751,7 @@ modparam("p_usrloc", "db_mode", 2) complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. - Example 1.30. Example database content - reg_table (locdb) table + Example 1.31. Example database content - reg_table (locdb) table ... +----+----+------+--------+--------+---------------------+-------+----+ | id | no | url | status | errors | failover | spare | rg |

1 0

[kamailio/kamailio] p_usrloc: add UTC_timestamps parameter (PR #3036)
by Stefan Mititelu 07 Mar '22

07 Mar '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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) - [X] 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Enable UTC time format for expires and last_modified columns. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3036 -- Commit Summary -- * p_usrloc: add UTC_timestamps parameter -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (22) M src/modules/p_usrloc/p_usrloc_mod.c (18) M src/modules/p_usrloc/p_usrloc_mod.h (4) M src/modules/p_usrloc/ucontact.c (12) M src/modules/p_usrloc/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3036.patch https://github.com/kamailio/kamailio/pull/3036.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3036 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3036(a)github.com>

3 4

git:master:4e26551f: p_usrloc: add UTC_timestamps parameter
by Stefan Mititelu 07 Mar '22

07 Mar '22

Module: kamailio Branch: master Commit: 4e26551f3529876beafd318f30ffc5f0cf92cda1 URL: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2022-03-07T15:11:15+02:00 p_usrloc: add UTC_timestamps parameter --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ucontact.c Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f… Patch: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f…

1 0

git:master:96efbdad: snmpstats: fix build, update memory field
by Victor Seva 07 Mar '22

07 Mar '22

Module: kamailio Branch: master Commit: 96efbdad0e9ed320657f56c3a0b4a5e54b1cdd5c URL: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-07T09:20:39+01:00 snmpstats: fix build, update memory field > CC (gcc) [M snmpstats.so] kamailioServer.o > kamailioServer.c: In function 'handle_kamailioSrvFreeMemory': > kamailioServer.c:193:37: error: 'struct mem_info' has no member named 'free' > 193 | int freememory = (int)_stats_shm_mi.free; > | ^ > make[2]: *** [../../Makefile.rules:100: kamailioServer.o] Error 1 > make[1]: *** [Makefile:511: modules] Error 1 changes introduced at fb8727b3e1b9fc4f4278809ef9cdea93e96ae77a --- Modified: src/modules/snmpstats/kamailioServer.c --- Diff: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… Patch: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… --- diff --git a/src/modules/snmpstats/kamailioServer.c b/src/modules/snmpstats/kamailioServer.c index 1bd7e70854..163c73f8b0 100644 --- a/src/modules/snmpstats/kamailioServer.c +++ b/src/modules/snmpstats/kamailioServer.c @@ -190,7 +190,7 @@ int handle_kamailioSrvFreeMemory(netsnmp_mib_handler *handler, netsnmp_agent_request_info *reqinfo, netsnmp_request_info *requests) { stats_shm_update(); - int freememory = (int)_stats_shm_mi.free; + int freememory = (int)_stats_shm_mi.free_size; switch(reqinfo->mode) {

1 0

git:master:fffcfdf8: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: fffcfdf86aa8bd6ea417b593f9a5af2892cd6d1a URL: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-04T13:31:34+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… Patch: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index dc28b471ec..b3bc69a9fd 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -72,7 +72,8 @@ Muhammad Shahzad Shafi 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 6. Event Routes @@ -171,7 +172,8 @@ Chapter 1. Admin Guide 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 6. Event Routes @@ -751,7 +753,8 @@ event_route[dispatcher:dst-down] { 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 5.1. corex.debug @@ -811,7 +814,14 @@ event_route[dispatcher:dst-down] { Example: kamcli rpc shm.info -5.8. corex.shm.stats +5.8. corex.shm.report + + Return shared memory manager usage report. + + Example: + kamcli rpc shm.report + +5.9. corex.shm.stats Return shared memory statistics (values are in bytes).

1 0

git:master:2d9de91d: corex: add shm.report rpc command
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 2d9de91df94ca686968a307d18902f51d59a9c18 URL: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:20:46+01:00 corex: add shm.report rpc command --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… Patch: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 4c1d3c820c..490aaadc83 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -79,9 +79,45 @@ static void corex_rpc_shm_stats(rpc_t* rpc, void* c) ); } +static const char* corex_rpc_shm_report_doc[2] = { + "Return shared memory report", + 0 +}; + +/* + * RPC command to return shm report + */ +static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) +{ + mem_report_t mrep; + void *th; + + if(_shm_root.xreport==NULL) { + rpc->fault(ctx, 500, "No report callback function"); + return; + } + shm_report(&mrep); + rpc->add(ctx, "{", &th); + rpc->struct_add(th, "jjjjjjjjjjjj", + "total_size", mrep.total_size, + "free_size_s", mrep.free_size_s, + "used_size_s", mrep.used_size_s, + "real_used_s", mrep.real_used_s, + "max_used_s", mrep.max_used_s, + "free_frags", mrep.free_frags, + "used_frags", mrep.used_frags, + "total_frags", mrep.total_frags, + "max_free_frag_size", mrep.max_free_frag_size, + "max_used_frag_size", mrep.max_used_frag_size, + "min_free_frag_size", mrep.min_free_frag_size, + "min_used_frag_size", mrep.min_used_frag_size + ); +} + rpc_export_t corex_rpc_shm_cmds[] = { - {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, - {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0}, + {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:8a58717c: corex: docs for shm.report rpc command
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 8a58717c5d81989e835a7c30bd6a1e5954c59a0b URL: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:27:57+01:00 corex: docs for shm.report rpc command --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… Patch: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 6a1b94e021..da9d8ea101 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -1020,6 +1020,20 @@ event_route[dispatcher:dst-down] { <programlisting format="linespecific"> &kamcli; rpc shm.info </programlisting> + </section> + <section id="corex.rpc.shm.report"> + <title> + <function moreinfo="none">corex.shm.report</function> + </title> + <para> + Return shared memory manager usage report. + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.report + </programlisting> </section> <section id="corex.rpc.shm.stats"> <title>

1 0

git:master:72a4e0e9: core: mem - added api function for getting usage report for qm manager
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 72a4e0e90e95e2088b995bbe49bad5324edd9b09 URL: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:18:58+01:00 core: mem - added api function for getting usage report for qm manager - combine internal memory manager stats with metrics computed on the fly by walking all memory fragments --- Modified: src/core/mem/memapi.h Modified: src/core/mem/meminfo.h Modified: src/core/mem/pkg.c Modified: src/core/mem/pkg.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53… Patch: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53…

1 0

git:master:fb8727b3: kex: updated memory info fields
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: fb8727b3e1b9fc4f4278809ef9cdea93e96ae77a URL: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:44:21+01:00 kex: updated memory info fields --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… Patch: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ec543d1b60..565ce4e77d 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -869,7 +869,7 @@ unsigned long shm_stats_get_size(void) unsigned long shm_stats_get_used(void) { stats_shm_update(); - return _stats_shm_rpc.used; + return _stats_shm_rpc.used_size; } unsigned long shm_stats_get_rused(void) @@ -887,7 +887,7 @@ unsigned long shm_stats_get_mused(void) unsigned long shm_stats_get_free(void) { stats_shm_update(); - return _stats_shm_rpc.free; + return _stats_shm_rpc.free_size; } unsigned long shm_stats_get_frags(void) diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 102442f1e9..15ce1dcf2c 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -99,8 +99,8 @@ int pkg_proc_stats_myinit(int rank) /* init pkg usage values */ pkg_info(&info); - _pkg_proc_stats_list[process_no].available = info.free; - _pkg_proc_stats_list[process_no].used = info.used; + _pkg_proc_stats_list[process_no].available = info.free_size; + _pkg_proc_stats_list[process_no].used = info.used_size; _pkg_proc_stats_list[process_no].real_used = info.real_used; _pkg_proc_stats_list[process_no].total_size = info.total_size; _pkg_proc_stats_list[process_no].total_frags = info.total_frags; @@ -132,8 +132,8 @@ static int pkg_proc_update_stats(sr_event_param_t *evp) if(unlikely(process_no>=_pkg_proc_stats_no)) return -1; pkg_info(&info); - _pkg_proc_stats_list[process_no].available = info.free; - _pkg_proc_stats_list[process_no].used = info.used; + _pkg_proc_stats_list[process_no].available = info.free_size; + _pkg_proc_stats_list[process_no].used = info.used_size; _pkg_proc_stats_list[process_no].real_used = info.real_used; _pkg_proc_stats_list[process_no].total_frags = info.total_frags; return 0;

1 0

git:master:f65c98cf: core: parser - check value of pointer with white space code
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: f65c98cf74e4495a6e892a701980c4b691a3390b URL: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:43:13+01:00 core: parser - check value of pointer with white space code --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… Patch: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 9fae1f7448..c2b817f3e4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -376,7 +376,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream) return -1; ptr_src = body->s + 14; - if (ptr_src == 32) ptr_src++; /* if starts with a space, skip it */ + if (*ptr_src == 32) ptr_src++; /* if starts with a space, skip it */ /* identify all existing ICE options, if they are listed in one row */ while (*ptr_src && *ptr_src != '\r' && *ptr_src != '\n' && max_options-->0)

1 0

git:master:6695b6fc: corex: updated memory info fields
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 6695b6fcb830b379e3d2aea4d7d35daba8e30317 URL: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:43:59+01:00 corex: updated memory info fields --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… Patch: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 615fb892bc..4c1d3c820c 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -71,8 +71,8 @@ static void corex_rpc_shm_stats(rpc_t* rpc, void* c) rpc->add(c, "{", &th); rpc->struct_add(th, "jjjjjj", "total", mi.total_size, - "free", mi.free, - "used", mi.used, + "free", mi.free_size, + "used", mi.used_size, "real_used", mi.real_used, "max_used", mi.max_used, "fragments", mi.total_frags

1 0

git:master:27d71da5: core: mem - renamed memory info fields
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 27d71da5da8a2f33a74e35765ba00ef83a20186f URL: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:26:07+01:00 core: mem - renamed memory info fields - avoid conflict with keywords like free --- Modified: src/core/core_cmd.c Modified: src/core/mem/f_malloc.c Modified: src/core/mem/meminfo.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… Patch: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index d045a144cb..c464d3686e 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -598,8 +598,8 @@ static void core_shmmem(rpc_t* rpc, void* c) rpc->add(c, "{", &handle); rpc->struct_add(handle, "dddddd", "total", (unsigned int)(mi.total_size>>rs), - "free", (unsigned int)(mi.free>>rs), - "used", (unsigned int)(mi.used>>rs), + "free", (unsigned int)(mi.free_size>>rs), + "used", (unsigned int)(mi.used_size>>rs), "real_used",(unsigned int)(mi.real_used>>rs), "max_used", (unsigned int)(mi.max_used>>rs), "fragments", (unsigned int)mi.total_frags diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 38f686ff2c..6cb98addc1 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -951,8 +951,8 @@ void fm_info(void* qmp, struct mem_info* info) memset(info,0, sizeof(*info)); info->total_size=qm->size; info->min_frag=MIN_FRAG_SIZE; - info->free=qm->size-qm->real_used; - info->used=qm->used; + info->free_size=qm->size-qm->real_used; + info->used_size=qm->used; info->real_used=qm->real_used; info->max_used=qm->max_real_used; info->total_frags=qm->ffrags; diff --git a/src/core/mem/meminfo.h b/src/core/mem/meminfo.h index 8b69daa705..9a823c49fe 100644 --- a/src/core/mem/meminfo.h +++ b/src/core/mem/meminfo.h @@ -19,7 +19,7 @@ /** * \file * \brief Memory manager (malloc) informations and statistics - * + * * Memory manager (malloc) informations and statistics, like the used memory, * fragmentations etc.. * \ingroup mem @@ -34,8 +34,8 @@ /** Memory information structure */ struct mem_info{ unsigned long total_size; /** total size of memory pool */ - unsigned long free; /** free memory */ - unsigned long used; /** allocated size */ + unsigned long free_size; /** free memory */ + unsigned long used_size; /** allocated size */ unsigned long real_used; /** used size plus overhead from malloc */ unsigned long max_used; /** maximum used size since server start? */ unsigned long min_frag; /** minimum number of fragmentations? */ diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index fb786ba635..403ee34da8 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -942,8 +942,8 @@ void qm_info(void* qmp, struct mem_info* info) memset(info,0, sizeof(*info)); info->total_size=qm->size; info->min_frag=MIN_FRAG_SIZE; - info->free=qm->size-qm->real_used; - info->used=qm->used; + info->free_size=qm->size-qm->real_used; + info->used_size=qm->used; info->real_used=qm->real_used; info->max_used=qm->max_real_used; info->total_frags=qm->ffrags; diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 10db30264b..19b71a8be3 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1178,11 +1178,11 @@ void tlsf_meminfo(tlsf_t pool, struct mem_info *info) { control_t* control = tlsf_cast(control_t*, pool); memset(info, 0, sizeof(*info)); - info->free = control->total_size - control->real_used; + info->free_size = control->total_size - control->real_used; info->max_used = control->max_used; info->real_used = control->real_used; info->total_frags = control->fragments; - info->used = control->allocated; + info->used_size = control->allocated; info->total_size = control->total_size; }

1 0

[kamailio/kamailio] cdp: increase the amount of avps allocated when reading AVP_Vendor_Sp… (PR #3031)
by kristiyan-peychev-flolive 03 Mar '22

03 Mar '22

…ecific_Application_Id   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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 - [X] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I've ran into issues when working with certain HSS's that sent more AVP's than were allocated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3031 -- Commit Summary -- * cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id -- File Changes -- M src/modules/cdp/peerstatemachine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3031.patch https://github.com/kamailio/kamailio/pull/3031.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3031 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3031(a)github.com>

2 1

git:master:62f7be22: cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 62f7be2281f5dd91a5668c4b84e52a7d7169e21f URL: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T21:50:35+01:00 cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… Patch: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index b83654bf1d..a4520d797d 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -732,7 +732,7 @@ void save_peer_applications(peer *p,AAAMessage *msg) total_cnt += supported_vendor_id_avp_cnt; break; case AVP_Vendor_Specific_Application_Id: - total_cnt+=2;/* wasteful, but let's skip decoding */ + total_cnt+=6;/* wasteful, but let's skip decoding */ break; } LM_DBG("Total count of applications is %d\n", total_cnt);

1 0

[kamailio/kamailio] Infinite loop in siptrace with core callback in traffic mirror mode. (Issue #3042)
by Dennis 03 Mar '22

03 Mar '22

### Description Infiinite loop in siptrace module when configured to pure mirroring (no HEP) with core events. #### Reproduction Simple config: listen=udp:XXX.XXX.XXX.XXX:5060 listen=udp:127.0.0.1:5080 debug=2 log_facility=LOG_LOCAL0 log_prefix="{$timef(%F %T) $mt $hdr(CSeq) $ci}" children=4 loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "siptrace.so" modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 4) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "xheaders_write", 1) modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:5888") modparam("siptrace", "send_sock_addr", "sip:127.0.0.1:5080") request_route { xinfo('>>>>> Request $rm from $si'); } event_route[siptrace:msg] { xinfo(">>>>> Siptrace event method $rm"); } #### Log Messages With received OPTIONS request: ``` Feb 28 13:54:52 kamailio systemd[1]: Starting Kamailio - the Open Source SIP Server... Feb 28 13:54:52 kamailio kamailio: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Feb 28 13:54:52 kamailio kamailio: INFO: <core> [core/tcp_main.c:4997]: init_tcp(): using epoll_lt as the io watch method (auto detected) Feb 28 13:54:52 kamailio kamailio[12246]: Listening on Feb 28 13:54:52 kamailio kamailio[12246]: udp: 2607:beef:be:beef:5054:ff:fe4b:dd25:5060 Feb 28 13:54:52 kamailio kamailio[12246]: udp: 127.0.0.1:5080 Feb 28 13:54:52 kamailio kamailio[12246]: Aliases: Feb 28 13:54:52 kamailio kamailio[12246]: udp: localhost:5080 Feb 28 13:54:52 kamailio kamailio[12246]: udp: kamailio:5060 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: siptrace [siptrace.c:410]: mod_init(): can't load dlg api. Will not install dialog callbacks. Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [main.c:3030]: main(): processes (at least): 14 - shm size: 67108864 - pkg size: 8388608 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12273]: INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) Feb 28 13:54:52 kamailio systemd[1]: Started Kamailio - the Open Source SIP Server. Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS ... Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio kernel: [271505.656348] kamailio[12262]: segfault at 7ffdf9d8fff8 ip 00007f3bfeb6f256 sp 00007ffdf9d90000 error 6 in pv.so[7f3bfeaf3000+e0000] Feb 28 13:54:54 kamailio kernel: [271505.715015] kamailio[12263]: segfault at 7ffdf9d8fff8 ip 00007f3bfeb6f256 sp 00007ffdf9d90000 error 6 in pv.so[7f3bfeaf3000+e0000] Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: message repeated 872 times: [ INFO: <script>: >>>>> Siptrace event method OPTIONS] Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12274]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 9 Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: ALERT: <core> [main.c:788]: handle_sigs(): child process 12262 exited by a signal 11 Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: ALERT: <core> [main.c:791]: handle_sigs(): core was generated Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [main.c:813]: handle_sigs(): terminating due to SIGCHLD Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12274]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12273]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12268]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12272]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12265]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12264]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12270]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12267]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12269]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12271]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12266]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 7.5.0 ``` * **Operating System**: ``` Ubuntu 18.04.6 LTS Linux 4.15.0-169-generic #177-Ubuntu SMP Thu Feb 3 10:50:38 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3042 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3042(a)github.com>

3 6

[kamailio/kamailio] cplc: manage case where TZ environment variable is not set. (PR #3045)
by Frédéric Gaisnon 03 Mar '22

03 Mar '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  cplc: manage case where TZ environment variable is not set. When TZ environment variable was not set, only the first time based CPL worked correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3045 -- Commit Summary -- * cplc: manage case where TZ environment variable is not set. -- File Changes -- M src/modules/cplc/cpl_switches.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3045.patch https://github.com/kamailio/kamailio/pull/3045.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3045 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3045(a)github.com>

2 4

git:master:2ea56a4c: cplc: manage case where TZ environment variable is not set.
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866 URL: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T16:10:17+01:00 cplc: manage case where TZ environment variable is not set. --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… Patch: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index c3c8572f4c..e2d15bfbb3 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* reset flags */ flags &= (1<<7); @@ -850,7 +850,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -859,7 +859,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

1 0

git:5.4:e2614c01: topos_redis: contact on A side is never updated on dialog update
by Victor Seva 03 Mar '22

03 Mar '22

Module: kamailio Branch: 5.4 Commit: e2614c014faf61fd1c6f1dccf0264589bf44698f URL: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:15:31+01:00 topos_redis: contact on A side is never updated on dialog update (cherry picked from commit 86d233d34b06016fc3436ca4574155959d24bb16) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… Patch: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index fe366403c8..6dd77b0d4a 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1260,7 +1260,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

1 0

git:5.5:5c0ac5a8: topos_redis: contact on A side is never updated on dialog update
by Victor Seva 03 Mar '22

03 Mar '22

Module: kamailio Branch: 5.5 Commit: 5c0ac5a847022ca43ed2b3607c5be183132b679c URL: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:14:59+01:00 topos_redis: contact on A side is never updated on dialog update (cherry picked from commit 86d233d34b06016fc3436ca4574155959d24bb16) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… Patch: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 0d21cbc2d1..456d54ebee 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1321,7 +1321,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

1 0

[kamailio/kamailio] topos_redis: contact on A side is never updated on dialog update (PR #3044)
by Frédéric Gaisnon 03 Mar '22

03 Mar '22

#### Pre-Submission Checklist    - [x ] Commit message has the format required by CONTRIBUTING guide - [x ] Commits are split per component (core, individual modules, libs, utils, ...) - [x ] Each component has a single commit (if not, squash them into one commit) - [x ] 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 - [ x] 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:  - [x ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  topos_redis: contact on A side is never updated on dialog update You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3044 -- Commit Summary -- * topos_redis: contact on A side is never updated on dialog update -- File Changes -- M src/modules/topos_redis/topos_redis_storage.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3044.patch https://github.com/kamailio/kamailio/pull/3044.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3044 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3044(a)github.com>

2 2

git:master:86d233d3: topos_redis: contact on A side is never updated on dialog update
by Victor Seva 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 86d233d34b06016fc3436ca4574155959d24bb16 URL: https://github.com/kamailio/kamailio/commit/86d233d34b06016fc3436ca45741559… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:13:02+01:00 topos_redis: contact on A side is never updated on dialog update --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/86d233d34b06016fc3436ca45741559… Patch: https://github.com/kamailio/kamailio/commit/86d233d34b06016fc3436ca45741559… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 0d21cbc2d1..456d54ebee 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1321,7 +1321,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

1 0

git:master:bf73dcec: blst: remove log level and function name from debug message
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: bf73dcec994887b473ee2b76f6f21b9c845f62f5 URL: https://github.com/kamailio/kamailio/commit/bf73dcec994887b473ee2b76f6f21b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T09:14:09+01:00 blst: remove log level and function name from debug message --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/bf73dcec994887b473ee2b76f6f21b9… Patch: https://github.com/kamailio/kamailio/commit/bf73dcec994887b473ee2b76f6f21b9… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 1c2773c53c..79cf47548a 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -273,8 +273,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) if (dst_is_blocklisted(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ LM_WARN("blocklist support not compiled-in - no effect -\n");

1 0

git:master:415f2080: blst: docs - small formatting updates
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 415f20804e423b503d5e0d1743e28c9f509f9c21 URL: https://github.com/kamailio/kamailio/commit/415f20804e423b503d5e0d1743e28c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T09:03:12+01:00 blst: docs - small formatting updates --- Modified: src/modules/blst/doc/blst_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/415f20804e423b503d5e0d1743e28c9… Patch: https://github.com/kamailio/kamailio/commit/415f20804e423b503d5e0d1743e28c9… --- diff --git a/src/modules/blst/doc/blst_functions.xml b/src/modules/blst/doc/blst_functions.xml index 96b4b6c389..48e7d59b6e 100644 --- a/src/modules/blst/doc/blst_functions.xml +++ b/src/modules/blst/doc/blst_functions.xml @@ -38,15 +38,15 @@ else </title> <para> Adds the source of the current message to the blocklist for - the time interval specified in the <emphasis>Retry-After</emphasis> + the time interval specified in the <emphasis>Retry-After</emphasis> header. - If the <emphasis>Retry-After</emphasis> header is missing, it will + If the <emphasis>Retry-After</emphasis> header is missing, it will fail (returns false). - If the <emphasis>Retry-After</emphasis> value is less than - <varname>min</varname>, then <varname>min</varname> seconds will be + If the <emphasis>Retry-After</emphasis> value is less than + <varname>min</varname>, then <varname>min</varname> seconds will be used instead. If the <emphasis>Retry-After</emphasis> value is greater than - <varname>max</varname>, then <varname>max</varname> seconds will be + <varname>max</varname>, then <varname>max</varname> seconds will be used instead. </para> <example> @@ -117,7 +117,7 @@ if (msg_status==503){ # blocklist 503 source for Retry-After seconds works for local replies to the current message. </para> <para> - The variants of these functions with no parameters will ignore + The variants of these functions with no parameters will ignore everything (equivalent to passing 0xff). </para> <para>

1 0

[kamailio/kamailio] There is no jwt.so (#2883)
by hance2010 02 Mar '22

02 Mar '22

### Description ``` apt install kamailio kamailio-* find /usr/lib/x86_64-linux-gnu/kamailio/modules -name jwt.so and nothing. ```  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio5.5.2 ``` * **Operating System**:  ``` debian10 ``` -- 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/issues/2883

5 7

git:5.4:b927b944: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.4 Commit: b927b9447a69e7ded4ba279e1384115bb760e5d5 URL: https://github.com/kamailio/kamailio/commit/b927b9447a69e7ded4ba279e1384115… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-02T13:31:49+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README Modified: src/modules/statsc/README Modified: src/modules/tm/README Modified: src/modules/xmlops/README --- Diff: https://github.com/kamailio/kamailio/commit/b927b9447a69e7ded4ba279e1384115… Patch: https://github.com/kamailio/kamailio/commit/b927b9447a69e7ded4ba279e1384115…

1 0

git: new commits in branch 5.4
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

- URL: https://github.com/kamailio/kamailio/commit/08bbba6aebab8de80a935b76991f4b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:50:52+01:00 core: parser - detect pai/ppi headers spanning many lines - GH #2837 (cherry picked from commit f0e8898d83c54e5e4383b70ba54ad340c5ae13b6) (cherry picked from commit 9427586f3af4dacfa2b3293ea6c5813a6b6c1e5c) - URL: https://github.com/kamailio/kamailio/commit/ffe4fa42f9d17d8c7a38bbd4e5ee678… Author: Zion Dials <me(a)ziondials.com> Date: 2022-03-02T12:51:37+01:00 Fix TM Module Doc unmatched_cancel param (cherry picked from commit c060e9000f9c6cca98e23bef7aa8c295c8863de6) (cherry picked from commit a2969015b92667a728c0ec8df64adb99859b5f84) - URL: https://github.com/kamailio/kamailio/commit/7a97d92b318e54af68ab2854a20d692… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:52:15+01:00 nat_traversal: declare flag literal as unsigned - GH #2954 (cherry picked from commit 8c30109df0b479cc3fce39a765717149e9c70ddf) (cherry picked from commit 4814bac2424db7fea2ba817fcdf4594a7b2e1c11) - URL: https://github.com/kamailio/kamailio/commit/e07f0af4e980f98622088c00b444bd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:52:32+01:00 core: flags - use unsigned literal for bit shifting operations (cherry picked from commit 1a406e093ea7ac07428c92aec21ac67f8caa1093) (cherry picked from commit 2c196d149c19ee59174f89020407e1f15156182e) - URL: https://github.com/kamailio/kamailio/commit/d40c394d177af95a55c16759d0d3132… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2022-03-02T12:52:41+01:00 db_cluster: Fix spelling errors (cherry picked from commit 2eed551ed55fcd2bc190e1045da377f6b1e4d22d) (cherry picked from commit 0d77ae82ff1cac93a48ede3558ddf48632960a70) - URL: https://github.com/kamailio/kamailio/commit/e5815318171bbdb9c3642149255eb12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:53:22+01:00 src/Makefile.defs: link -lrt if glibc <= 2.17 - GH #2921 (cherry picked from commit 743a9d33dcc3a6220bba217c14810dafb53355b2) (cherry picked from commit 0afcccdc46950c5b4a49024e2092ab712ba6be94) - URL: https://github.com/kamailio/kamailio/commit/aec3e22400b5a1978ee124007f71213… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2022-03-02T12:53:41+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled (cherry picked from commit 29c3b865d8efde8435c2217df44d1df684caaea2) (cherry picked from commit 88b50be127ca0dab57784e0ffb96d6eb44196772) - URL: https://github.com/kamailio/kamailio/commit/94a7f11d6cb5ec27a287cd084cd7ba9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:53:56+01:00 core: parser - print start of buffer on error for identity info (cherry picked from commit 48dc90dfa1839a405e7d090b23c1fdc907107731) (cherry picked from commit dc5eda219c152d1c08ba38849163849f62242b2d) - URL: https://github.com/kamailio/kamailio/commit/6b5be83292e365540912dd5df0754e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:54:17+01:00 core: parser/sdp - cast to unsigned for left shifting (cherry picked from commit c1ec3857f360c806b7cc856b8e6ae3d5362ef49f) (cherry picked from commit f387209ca7efd65a1fd7ee510d899fec6e080289) - URL: https://github.com/kamailio/kamailio/commit/478037908535e9bc27a65c2dd0867d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:54:29+01:00 core: parser/sdp - coherent indentation of two functions (cherry picked from commit 1b5756ae9f67c3907c134eb725f19c875cccd913) (cherry picked from commit 4b9987bd630d78aa27ea392491989ddfeeda0d98) - URL: https://github.com/kamailio/kamailio/commit/88ba7c1c30a1c6bbe93a1e2a3093f58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:54:41+01:00 core: parser/sdp - check for delimiter size done before comparison (cherry picked from commit b83810eb1eb70f326698db874a1f67cf6a8d06cf) (cherry picked from commit d7c030f576fa87b5959b7156c6b2077d76bb1fee) - URL: https://github.com/kamailio/kamailio/commit/673d32b4c1d7aff80f93ba8473bba5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:08+01:00 presence: info logs instead of error for not maching conditions (cherry picked from commit f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854) (cherry picked from commit 27875047db766cc7cb3a4d5d7638bdafd98e09b1) - URL: https://github.com/kamailio/kamailio/commit/7f04a6575dcbfc5b5a47ab342f698bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:22+01:00 Makefile.defs: use sed instead of awk for detecting glibc version (cherry picked from commit 225a59475c91e154ce0a7f0ec252be841a5a8ce5) (cherry picked from commit 17bbfe97179a2965b145b946b76ba458c2af8bd5) - URL: https://github.com/kamailio/kamailio/commit/2bea8c5fe3e8af5faf42b6cba04cef9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:39+01:00 core: parser - clang format for parse_identityinfo.c (cherry picked from commit 1cd480dfe6f2e06bac99b74e466e0c6bb8801279) (cherry picked from commit a2446f5194446ab9432aecde99522e709ecdc1e3) - URL: https://github.com/kamailio/kamailio/commit/24fac1820b7efa70425e220a8b85953… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:56+01:00 misc/examples: kemi - sanity check for response in lua script (cherry picked from commit 96ba8bdf87221c985d8198fe36f7f0bd9858a738) (cherry picked from commit d06fbbea95b33934d841f37bff6ae2b32dde2f87) - URL: https://github.com/kamailio/kamailio/commit/4cf259b53864ce3f0d17699c4f64d2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:56:13+01:00 core: parser - clang format parser_f.c (cherry picked from commit 03acf834a19689d6c3efcea93e48985d3e7ffc37) (cherry picked from commit 5d08f4028ad6f805940d1824e17fb148bd90a045) - URL: https://github.com/kamailio/kamailio/commit/ab264fe6ea2680a0b837f665bd76a61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:56:24+01:00 core: parser sdp - check if delimiter exceeds body limit (cherry picked from commit bd5280726a9842b257afabae548853d000ecd249) (cherry picked from commit fb06dbf3e0452f1b4e8772da3fa94d6bd930f238) - URL: https://github.com/kamailio/kamailio/commit/084bdf50a56a9f11f935fb792f22cfe… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2022-03-02T12:56:46+01:00 dlgs: optimize dlgs_init, if/else path are identical (cherry picked from commit 8e7f2e6a158bb2c59600b03be3c7e6eefc416180) (cherry picked from commit 5715fc40664438e092d444ea31b99c965c26da7e) - URL: https://github.com/kamailio/kamailio/commit/2be54b7385cbc76c6a24639ebf77386… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:01+01:00 misc/examples: kemi - update lua sample config (cherry picked from commit 99a9f27c8d24a06f201b4713f7a2bfeb37092482) (cherry picked from commit 97bc9751485dfd9aa314e15aaef73b0835e580cf) - URL: https://github.com/kamailio/kamailio/commit/fb4d740ecdce111e49f57eb77d53519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:14+01:00 misc/examples: kemi - sanity checks for response in python script (cherry picked from commit bd42130e3cfb87856b4b0431de50eccdd4324f9f) (cherry picked from commit 0ba7876e5cc1120d7e64e779ba9327ed33e88a19) - URL: https://github.com/kamailio/kamailio/commit/c2584c5e8b5b5bb52a16ce072e938a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:26+01:00 auth_identity: close file in case of errors - GH #2983 (cherry picked from commit 84cdc33429c61fe7cac91cbedf96bef560267313) (cherry picked from commit 42e3c28f2744ee4c799c972bed56e412f792027e) - URL: https://github.com/kamailio/kamailio/commit/932386739ee62cfc3353b45ae435d29… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2022-03-02T12:57:37+01:00 ldap: rename private function ldap_connect When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 362c6de08058948d0a70a1eeb14ec718f922b4e5) (cherry picked from commit 65e50fbd24f9239a4dab25c6b8328670e150fda5) - URL: https://github.com/kamailio/kamailio/commit/be9d186983862cae606311ec200227b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:48+01:00 siputils: docs - note about restrictions of ring_insert_callid() - GH #2989 (cherry picked from commit 090f1f74603de6113f3dd41095ae41b4f03f8171) (cherry picked from commit e0084adcda85b10b3b0c0765a292cfde088b2845) - URL: https://github.com/kamailio/kamailio/commit/7529d73430ec34b0a5ed260a8a7d6fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:58:00+01:00 core: parser sdp - print hdr name by length on error in get_sdp_hdr_field() (cherry picked from commit c4e462fa6bda38ac6fd814ce8d98ea030d4049b9) (cherry picked from commit 0aa4340764f78c74a62054050d8805616f450fdb) - URL: https://github.com/kamailio/kamailio/commit/48abb7e5465552817b652884b44f4e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:58:49+01:00 presence: utils - use memcpy instead of strncpy for coherence (cherry picked from commit 33c40170e73adc71e2ad66d8dbb6c776b771ce5d) (cherry picked from commit e3ed8c0d80dea4da4c522864f1480d02d57e2d4a) - URL: https://github.com/kamailio/kamailio/commit/9b809ec448fc9e8487ec3543af80171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:00+01:00 lcr: init buffers to try to get rid of new warnings (cherry picked from commit 0247c336e208912324c71aea9843e688d7c5a463) (cherry picked from commit 7381ccd61a325e5b6502d05588ac8edf9a244d0f) - URL: https://github.com/kamailio/kamailio/commit/bdcb7be3ee190dd89df84d1436e9309… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:12+01:00 dispatcher: safety checks for str fields (cherry picked from commit 5443db4d632c8502dc622cc28fe2847fb0c147c1) (cherry picked from commit e855d251d27e5a399cfa3d8a70b4387295c37c6e) - URL: https://github.com/kamailio/kamailio/commit/4c9ff2f8c7ea3ab700b74e1407fc048… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:25+01:00 rls: free xml doc in case of error (cherry picked from commit 55f23d09faee06a892dde13e371d144b98bae68f) (cherry picked from commit 93cd99f08c61b7355e948dfbf855eb381e84ed1b) - URL: https://github.com/kamailio/kamailio/commit/4c0b3bd5277905be9fbddd1afa2c517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:37+01:00 avpops: init variable to fix warning (cherry picked from commit b7815d04ced35d5b5ccbcdaa39d41ef4a2cb2ad0) (cherry picked from commit 4f002432bf2699d99f7b83a3652fc9e2b6c7447d) - URL: https://github.com/kamailio/kamailio/commit/b9b058fc4ddb5a2f21eb87fa293a39c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:48+01:00 db_text: init variable to fix warning (cherry picked from commit 102b7c62ae9877151ce542b8b5747051fb954acb) (cherry picked from commit c8582892d0cacbd2ed857f87d2fa59ae7ae10148) - URL: https://github.com/kamailio/kamailio/commit/e2c5c607c48f1c5443320e708f19f16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:00+01:00 dialog: init variable to fix warning (cherry picked from commit 682f9984fc4942d5f786f0ca9d798630d618f8da) (cherry picked from commit 49d5f6eb5f9f0a800dbaaf02c3ef8ef6622a6b73) - URL: https://github.com/kamailio/kamailio/commit/016febcb8c4a2de4d21201d0f2f74ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:16+01:00 core: parser - print ascii code and position of invalid char for identity info (cherry picked from commit 40e59d9c3b8ec531cb9e26093c43647a43108dfd) (cherry picked from commit ef9b353910d10d91fde88193b7a3dd9c27bf18ad) - URL: https://github.com/kamailio/kamailio/commit/f2591185cc40e41b5b5f8470f608493… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:30+01:00 dispatcher: removed module name from log message - updates to debug messages (cherry picked from commit 29ebde9cfe746c1dd9083a5fc4b26a32c39ca0a4) (cherry picked from commit c8d579452906aee0c2716ef9ac25fe0d4628089e) - URL: https://github.com/kamailio/kamailio/commit/caa6f373820d76d6bda8e65b18bb5e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:42+01:00 tm: update uri when refreshing local uac shortcuts (cherry picked from commit 0ed1282238da6cdd8a4dbef1b61493b70a850a6b) (cherry picked from commit 633148323c83b9f35d221ff59fbf7b3be8194b1f) - URL: https://github.com/kamailio/kamailio/commit/0a99d2059fa0e6530f78493a36bcf19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:54+01:00 db_unixodbc: catch queries without result to skip printing error logs - GH #2810 (cherry picked from commit 795a09077ccc5dd06f9074978dc77dd81389512b) (cherry picked from commit 3d4ceff9aa77b841fa2df938cfbab9b534f14626) - URL: https://github.com/kamailio/kamailio/commit/dc8b1cde73a854e5a8f265c0b9c8fbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:01:06+01:00 stats: detect of mod param items is set after track - it can lead to crash if items is set to greater value than the default one (GH #2101) - round up for better memory alignment in the allocated structures (cherry picked from commit b29c79c8d83fd23064e50dcee02e5f85ec51328d) (cherry picked from commit 331e60374e6a0c283b835ab62da84826c8833a48) - URL: https://github.com/kamailio/kamailio/commit/967607b3c2711d33801bab21110283e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:01:16+01:00 statsc: note that items param must be set before track (cherry picked from commit f517f8c655e676f5872eda5f81f5244eac4eed25) (cherry picked from commit 38bdf24485f3e4d2d9489ba695f7b23bbce85cc0) - URL: https://github.com/kamailio/kamailio/commit/6685bb996094547d8955ce69bd018d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:01:28+01:00 core: set exit flag for return 0 (cherry picked from commit 23c39ecbdd29f2fff0af4a693b08032e8afff48b) (cherry picked from commit b149906e3c0558fd9cb866d39b36f180efaef656) - URL: https://github.com/kamailio/kamailio/commit/f5d9eabb7e859a6fb0c6506e2969328… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-03-02T13:01:38+01:00 phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. (cherry picked from commit c4b280bd5b5b0cfb8d34ecef296972f2a043791e) (cherry picked from commit 3ee8896e87a8a2b0f6e704d806983b544a0a5224) - URL: https://github.com/kamailio/kamailio/commit/0afb5767a8af925b514528ab46d8f53… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-03-02T13:01:50+01:00 websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit 0a3476384b325514b1da784b74cc821360193409) (cherry picked from commit 0ee717c91ca0dc590d6764803c151982a4d12d4a) - URL: https://github.com/kamailio/kamailio/commit/cefee1b4f0be02d31849b01e8abf837… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-03-02T13:02:00+01:00 rtp_media_server: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit cda05478b25ad93b1fb7475cf6b2767d7164bbbb) (cherry picked from commit d40337449e274f6c6d9ea1754977287841c306c9) - URL: https://github.com/kamailio/kamailio/commit/12cac22b3a12384ca98d27def01f632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:02:19+01:00 websocket: makefile - set library path for localbase (cherry picked from commit 2e4258f440a07a2cfd20082af22bba4f9a2448ab) (cherry picked from commit 254d19b4dd703c24a7a15e5539e585e42b3de101) - URL: https://github.com/kamailio/kamailio/commit/11303aa0728e993372ff54a52ee2f74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:02:31+01:00 Makefile.defs: set localbase for macports on macos (cherry picked from commit 584eabf7de6af9f835678f9c6d6851cce49a3878) (cherry picked from commit a18374d1f0c5ec58e92981e4ac14320de7de92d9) - URL: https://github.com/kamailio/kamailio/commit/3d609391c367acc11f49b40d6b0bacb… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-03-02T13:03:02+01:00 rls: fixed format-truncation warning GH #3013 (cherry picked from commit e921fc8ed7a6c9fdeb532179a77503cd67799487) (cherry picked from commit 86c897fac37d2a78b8122b4c62ec87a2371fd9d4) - URL: https://github.com/kamailio/kamailio/commit/e8706eda78b2b36dde82a94af469acf… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-03-02T13:03:12+01:00 presence: fixed format-truncation warning GH #3013 (cherry picked from commit c1b14f49ead9a29711cde5334155819cd1c6c90d) (cherry picked from commit 5d05de900de0145a22a5bf044267d9b0c0ceb712) - URL: https://github.com/kamailio/kamailio/commit/3096fdcb1ab96fc70a2bc19013b9d3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:03:37+01:00 xhttp_pi: wrap freeing and setting to null in curly braces - GH #3012 (cherry picked from commit 37580a25694d5e5b0b4c89a92d1ba2d8b77aacba) (cherry picked from commit 56d9073ef2dd61f6ab48602fe2af77e3c090e290) - URL: https://github.com/kamailio/kamailio/commit/42813328a803becc03658329462326a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:03:48+01:00 db_perlvdb: removed unnecessary condition (cherry picked from commit d3daed0a617024fde1efabbcdab27dc4c5c140c8) (cherry picked from commit 10cfb3ea0e80cfbaa5745093d471a58997a633ff) - URL: https://github.com/kamailio/kamailio/commit/c73e94ec8ad3c22be89f524f327116a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:03:58+01:00 ims_dialog: updated test conditions - GH #3014 (cherry picked from commit a8d56242da48708949149c11c06d031b5c2fad49) (cherry picked from commit 6c3b7c0e2ee3e0d397f1781f385eb78483fdd67f) - URL: https://github.com/kamailio/kamailio/commit/852404c2ccb6d1056371c19ffb81cee… Author: Adrian Bunk <bunk(a)debian.org> Date: 2022-03-02T13:04:13+01:00 src/Makefile: Also stop compiling kamcmd from here (cherry picked from commit c1335157c53ca014bbeec6de312f42d955221d58) (cherry picked from commit 43b94264f81e54625ee90faa7f52b006b67a1b61) - URL: https://github.com/kamailio/kamailio/commit/4c20bfabe36b1a6019e62f1b1134198… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:04:26+01:00 core: updated description for core.psa rpc command (cherry picked from commit aca381d30413eb1b43abf9e7e3b1306854ceb117) (cherry picked from commit 19cef203a1b487174ce7a0e66431b2c03bf78c65) - URL: https://github.com/kamailio/kamailio/commit/03a8ad0e184d2be501698757b7a7efa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:04:37+01:00 xmlops: docs - more practical example for xml_ns (cherry picked from commit 0cb6a0640e9e3e2e06d2c5bc68c6177d5bd38b89) (cherry picked from commit 207e0d9f80b2e1a48c7c21844f158e231bfd8e1e) - URL: https://github.com/kamailio/kamailio/commit/f672aae895a53d2584009ad1618ed1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:04:49+01:00 xmlops: docs - added the remark that xml_ns param can be set many times (cherry picked from commit 56e26387b77536e6c9f13dd62e5aecabaaba2d9a) (cherry picked from commit 78710d9da5cfe117190694cd3b77ced54414a2e8) - URL: https://github.com/kamailio/kamailio/commit/fd33fa9381e74289fd8f093a4d9b0ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:05:43+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode (cherry picked from commit e81f2e318bc32802d152ef69d005b8194e17ca42) (cherry picked from commit 42d4359e6c3288fdfb705c5d0e38f47443048550) - URL: https://github.com/kamailio/kamailio/commit/8145a3a06d078b3c3c3b921da96a4f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:06:03+01:00 siputils: handle messages with many headers for contact param encode/decode (cherry picked from commit cf054e0e041385d0533d0fa7b49e34fc1131ddcb) (cherry picked from commit cfe2dce135550054cec3ff86501c9265209ffad5) - URL: https://github.com/kamailio/kamailio/commit/068861f80aa0d4f911b9d66a945cb47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:06:11+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 (cherry picked from commit e3b9521a150ac2245dee2afeac5d674768c7399a) (cherry picked from commit 39e6c357a93a62033082a3bed2f985b8ad47db13) - URL: https://github.com/kamailio/kamailio/commit/f2fb024d8928c291bf2b943f2346b0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:06:34+01:00 tmx: use trimmed call-id value for hashing (cherry picked from commit 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb) (cherry picked from commit 11e7c173f2974c2174d1ccaca717eb63c5608a84) - URL: https://github.com/kamailio/kamailio/commit/d003c87289243c5380e5fa0dce27ea9… Author: Matthias Urlichs <matthias(a)urlichs.de> Date: 2022-03-02T13:06:48+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning (cherry picked from commit 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2) (cherry picked from commit e77e4ad4953aac413d06ceb3954736b81ac30355) - URL: https://github.com/kamailio/kamailio/commit/d475ee121cb0f6ff71146f8ce108a46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:07:13+01:00 core: fixed comment typo (cherry picked from commit c37ccdc6e3bad0af4644941a872f510c51936c58) (cherry picked from commit 42b80a2cf0fa1b2e7192ade5844df670a49480ff) - URL: https://github.com/kamailio/kamailio/commit/2e0caef3c77e7cc7f3b766228b48e8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:13:52+01:00 Revert "siputils: handle messages with many headers for contact param encode/decode" This reverts commit 8145a3a06d078b3c3c3b921da96a4f2e000ea9b7.

1 0

git:5.5:42b80a2c: core: fixed comment typo
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 42b80a2cf0fa1b2e7192ade5844df670a49480ff URL: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:15:05+01:00 core: fixed comment typo (cherry picked from commit c37ccdc6e3bad0af4644941a872f510c51936c58) --- Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… Patch: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 99c1dc1de1..df47e18965 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -154,7 +154,7 @@ typedef int (*param_func_t)( modparam_t type, void* val); @warning child_init(PROC_MAIN) is again called in the same process (main), but latter (before tcp), so make sure you don't init things - twice, bot in PROC_MAIN and PROC_INT */ + twice, both in PROC_MAIN and PROC_INT */ #define PROC_NOCHLDINIT -128 /**< no child init functions will be called if this rank is used in fork_process() */

1 0

git:5.5:0a945faa: blst: converted log macros and removed function names
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 0a945faa496a48377c766f5966243b3e0a9dbc75 URL: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:52+01:00 blst: converted log macros and removed function names (cherry picked from commit f85cd7eb9d3249ee93f0de7f978d0a9e7044df77) --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Patch: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 5d33368bd8..1c2773c53c 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -119,11 +119,10 @@ static int ki_blst_add(sip_msg_t* msg, int t) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -193,12 +192,10 @@ static int ki_blst_add_retry_after(sip_msg_t* msg, int t_min, int t_max) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -241,11 +238,10 @@ static int ki_blst_del(sip_msg_t* msg) if (dst_blocklist_del(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -281,8 +277,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) " blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -309,8 +304,7 @@ static int ki_blst_set_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -349,8 +343,7 @@ static int ki_blst_clear_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -390,8 +383,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -432,8 +424,7 @@ static int ki_blst_rpl_clear_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; }

1 0

git:5.5:b8329204: Erlang: Revert breaking change
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: b83292042aae87c445e05c3f82231ca6d335cc96 URL: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:11+01:00 Erlang: Revert breaking change Revert https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… xavp_add_xavp_value returns the root and not the xavp it added and that was the reason for the code the commit removed. Changed a variable name to help make that more clear. Also related to https://github.com/kamailio/kamailio/issues/2069. (cherry picked from commit 1ed58f0de4f7a3ab3a81dd84c1c3b94fa1df2c4b) --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Patch: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 894c36784c..b19a22ac8e 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -86,11 +86,15 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { - xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); - } else { - xbuff = xavp_get_child(&xbuff_list, name); + xbuffs_root = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + if (!xbuffs_root){ + LM_ERR("cannot create xbuffs_root \n"); + return NULL; + } } + xbuff = xavp_get_child(&xbuff_list, name); + if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:5.5:e77e4ad4: nathelper: Fix uninitialized data
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: e77e4ad4953aac413d06ceb3954736b81ac30355 URL: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:38+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning (cherry picked from commit 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… Patch: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9e45a61079..3cb138ebdd 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1615,7 +1615,7 @@ static inline int replace_sdp_ip( { str body1, oldip, newip; str body = *org_body; - int pf, pf1 = 0; + int pf = 0, pf1 = 0; str body2; char *bodylimit = body.s + body.len; int ret; @@ -1974,6 +1974,7 @@ static int send_raw(const char *buf, int buf_len, union sockaddr_union *to, ip->ip_off = 0; ip->ip_ttl = 69; ip->ip_p = 17; + ip->ip_sum = 0; ip->ip_src.s_addr = s_ip; ip->ip_dst.s_addr = to->sin.sin_addr.s_addr;

1 0

git:5.5:11e7c173: tmx: use trimmed call-id value for hashing
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 11e7c173f2974c2174d1ccaca717eb63c5608a84 URL: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:13:19+01:00 tmx: use trimmed call-id value for hashing (cherry picked from commit 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Patch: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 256c82bf16..7bb2315fd3 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -243,7 +243,7 @@ int tmx_check_pretran(sip_msg_t *msg) sftag = get_from(msg)->tag_value; trim(&sftag); - chid = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); + chid = get_hash1_raw(scallid.s, scallid.len); slotid = chid & (_tmx_ptran_size-1); if(unlikely(_tmx_proc_ptran == NULL)) {

1 0

git:5.5:34eceee6: Erlang: Erlang module assumes pvi.type is zero
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 34eceee62f20dfd4ef148277c93391e5e778ccef URL: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:01+01:00 Erlang: Erlang module assumes pvi.type is zero Related to this commit: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… (cherry picked from commit fa74be53232d56797209a630823a20346f9d2597) --- Modified: src/modules/erlang/pv_atom.c Modified: src/modules/erlang/pv_pid.c Modified: src/modules/erlang/pv_ref.c Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Patch: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… --- diff --git a/src/modules/erlang/pv_atom.c b/src/modules/erlang/pv_atom.c index b37f01560f..092672751c 100644 --- a/src/modules/erlang/pv_atom.c +++ b/src/modules/erlang/pv_atom.c @@ -51,6 +51,9 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_pid.c b/src/modules/erlang/pv_pid.c index 2de3f5e698..acb2bee5b2 100644 --- a/src/modules/erlang/pv_pid.c +++ b/src/modules/erlang/pv_pid.c @@ -54,6 +54,9 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_ref.c b/src/modules/erlang/pv_ref.c index 052f7ced90..927cb4b855 100644 --- a/src/modules/erlang/pv_ref.c +++ b/src/modules/erlang/pv_ref.c @@ -54,6 +54,9 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index ce6e2bd2eb..894c36784c 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -198,6 +198,9 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break;

1 0

git:5.5:39e6c357: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 39e6c357a93a62033082a3bed2f985b8ad47db13 URL: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:33:52+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 (cherry picked from commit e3b9521a150ac2245dee2afeac5d674768c7399a) --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Patch: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

1 0

git:master:e3b9521a: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: e3b9521a150ac2245dee2afeac5d674768c7399a URL: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:29:06+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Patch: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

1 0

git:master:3dc980d6: modules: readme files regenerated - jwt ... [skip ci]
by Kamailio Dev 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: 3dc980d66fc4caeea90bb95870394c8855b51dec URL: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-02T08:46:19+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Patch: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8…

1 0

git:master:eee5068e: jwt: add missing tag in doc
by Victor Seva 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: eee5068e2f315b6d391e6fe7b6aef4875afcf574 URL: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-02T08:39:26+01:00 jwt: add missing tag in doc error instroduced at aaa142d293105ef27f7e4b6143fc3fb18c9a5a75 --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Patch: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index 45d98c7689..a72c518efe 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -115,6 +115,7 @@ modparam("jwt", "key_mode", 1) added as string value. </para> </listitem> + <listitem> <para> headers - the list of headers to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format).

1 0

git:master:9d1f223c: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: 9d1f223c7705a7ed8d888f50f2611dea1649ffa5 URL: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-01T14:01:17+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… Patch: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index d1721ffa84..dc28b471ec 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -249,10 +249,13 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") The format of the value follows the SIP params style: "attr1=val1;attr2=val2;...". The attributes can be: - * type - it can be "A" (IPv4) or "AAAA" (IPv6) + * type - it can be "A" (IPv4), "AAAA" (IPv6) or "SRV" * name - the domain name * addr - the IP address * ttl - TTL value + * priority - priority value for SRV record + * weight - weight value for SRV record + * port - port value for SRV record * flags - can be: 1 - the domain is unresolvable (like blocklisted); 2 - the record is permanent (never times out, never deleted, never overwritten)

1 0

git:master:23c8ba29: corex: support adding dns srv records via dns_cache param
by Daniel-Constantin Mierla 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: 23c8ba29ac4cd0ccbc3012e87e48f289bfb9d200 URL: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-01T13:45:54+01:00 corex: support adding dns srv records via dns_cache param --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Patch: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index b4e0b67a87..b2fc9c09b2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -383,6 +383,10 @@ static int corex_dns_cache_param_add(str *pval) unsigned short dns_type = 0; int dns_ttl = 0; int dns_flags = 0; + int dns_priority = 0; + int dns_weight = 0; + int dns_port = 0; + if(pval==NULL) { LM_ERR("invalid parameter\n"); @@ -414,8 +418,11 @@ static int corex_dns_cache_param_add(str *pval) || (pit->body.s[0]=='A'))) { dns_type = T_A; } else if((pit->body.len == 4) - && strncasecmp(pit->name.s, "aaaa", 4)==0) { + && strncasecmp(pit->body.s, "aaaa", 4)==0) { dns_type = T_AAAA; + } else if((pit->body.len == 3) + && strncasecmp(pit->body.s, "srv", 3)==0) { + dns_type = T_SRV; } } else if(pit->name.len==3 && strncasecmp(pit->name.s, "ttl", 3)==0) { @@ -433,6 +440,30 @@ static int corex_dns_cache_param_add(str *pval) return -1; } } + } else if(pit->name.len==8 + && strncasecmp(pit->name.s, "priority", 8)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_priority) < 0) { + LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==6 + && strncasecmp(pit->name.s, "weight", 6)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_weight) < 0) { + LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==4 + && strncasecmp(pit->name.s, "port", 4)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_port) < 0) { + LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } } } @@ -440,9 +471,9 @@ static int corex_dns_cache_param_add(str *pval) &dns_name, dns_ttl, &dns_addr, - 0 /* priority */, - 0 /* weight */, - 0 /* port */, + dns_priority, /* priority */ + dns_weight, /* weight */ + dns_port, /* port */ dns_flags) == 0) { return 0; }

1 0

git:master:c9d682fa: corex: docs extended for dns_cache parameter
by Daniel-Constantin Mierla 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: c9d682fa7fb52357c2ca3779b1d23d1d151f065a URL: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-01T13:48:29+01:00 corex: docs extended for dns_cache parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… Patch: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 5ae9bea44a..6a1b94e021 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -109,7 +109,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") <itemizedlist> <listitem> <para> - <emphasis>type</emphasis> - it can be "A" (IPv4) or "AAAA" (IPv6) + <emphasis>type</emphasis> - it can be "A" (IPv4), "AAAA" (IPv6) or "SRV" </para> </listitem> <listitem> @@ -127,6 +127,21 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") <emphasis>ttl</emphasis> - TTL value </para> </listitem> + <listitem> + <para> + <emphasis>priority</emphasis> - priority value for SRV record + </para> + </listitem> + <listitem> + <para> + <emphasis>weight</emphasis> - weight value for SRV record + </para> + </listitem> + <listitem> + <para> + <emphasis>port</emphasis> - port value for SRV record + </para> + </listitem> <listitem> <para> <emphasis>flags</emphasis> - can be: 1 - the domain is unresolvable

1 0

git:master:78c8d084: db_redis: clean previous connection before trying to reconnect
by Victor Seva 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: 78c8d084e30373aacc456fd41062b68e6e82ea6f URL: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-01T10:35:23+01:00 db_redis: clean previous connection before trying to reconnect --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… Patch: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 1166117961..5cf36ffb36 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -124,6 +124,11 @@ int db_redis_connect(km_redis_con_t *con) { #endif reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

[kamailio/kamailio] add duk_module_node to module app_jsdt (PR #3038)
by Ian Carlson 01 Mar '22

01 Mar '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #3037 #### Description I can not remember the last time I wrote any C which was likely a class assignment last century. Anyways I came across this issue and it seemed in reach to get the ball rolling. I know this PR needs more work but my goal is to share my progress to help move this feature forward. Based on https://github.com/svaarala/duktape/tree/master/extras/module-node added: - duk_module_node.h - duk_module_node.c updated: - app_jsdt_api.h - app_jsdt_api.c Included the extra header and initialize the bindings after 'load JS context' was created. added `cb_resolve_module` to resolve the full file system path for requested_id and parent_id added `cb_load_module` function which uses `jsdt_load_file` to load resolved file With absolute and relative modules working I met my current requirements to allow breaking routing into multiple smaller files. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3038 -- Commit Summary -- * app_jsdt: add duk_module_node for JS module resolution -- File Changes -- M src/modules/app_jsdt/app_jsdt_api.c (65) M src/modules/app_jsdt/app_jsdt_api.h (3) A src/modules/app_jsdt/duk_module_node.c (333) A src/modules/app_jsdt/duk_module_node.h (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3038.patch https://github.com/kamailio/kamailio/pull/3038.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3038 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3038(a)github.com>

2 4

git:5.5:cfe2dce1: siputils: handle messages with many headers for contact param encode/decode
by Daniel-Constantin Mierla 28 Feb '22

28 Feb '22

Module: kamailio Branch: 5.5 Commit: cfe2dce135550054cec3ff86501c9265209ffad5 URL: https://github.com/kamailio/kamailio/commit/cfe2dce135550054cec3ff86501c926… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-28T14:55:44+01:00 siputils: handle messages with many headers for contact param encode/decode (cherry picked from commit cf054e0e041385d0533d0fa7b49e34fc1131ddcb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/cfe2dce135550054cec3ff86501c926… Patch: https://github.com/kamailio/kamailio/commit/cfe2dce135550054cec3ff86501c926…

1 0

git:master:cf054e0e: siputils: handle messages with many headers for contact param encode/decode
by Daniel-Constantin Mierla 28 Feb '22

28 Feb '22

Module: kamailio Branch: master Commit: cf054e0e041385d0533d0fa7b49e34fc1131ddcb URL: https://github.com/kamailio/kamailio/commit/cf054e0e041385d0533d0fa7b49e34f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-28T14:54:21+01:00 siputils: handle messages with many headers for contact param encode/decode --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/cf054e0e041385d0533d0fa7b49e34f… Patch: https://github.com/kamailio/kamailio/commit/cf054e0e041385d0533d0fa7b49e34f…

1 0

[kamailio/kamailio] core: improve SDP parser to support ICE media stream options / improve existing data structures cloning in the SDP parser (PR #3034)
by Donat Zenichev 28 Feb '22

28 Feb '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Commits are separated per change dedication, even though they concern the same component. - core: add support of ICE media options to SDP parser - core: improve an existing data structures cloning in the SDP parser --- core: add support of ICE media options to SDP parser In the current implementation only parsing of ICE candidate attributes is supported, which makes it Possible to work with ICE candidates and parameters specifically related per candidate, but makes it Impossible to work with ICE options of the media stream level (ICE options which have an impact on the whole specific media stream). ICE candidate attributes and ICE media options have different dedication. In order to target this matter, a new linked list is introduced to store ICE media stream options. Additionally, now when parsing media stream's attributes, a couple of new helper functions have been introduced to properly extract and store ICE media options: - extract_ice_option() - add_sdp_ice_opt() The following extraction approaches are supported: - multi-valued ICE options attribute (more than one value per a= header) - one value per attribute (multiple a= headers with ICE options present) Also now the way how a "zeroed" on-hold is detected is improved, in case of the ICE (re)negotiation (when the connection address is equal to '0.0.0.0', the media port is equal to '9' and ice-option 'trickle' is present) the SDP is Not considered as an on-hold case, and it clearly detects it's the ICE (re)negotiation (RFC 8840), which for e.g. leads to a proper work of other side modules' functions (which use SDP parser's data structures), such as 'is_audio_on_hold()' from the textops.so module. --- core: improve existing data structures cloning in the SDP parser It's been noticed that the cloning of SDP session(s) and SDP stream(s) structures doesn't allocate the ICE candidate attributes, nor it allocates (recently introduced) ICE media stream options. In order to target this a couple of new functions have been introduced: - clone_sdp_opt_attr() - clone_sdp_ice_attr() And additionally the following functions have been improved, in order to properly clone/free ICE candidate attributes and (recently introduced) ICE media stream options: - clone_sdp_stream_cell() - free_cloned_sdp_stream() - free_sdp() - print_sdp_stream() Additionally for a proper new structure length calculation, the following function is fixed: - clone_sdp_session_cell() --- Tagging project members to review the changes: @miconda @henningw @linuxmaniac You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3034 -- Commit Summary -- * core: add support of ICE media options to SDP parser * core: improve an existing data structures cloning in the SDP parser -- File Changes -- M src/core/parser/sdp/sdp.c (290) M src/core/parser/sdp/sdp.h (40) M src/core/parser/sdp/sdp_helpr_funcs.c (60) M src/core/parser/sdp/sdp_helpr_funcs.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3034.patch https://github.com/kamailio/kamailio/pull/3034.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3034 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3034(a)github.com>

3 2

git:master:236fada4: core: add support of ICE media options to SDP parser
by Victor Seva 28 Feb '22

28 Feb '22

Module: kamailio Branch: master Commit: 236fada43f610b910490f7e0c216ac9aa3d9480c URL: https://github.com/kamailio/kamailio/commit/236fada43f610b910490f7e0c216ac9… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-28T09:13:21+01:00 core: add support of ICE media options to SDP parser In the current implementation only parsing of ICE candidate attributes is supported, which makes it Possible to work with ICE candidates and parameters specifically related per candidate, but makes it Impossible to work with ICE options of the media stream level (ICE options which have an impact on the whole specific media stream). ICE candidate attributes and ICE media options have different dedication. In order to target this matter, a new linked list is introduced to store ICE media stream options. Additionally, now when parsing media stream's attributes, a couple of new helper functions have been introduced to properly extract and store ICE media options: - extract_ice_option() - add_sdp_ice_opt() The following extraction approaches are supported: - multi-valued ICE options attribute (more than one value per a= header) - one value per attribute (multiple a= headers with ICE options present) Also now the way how a "zeroed" on-hold is detected is improved, in case of the ICE (re)negotiation (when the connection address is equal to '0.0.0.0', the media port is equal to '9' and ice-option 'trickle' is present) the SDP is Not considered as an on-hold case, and it clearly detects it's the ICE (re)negotiation (RFC 8840), which for e.g. leads to a proper work of other side modules' functions (which use SDP parser's data structures), such as 'is_audio_on_hold()' from the textops.so module. --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/236fada43f610b910490f7e0c216ac9… Patch: https://github.com/kamailio/kamailio/commit/236fada43f610b910490f7e0c216ac9…

1 0

git:master:fe7d7c57: core: improve an existing data structures cloning in the SDP parser
by Victor Seva 28 Feb '22

28 Feb '22

Module: kamailio Branch: master Commit: fe7d7c571b6c8d446cf66a1cf27d335d98f5f945 URL: https://github.com/kamailio/kamailio/commit/fe7d7c571b6c8d446cf66a1cf27d335… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-28T09:13:21+01:00 core: improve an existing data structures cloning in the SDP parser It's been noticed that the cloning of SDP session(s) and SDP stream(s) structures doesn't allocate the ICE candidate attributes, nor it allocates (recently introduced) ICE media stream options. In order to target this a couple of new functions have been introduced: - clone_sdp_opt_attr() - clone_sdp_ice_attr() And additionally the following functions have been improved, in order to properly clone/free ICE candidate attributes and (recently introduced) ICE media stream options: - clone_sdp_stream_cell() - free_cloned_sdp_stream() - free_sdp() - print_sdp_stream() Additionally for a proper new structure length calculation, the following function is fixed: - clone_sdp_session_cell() --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/fe7d7c571b6c8d446cf66a1cf27d335… Patch: https://github.com/kamailio/kamailio/commit/fe7d7c571b6c8d446cf66a1cf27d335…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev