sr-dev February 2023

sr-dev@lists.kamailio.org

10 participants
293 discussions

git:master:76df5390: uac: allow uac_auth* functions call from t_on_branch_failure event route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 76df53900b96852345d1ef368e5539197a3c5570 URL: https://github.com/kamailio/kamailio/commit/76df53900b96852345d1ef368e55391… Author: ovoshlook <ovoshlook(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-08T10:59:09+01:00 uac: allow uac_auth* functions call from t_on_branch_failure event route --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/76df53900b96852345d1ef368e55391… Patch: https://github.com/kamailio/kamailio/commit/76df53900b96852345d1ef368e55391… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 68123e5af5..b51fc4483c 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -886,7 +886,7 @@ uac_restore_to(); The parameter can be a static integer or a variable holding an integer value. </para> <para> - This function can be used from FAILURE_ROUTE. + This function can be used from FAILURE_ROUTE and BRANCH_FAILURE_ROUTE event route. </para> <example> <title><function>uac_auth</function> usage</title> @@ -938,7 +938,7 @@ failure_route[TRUNKAUTH] { The parameter can be a static integer or a variable holding an integer value. </para> <para> - This function can be used from FAILURE_ROUTE. + This function can be used from FAILURE_ROUTE and BRANCH_FAILURE_ROUTE event route. </para> <example> <title><function>uac_auth_mode</function> usage</title> diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 50873ef557..f768f82ed1 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -136,11 +136,14 @@ static cmd_export_t cmds[]={ {"uac_replace_to", (cmd_function)w_replace_to, 1, fixup_spve_spve, 0, REQUEST_ROUTE | BRANCH_ROUTE }, {"uac_restore_to", (cmd_function)w_restore_to, 0, 0, 0, REQUEST_ROUTE }, - {"uac_auth", (cmd_function)w_uac_auth, 0, 0, 0, FAILURE_ROUTE }, + {"uac_auth", (cmd_function)w_uac_auth, 0, 0, 0, + FAILURE_ROUTE | BRANCH_FAILURE_ROUTE | EVENT_ROUTE }, {"uac_auth", (cmd_function)w_uac_auth_mode, 1, - fixup_igp_null, fixup_free_igp_null, FAILURE_ROUTE }, + fixup_igp_null, fixup_free_igp_null, + FAILURE_ROUTE | BRANCH_FAILURE_ROUTE | EVENT_ROUTE }, {"uac_auth_mode", (cmd_function)w_uac_auth_mode, 1, - fixup_igp_null, fixup_free_igp_null, FAILURE_ROUTE }, + fixup_igp_null, fixup_free_igp_null, + FAILURE_ROUTE | BRANCH_FAILURE_ROUTE | EVENT_ROUTE }, {"uac_req_send", (cmd_function)w_uac_req_send, 0, 0, 0, ANY_ROUTE}, {"uac_reg_lookup", (cmd_function)w_uac_reg_lookup, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE },

1 year, 3 months

