sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
309 discussions

git:master:db16bd05: cdp: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: db16bd057342cb043b07913f89918fa09ff8632a URL: https://github.com/kamailio/kamailio/commit/db16bd057342cb043b07913f89918fa… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 cdp: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/cdp/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/db16bd057342cb043b07913f89918fa… Patch: https://github.com/kamailio/kamailio/commit/db16bd057342cb043b07913f89918fa… --- diff --git a/src/modules/cdp/routing.c b/src/modules/cdp/routing.c index 34347caa26..7dc97f1758 100644 --- a/src/modules/cdp/routing.c +++ b/src/modules/cdp/routing.c @@ -121,10 +121,10 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in } least_recent_time = peers[0]->last_selected; - LM_DBG("peer [%.*s] was last used @ %ld\n", peers[0]->fqdn.len, peers[0]->fqdn.s, peers[0]->last_selected); + LM_DBG("peer [%.*s] was last used @ %" TIME_T_FMT "\n", peers[0]->fqdn.len, peers[0]->fqdn.s, TIME_T_CAST(peers[0]->last_selected)); p = peers[0]; for (j = 1; j < peer_count; j++) { - LM_DBG("Peer [%.*s] was last used at [%ld]\n", peers[j]->fqdn.len, peers[j]->fqdn.s, peers[j]->last_selected); + LM_DBG("Peer [%.*s] was last used at [%" TIME_T_FMT "]\n", peers[j]->fqdn.len, peers[j]->fqdn.s, TIME_T_CAST(peers[j]->last_selected)); if (peers[j]->last_selected < least_recent_time) { least_recent_time = peers[j]->last_selected; p = peers[j];

2 years, 5 months

git:master:e7571418: auth_identity: use TIME_T_FMT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e75714181c907758d1793abb85258020337249d4 URL: https://github.com/kamailio/kamailio/commit/e75714181c907758d1793abb8525802… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 auth_identity: use TIME_T_FMT Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/auth_identity/auth_identity.c --- Diff: https://github.com/kamailio/kamailio/commit/e75714181c907758d1793abb8525802… Patch: https://github.com/kamailio/kamailio/commit/e75714181c907758d1793abb8525802… --- diff --git a/src/modules/auth_identity/auth_identity.c b/src/modules/auth_identity/auth_identity.c index 63aae1620b..4b4bb4bb08 100644 --- a/src/modules/auth_identity/auth_identity.c +++ b/src/modules/auth_identity/auth_identity.c @@ -591,7 +591,7 @@ static int check_date(struct sip_msg* msg, char* srt1, char* str2) } if (tnow > tmsg + glb_iauthval) { - LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%ld sec)\n", tnow - tmsg + glb_iauthval); + LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%" TIME_T_FMT " sec)\n", TIME_T_CAST(tnow - tmsg + glb_iauthval)); return -4; } else LOG(AUTH_DBG_LEVEL, "AUTH_IDENTITY VERIFIER: Date header value OK\n");

2 years, 5 months

git:master:bfe95c90: core: add support for time64 libcs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bfe95c90e91a0bc33a769967a5841a4ab43a6553 URL: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:03:34+01:00 core: add support for time64 libcs libcs are implementing changes to fix the year 2038 issue on 32 bit platforms (see [1]). musl libc already went ahead and implemented it, starting with musl-1.2.0 (see [2]). This commit adds the groundwork for always using the "lld" format when dealing with time_t and casting the values to be formatted to (long long). The aim is to be future proof and portable. Example warning when not using TIME_T_FMT while compiling for a 32 bit target using a time64 libc: In file included from auth_identity.c:50: auth_identity.c: In function 'check_date': ../../core/dprint.h:316:73: warning: format '%ld' expects argument of type 'long int', but argument 11 has type 'time_t' {aka 'long long int'} [-Wformat=] 316 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/dprint.h:340:25: note: in expansion of macro 'LOG_FX' 340 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/dprint.h:346:25: note: in expansion of macro 'LOG_FL' 346 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:349:25: note: in expansion of macro 'LOG_FP' 349 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ auth_identity.c:594:17: note: in expansion of macro 'LOG' 594 | LOG(L_INFO, "AUTH_IDENTITY VERIFIER: Outdated date header value (%ld sec)\n", tnow - tmsg + glb_iauthval); | ^~~ [1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign [2] https://musl.libc.org/time64.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… Patch: https://github.com/kamailio/kamailio/commit/bfe95c90e91a0bc33a769967a5841a4… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 65fcc6fc3c..fbdd349acb 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -35,6 +35,8 @@ #include "compiler_opt.h" #include "cfg_core.h" +#define TIME_T_FMT "lld" +#define TIME_T_CAST(x) ((long long)(x)) /** dicover the function name */ /* C >= 99 has __func__, older gcc versions have __FUNCTION__ */

2 years, 5 months

git:master:98fde133: modules: readme files regenerated - acc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 98fde133f6f00ec50ba2c287b798f6a062b10ac4 URL: https://github.com/kamailio/kamailio/commit/98fde133f6f00ec50ba2c287b798f6a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-03T13:01:41+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/98fde133f6f00ec50ba2c287b798f6a… Patch: https://github.com/kamailio/kamailio/commit/98fde133f6f00ec50ba2c287b798f6a… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index ac912c4921..540bd20d4d 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -125,6 +125,8 @@ Sven Knoblich 6.46. reason_from_hf (int) 6.47. clone_msg (int) 6.48. cdr_on_failed (int) + 6.49. acc_extra_size (int) + 6.50. cdr_extra_size (int) 7. Functions @@ -184,9 +186,11 @@ Sven Knoblich 1.46. reason_from_hf 1.47. clone_msg 1.48. cdr_on_failed - 1.49. acc_log_request usage - 1.50. acc_db_request usage - 1.51. acc_db_request usage + 1.49. acc_extra_size + 1.50. cdr_extra_size + 1.51. acc_log_request usage + 1.52. acc_db_request usage + 1.53. acc_db_request usage Chapter 1. Admin Guide @@ -279,6 +283,8 @@ Chapter 1. Admin Guide 6.46. reason_from_hf (int) 6.47. clone_msg (int) 6.48. cdr_on_failed (int) + 6.49. acc_extra_size (int) + 6.50. cdr_extra_size (int) 7. Functions @@ -674,6 +680,8 @@ $dlg_var(callee) = $avp(callee); #callee='C' 6.46. reason_from_hf (int) 6.47. clone_msg (int) 6.48. cdr_on_failed (int) + 6.49. acc_extra_size (int) + 6.50. cdr_extra_size (int) 6.1. early_media (integer) @@ -1321,6 +1329,30 @@ modparam("acc", "clone_msg", 0) modparam("acc", "cdr_on_failed", 0) ... +6.49. acc_extra_size (int) + + This parameter is meant to replace MAX_ACC_EXTRA fixed size with + desired size. + + Default value is 64 (MAX_ACC_EXTRA). + + Example 1.49. acc_extra_size +... +modparam("acc", "acc_extra_size", 100) +... + +6.50. cdr_extra_size (int) + + This parameter is meant to replace MAX_CDR_EXTRA fixed size with + desired size. + + Default value is 64 (MAX_CDR_EXTRA). + + Example 1.50. cdr_extra_size +... +modparam("acc", "cdr_extra_size", 100) +... + 7. Functions 7.1. acc_log_request(comment) @@ -1340,7 +1372,7 @@ modparam("acc", "cdr_on_failed", 0) This function can be used from ANY_ROUTE. - Example 1.49. acc_log_request usage + Example 1.51. acc_log_request usage ... acc_log_request("Some comment"); $var(code) = 404; @@ -1362,7 +1394,7 @@ acc_log_request("$var(code) Error: $avp(reason)"); This function can be used from ANY_ROUTE. - Example 1.50. acc_db_request usage + Example 1.52. acc_db_request usage ... acc_db_request("Some comment", "SomeTable"); acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); @@ -1386,7 +1418,7 @@ acc_db_request("$var(code) Error: $avp(reason)", "SomeTable"); This function can be used from ANY_ROUTE. - Example 1.51. acc_db_request usage + Example 1.53. acc_db_request usage ... acc_request("100 Received", "acc"); acc_request("100 Received", "acc_$time(year)_$time(mon)");

2 years, 5 months

[kamailio/kamailio] core, acc: increase define values (PR #2891)

by Stefan Mititelu

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [ ] 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  Hello. I want to ask if increasing this #define(s) are feasible to commit upstream? We've come to the case where need at least +16 more for acc module and at least +8 more for core branches. Not sure if other people would need this. 1. If yes, let me know if i should split it in 2 commits, one for core and one for acc module 2. If no, please close this PR Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2891 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2891/commits/378cfd7d02243544807a…">core, acc: increase define values</a> -- File Changes -- M src/core/config.h (2) M src/modules/acc/acc_api.h (2) M src/modules/acc/acc_cdr.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2891.patch https://github.com/kamailio/kamailio/pull/2891.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2891

2 years, 5 months

git:master:d30d7e19: acc: increase acc and cdr extra values

by Stefan Mititelu

Module: kamailio Branch: master Commit: d30d7e19e57f3b9645da7235389ea43f823d5562 URL: https://github.com/kamailio/kamailio/commit/d30d7e19e57f3b9645da7235389ea43… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-28T13:41:10+03:00 acc: increase acc and cdr extra values --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_cdr.h Modified: src/modules/acc/acc_extra.c Modified: src/modules/acc/acc_extra.h Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d30d7e19e57f3b9645da7235389ea43… Patch: https://github.com/kamailio/kamailio/commit/d30d7e19e57f3b9645da7235389ea43…

2 years, 5 months

[kamailio/kamailio] core: fixed route hash table cleanup (PR #2896)

by sergey-safarov

#### 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 - [x] Related to issue #2892 #### Description When Kamailio goes to shutdown then routing hash table cleaned properly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2896 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2896/commits/ce6453920f4a28d79e0d…">core: fixed route hash table cleanup</a> -- File Changes -- M src/core/route.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2896.patch https://github.com/kamailio/kamailio/pull/2896.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2896

2 years, 5 months

git:master:579853ec: Merge pull request #2896 from sergey-safarov/GH2892

by GitHub

Module: kamailio Branch: master Commit: 579853ec6d6f2237641da7d80099f3ba996d6806 URL: https://github.com/kamailio/kamailio/commit/579853ec6d6f2237641da7d80099f3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-03T12:58:14+01:00 Merge pull request #2896 from sergey-safarov/GH2892 core: fixed route hash table cleanup --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/579853ec6d6f2237641da7d80099f3b… Patch: https://github.com/kamailio/kamailio/commit/579853ec6d6f2237641da7d80099f3b… --- diff --git a/src/core/route.c b/src/core/route.c index ad2fa66e64..f520804312 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -91,8 +91,11 @@ inline static void destroy_rlist(struct route_list* rt) rt->entries=0; } if (rt->names.table){ - clist_foreach_safe(rt->names.table, e, tmp, next){ - pkg_free(e); + int i; + for(i = 0; i < RT_HASH_SIZE; i++) { + clist_foreach_safe(&rt->names.table[i], e, tmp, next) { + pkg_free(e); + } } pkg_free(rt->names.table); rt->names.table=0;

2 years, 5 months

git:master:8d22d827: core: fixed route hash table cleanup

by Sergey Safarov

Module: kamailio Branch: master Commit: 8d22d827d93f7fd5a9a29ee83d30c3b297c02241 URL: https://github.com/kamailio/kamailio/commit/8d22d827d93f7fd5a9a29ee83d30c3b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-10-23T19:44:57+03:00 core: fixed route hash table cleanup --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/8d22d827d93f7fd5a9a29ee83d30c3b… Patch: https://github.com/kamailio/kamailio/commit/8d22d827d93f7fd5a9a29ee83d30c3b… --- diff --git a/src/core/route.c b/src/core/route.c index ad2fa66e64..f520804312 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -91,8 +91,11 @@ inline static void destroy_rlist(struct route_list* rt) rt->entries=0; } if (rt->names.table){ - clist_foreach_safe(rt->names.table, e, tmp, next){ - pkg_free(e); + int i; + for(i = 0; i < RT_HASH_SIZE; i++) { + clist_foreach_safe(&rt->names.table[i], e, tmp, next) { + pkg_free(e); + } } pkg_free(rt->names.table); rt->names.table=0;

2 years, 5 months

[kamailio/kamailio] core: add new param sip_parser_oneline (PR #2904)

by Stefan Mititelu

#### 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  If this param is enabled, will log SIP headers with comma instead of \r\n, when some error happens. Default is disabled. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2904 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2904/commits/901ddcf7c1eef3e7e2eb…">core: add new param sip_parser_oneline</a> -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (3) M src/core/cfg_core.c (3) M src/core/cfg_core.h (1) M src/core/parser/msg_parser.c (28) M src/core/parser/msg_parser.h (5) M src/core/parser/parse_via.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2904.patch https://github.com/kamailio/kamailio/pull/2904.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2904

2 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021