[kamailio/kamailio] uac: allow uac_auth* functions call from t_on_branch_failure event route (PR #3360)

by ovoshlook

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Adds the possibility to call uac_auth* functions from the t_branch_on_failure event route Useful in case of MID_REGISTRAR implementation, especially when REGISTER forked to multiple registrars and each one requests authentication requests separately Result example: ![image](https://user-images.githubusercontent.com/8499399/216847091-17f8b9f0-1a08-47d1-89ee-978007cef36b.png) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3360 -- Commit Summary -- * uac: allow uac_auth* functions call from t_on_branch_failure event route -- File Changes -- M src/modules/uac/doc/uac_admin.xml (4) M src/modules/uac/uac.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3360.patch https://github.com/kamailio/kamailio/pull/3360.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3360 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3360(a)github.com>

1 year, 3 months

git:master:63095ef1: lib/ims: check return of strtok(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 63095ef1bef36a35952ed265f41d87ccbc1bba70 URL: https://github.com/kamailio/kamailio/commit/63095ef1bef36a35952ed265f41d87c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-07T12:57:04+01:00 lib/ims: check return of strtok(...) --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/63095ef1bef36a35952ed265f41d87c… Patch: https://github.com/kamailio/kamailio/commit/63095ef1bef36a35952ed265f41d87c… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index 1e47e20e3d..1dda5f139b 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -1247,12 +1247,13 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, LM_DBG("p_charging_vector body is %.*s\n", header_body.len, header_body.s); p = strtok(header_body.s, " ;:\r\t\n\"="); - loop: if (p > (header_body.s + header_body.len)) +loop: + if (p == NULL || p > (header_body.s + header_body.len)) return 1; if (strncmp(p, "icid-value", 10) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1272,7 +1273,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, } else if (strncmp(p, "orig-ioi", 8) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1292,7 +1293,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, } else if (strncmp(p, "term-ioi", 8) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); - if (p > (header_body.s + header_body.len)) { + if (p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); return 0; } @@ -1314,7 +1315,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, LM_DBG("end\n"); str_free(header_body, pkg); return 1; - out_of_memory: +out_of_memory: PKG_MEM_ERROR; return 0; }

1 year, 3 months

[kamailio/kamailio] typos https://kamailio.org/docs/db-tables/kamailio-db-devel.html (Issue #3361)

by Дилян Палаузов

https://kamailio.org/docs/db-tables/kamailio-db-devel.html#idm9040 contains: * thay instead of they, (UID_AUTH_DB Module) * `,if` without comma in between (in UAC Module) * for table "uacreg" column realm is described as “Remote username”, it should be Remote realm For table dbaliases indexes contains: * alias_user_idx on column alias_username * alias_idx composite index on columns alias_username and alias_domain I would say the composite index will also be used on queries only on the alias_username column, so the index alias_user_idx is redundant and should be deleted. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3361 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3361(a)github.com>

1 year, 3 months

[kamailio/kamailio] Unclear default value for mem_join (Issue #3355)

by Дилян Палаузов

According to https://www.kamailio.org/wikidocs/cookbooks/devel/core/#mem_join the default value for mem_join is `1 (enabled)`. [https://github.com/kamailio/kamailio-wiki/blob/main/docs/tutorials/troubles… says: > In order to merge the free memory fragments one should enable memory join. Default is disabled (mem_join=0). So depending on the source of information the default value of mem_join is different. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3355 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3355(a)github.com>

1 year, 3 months

git:master:7a960bd9: modules: readme files regenerated - websocket ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7a960bd9d0002516dcbb50b89dd5d4ab5c38eb61 URL: https://github.com/kamailio/kamailio/commit/7a960bd9d0002516dcbb50b89dd5d4a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-03T19:01:20+01:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/7a960bd9d0002516dcbb50b89dd5d4a… Patch: https://github.com/kamailio/kamailio/commit/7a960bd9d0002516dcbb50b89dd5d4a… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index bc808cbefb..7bbe8527a9 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -72,7 +72,7 @@ Peter Dunkley 1.9. Set cors_mode parameter 1.10. Set verbose_list parameter 1.11. Set event_callback parameter - 1.12. Set timer_intervalparameter + 1.12. Set timer_interval parameter 1.13. Set rm_delay_intervalparameter 1.14. ws_handle_handshake usage 1.15. ws_close usage @@ -504,7 +504,7 @@ end Default value is 1. - Example 1.12. Set timer_intervalparameter + Example 1.12. Set timer_interval parameter ... modparam("websocket", "timer_interval", 5) ...

1 year, 3 months

[kamailio/kamailio] websocket: move some logging from ERROR to INFO (PR #3349)

by Дилян Палаузов

I run Kamailio with ``` log_stderror=yes /* LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR, ... */ debug=-1 ``` and inspect the output. Some messages from the websocket module are logged repeatedly at ERROR-level, but they are in no way errors. This changes moves such periodially logged no-error messages to debug-level INFO. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3349 -- Commit Summary -- * websocket: move some logging from ERROR to INFO -- File Changes -- M src/modules/websocket/doc/websocket_admin.xml (2) M src/modules/websocket/utf8_decode.h (2) M src/modules/websocket/ws_frame.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3349.patch https://github.com/kamailio/kamailio/pull/3349.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3349 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3349(a)github.com>

1 year, 3 months

git:master:d7ef6178: websocket: typos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7ef61788fcf84ff86b000f972aff99a300c5237 URL: https://github.com/kamailio/kamailio/commit/d7ef61788fcf84ff86b000f972aff99… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-03T18:46:40+01:00 websocket: typos --- Modified: src/modules/websocket/doc/websocket_admin.xml Modified: src/modules/websocket/utf8_decode.h --- Diff: https://github.com/kamailio/kamailio/commit/d7ef61788fcf84ff86b000f972aff99… Patch: https://github.com/kamailio/kamailio/commit/d7ef61788fcf84ff86b000f972aff99… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 5d33184a85..8ce006c0f8 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -488,7 +488,7 @@ end </para> <para><emphasis>Default value is 1.</emphasis></para> <example> - <title>Set <varname>timer_interval</varname>parameter</title> + <title>Set <varname>timer_interval</varname> parameter</title> <programlisting format="linespecific"> ... modparam("websocket", "timer_interval", 5) diff --git a/src/modules/websocket/utf8_decode.h b/src/modules/websocket/utf8_decode.h index 33c0ccf55f..76b378e742 100644 --- a/src/modules/websocket/utf8_decode.h +++ b/src/modules/websocket/utf8_decode.h @@ -47,7 +47,7 @@ static const uint8_t utf8d[] = { 10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8, // The second part is a transition table that maps a combination - // of a state of the automaton and a character class to a state. + // of a state of the automation and a character class to a state. 0, 12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12, 12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12, 12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,

1 year, 3 months

[kamailio/kamailio] core: typos (PR #3354)

by Дилян Палаузов

In src/core/ccopts.sh:98 there is “acroos”. This could be macros or across. Likewise in 2× src/Makefile.defs In src/core/dst_blocklist.c:625 `taget` could be `target` or `tagged`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3354 -- Commit Summary -- * core: typos -- File Changes -- M src/core/action.c (4) M src/core/atomic/atomic_alpha.h (2) M src/core/atomic/atomic_ppc.h (2) M src/core/atomic/atomic_sparc64.h (4) M src/core/atomic/atomic_unknown.h (4) M src/core/atomic_ops.h (2) M src/core/atomic_ops_init.h (2) M src/core/basex.c (2) M src/core/basex.h (4) M src/core/bit_count.h (2) M src/core/bit_scan.h (2) M src/core/ccopts.sh (4) M src/core/cfg.y (6) M src/core/cfg/cfg.c (4) M src/core/cfg/cfg_ctx.c (12) M src/core/cfg/cfg_ctx.h (2) M src/core/cfg/cfg_struct.c (4) M src/core/cfg/cfg_struct.h (2) M src/core/counters.c (6) M src/core/daemonize.c (4) M src/core/dns_cache.c (26) M src/core/dns_cache.h (2) M src/core/dprint.c (2) M src/core/dprint.h (2) M src/core/dst_blocklist.c (10) M src/core/endianness.h (6) M src/core/error.c (2) M src/core/fix_lumps.h (2) M src/core/forward.c (2) M src/core/hashes.h (2) M src/core/io_wait.h (14) M src/core/ip_addr.c (2) M src/core/kemi.c (4) M src/core/local_timer.c (2) M src/core/lock_ops.h (4) M src/core/mem/dl_malloc.c (6) M src/core/mem/ll_malloc.c (2) M src/core/mem/sf_malloc.c (2) M src/core/mod_fix.c (4) M src/core/msg_translator.h (2) M src/core/onsend.c (4) M src/core/parser/digest/digest_parser.c (4) M src/core/parser/digest/digest_parser.h (2) M src/core/parser/hf.c (2) M src/core/parser/hf.h (2) M src/core/parser/msg_parser.c (2) M src/core/parser/msg_parser.h (4) M src/core/parser/parse_body.c (18) M src/core/parser/parse_content.c (10) M src/core/parser/parse_content.h (4) M src/core/parser/parse_diversion.c (2) M src/core/parser/parse_expires.c (2) M src/core/parser/parse_param.c (2) M src/core/parser/parse_uri.c (2) M src/core/parser/parse_uri.h (2) M src/core/parser/parse_via.c (6) M src/core/parser/sdp/sdp.c (6) M src/core/parser/sdp/sdp_helpr_funcs.c (2) M src/core/pass_fd.c (2) M src/core/rand/fortuna/fortuna.c (2) M src/core/raw_sock.c (4) M src/core/resolve.c (10) M src/core/rpc.h (2) M src/core/rvalue.c (12) M src/core/rvalue.h (2) M src/core/select.c (2) M src/core/select.h (4) M src/core/select_core.c (16) M src/core/ser_time.h (2) M src/core/signals.c (2) M src/core/sip_msg_clone.c (2) M src/core/socket_info.c (2) M src/core/sr_module.c (10) M src/core/strutils.c (2) M src/core/switch.c (8) M src/core/tcp_conn.h (2) M src/core/tcp_init.h (2) M src/core/tcp_main.c (14) M src/core/tcp_options.c (2) M src/core/tcp_read.c (8) M src/core/timer.c (8) M src/core/timer.h (2) M src/core/timer_funcs.h (2) M src/core/timer_proc.c (10) M src/core/timer_proc.h (4) M src/core/timer_ticks.h (2) M src/core/usr_avp.c (2) M src/core/ut.c (2) M src/core/ut.h (4) M src/core/utils/srjson.c (2) M src/core/utils/tmrec.c (2) M src/core/ver.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3354.patch https://github.com/kamailio/kamailio/pull/3354.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3354 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3354(a)github.com>

1 year, 3 months

git:master:4341b27e: core: typos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4341b27e391e8180d285ab98c8770e7fef70cebb URL: https://github.com/kamailio/kamailio/commit/4341b27e391e8180d285ab98c8770e7… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-03T18:45:21+01:00 core: typos --- Modified: src/core/action.c Modified: src/core/atomic/atomic_alpha.h Modified: src/core/atomic/atomic_ppc.h Modified: src/core/atomic/atomic_sparc64.h Modified: src/core/atomic/atomic_unknown.h Modified: src/core/atomic_ops.h Modified: src/core/atomic_ops_init.h Modified: src/core/basex.c Modified: src/core/basex.h Modified: src/core/bit_count.h Modified: src/core/bit_scan.h Modified: src/core/ccopts.sh Modified: src/core/cfg.y Modified: src/core/cfg/cfg.c Modified: src/core/cfg/cfg_ctx.c Modified: src/core/cfg/cfg_ctx.h Modified: src/core/cfg/cfg_struct.c Modified: src/core/cfg/cfg_struct.h Modified: src/core/counters.c Modified: src/core/daemonize.c Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h Modified: src/core/dprint.c Modified: src/core/dprint.h Modified: src/core/dst_blocklist.c Modified: src/core/endianness.h Modified: src/core/error.c Modified: src/core/fix_lumps.h Modified: src/core/forward.c Modified: src/core/hashes.h Modified: src/core/io_wait.h Modified: src/core/ip_addr.c Modified: src/core/kemi.c Modified: src/core/local_timer.c Modified: src/core/lock_ops.h Modified: src/core/mem/dl_malloc.c Modified: src/core/mem/ll_malloc.c Modified: src/core/mem/sf_malloc.c Modified: src/core/mod_fix.c Modified: src/core/msg_translator.h Modified: src/core/onsend.c Modified: src/core/parser/digest/digest_parser.c Modified: src/core/parser/digest/digest_parser.h Modified: src/core/parser/hf.c Modified: src/core/parser/hf.h Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_body.c Modified: src/core/parser/parse_content.c Modified: src/core/parser/parse_content.h Modified: src/core/parser/parse_diversion.c Modified: src/core/parser/parse_expires.c Modified: src/core/parser/parse_param.c Modified: src/core/parser/parse_uri.c Modified: src/core/parser/parse_uri.h Modified: src/core/parser/parse_via.c Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/pass_fd.c Modified: src/core/rand/fortuna/fortuna.c Modified: src/core/raw_sock.c Modified: src/core/resolve.c Modified: src/core/rpc.h Modified: src/core/rvalue.c Modified: src/core/rvalue.h Modified: src/core/select.c Modified: src/core/select.h Modified: src/core/select_core.c Modified: src/core/ser_time.h Modified: src/core/signals.c Modified: src/core/sip_msg_clone.c Modified: src/core/socket_info.c Modified: src/core/sr_module.c Modified: src/core/strutils.c Modified: src/core/switch.c Modified: src/core/tcp_conn.h Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_read.c Modified: src/core/timer.c Modified: src/core/timer.h Modified: src/core/timer_funcs.h Modified: src/core/timer_proc.c Modified: src/core/timer_proc.h Modified: src/core/timer_ticks.h Modified: src/core/usr_avp.c Modified: src/core/ut.c Modified: src/core/ut.h Modified: src/core/utils/srjson.c Modified: src/core/utils/tmrec.c Modified: src/core/ver.c --- Diff: https://github.com/kamailio/kamailio/commit/4341b27e391e8180d285ab98c8770e7… Patch: https://github.com/kamailio/kamailio/commit/4341b27e391e8180d285ab98c8770e7…

1 year, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2023