- sr-dev - kamailio.org

[kamailio/kamailio] http_client: Add parameter connect_timeout_ms / timeout_ms (2) (PR #3611)
by Nicolas C 24 Oct '23

24 Oct '23

#### 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 The new parameter connect_timeout_ms (global) / timeout_ms (in httpcon) allows to specify a timeout in milliseconds on curl requests. If this parameter is defined (non zero), then the timeout in seconds is ignored. If either timeout or timeout_ms is defined at connection level, then they take precedence over the global parameters. These principles also apply to the file configuration. The timeout in ms is used internally to set CURLOPT_TIMEOUT_MS. The value is shown in ms when using RPC "httpclient.listcon". You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3611 -- Commit Summary -- * http_client: Add parameter connect_timeout_ms / timeout_ms (2) -- File Changes -- M src/modules/http_client/curlcon.c (103) M src/modules/http_client/doc/http_client_admin.xml (32) M src/modules/http_client/functions.c (24) M src/modules/http_client/http_client.c (12) M src/modules/http_client/http_client.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3611.patch https://github.com/kamailio/kamailio/pull/3611.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3611 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3611(a)github.com>

3 11

[kamailio/kamailio] ims_dialog: Add function to get dialog by hash entry and id (PR #3613)
by mtryfoss 24 Oct '23

24 Oct '23

#### 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 Add function to get dialog by internal hash entry and id. This is needed by my other ongoing changes to the ims_charging module for restoring records from database. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3613 -- Commit Summary -- * ims_dialog: Add function to get dialog by hash entry and id -- File Changes -- M src/modules/ims_dialog/dlg_handlers.c (19) M src/modules/ims_dialog/dlg_handlers.h (8) M src/modules/ims_dialog/dlg_load.h (5) M src/modules/ims_dialog/ims_dialog.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3613.patch https://github.com/kamailio/kamailio/pull/3613.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3613 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3613(a)github.com>

2 2

git:master:309565b0: ims_dialog: Add function to get dialog by hash entry and id
by Daniel-Constantin Mierla 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 309565b08f6294fdbd3d31163a73bd75a680a7e0 URL: https://github.com/kamailio/kamailio/commit/309565b08f6294fdbd3d31163a73bd7… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T14:55:49+02:00 ims_dialog: Add function to get dialog by hash entry and id --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_handlers.h Modified: src/modules/ims_dialog/dlg_load.h Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/309565b08f6294fdbd3d31163a73bd7… Patch: https://github.com/kamailio/kamailio/commit/309565b08f6294fdbd3d31163a73bd7… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 0ba5857c2d5..3487d7f4c2a 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -2101,3 +2101,22 @@ struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg) } return dlg; } + +/*! + * \brief Get dialog based on hash entry and id + * \param h_entry number of the hash table entry + * \param h_id id of the hash table entry + * \return dialog structure on success, NULL on failure + */ + +struct dlg_cell *dlg_get_hash_dialog(unsigned int h_entry, unsigned int h_id) +{ + struct dlg_cell *dlg = NULL; + + dlg = lookup_dlg(h_entry, h_id); + if(dlg == NULL) { + LM_ERR("Unable to find dlg\n"); + return NULL; + } + return dlg; +} diff --git a/src/modules/ims_dialog/dlg_handlers.h b/src/modules/ims_dialog/dlg_handlers.h index 0e61d5dc825..5e5538ebf99 100644 --- a/src/modules/ims_dialog/dlg_handlers.h +++ b/src/modules/ims_dialog/dlg_handlers.h @@ -210,4 +210,12 @@ void internal_print_all_dlg(struct dlg_cell *dlg); */ struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg); +/*! + * \brief Get dialog based on hash entry and id + * \param h_entry number of the hash table entry + * \param h_id id of the hash table entry + * \return dialog structure on success, NULL on failure + */ +struct dlg_cell *dlg_get_hash_dialog(unsigned int h_entry, unsigned int h_id); + #endif diff --git a/src/modules/ims_dialog/dlg_load.h b/src/modules/ims_dialog/dlg_load.h index be2d5f61ca3..4f62e5acc30 100644 --- a/src/modules/ims_dialog/dlg_load.h +++ b/src/modules/ims_dialog/dlg_load.h @@ -42,6 +42,10 @@ typedef int (*ims_lookup_terminate_dlg_f)( /* get the current dialog based on message function prototype */ typedef struct dlg_cell *(*ims_get_dlg_f)(struct sip_msg *msg); +/* get dialog based on hash entry and id */ +typedef struct dlg_cell *(*ims_get_dlg_hash_f)( + unsigned int h_entry, unsigned int h_id); + /* get_dlg_lifetime function prototype */ typedef time_t (*ims_get_dlg_expires_f)(str *callid, str *ftag, str *ttag); @@ -57,6 +61,7 @@ typedef struct ims_dlg_binds ims_get_dlg_variable_f get_dlg_var; ims_get_dlg_expires_f get_dlg_expires; ims_get_dlg_f get_dlg; + ims_get_dlg_hash_f get_dlg_hash; ims_release_dlg_f release_dlg; } ims_dlg_api_t; diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index a9fd0aecebf..23b3160b14e 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -355,6 +355,7 @@ int load_ims_dlg(ims_dlg_api_t *dlgb) dlgb->lookup_terminate_dlg = w_api_lookup_terminate_dlg; dlgb->get_dlg_expires = api_get_dlg_expires; dlgb->get_dlg = dlg_get_msg_dialog; + dlgb->get_dlg_hash = dlg_get_hash_dialog; dlgb->release_dlg = dlg_release; return 1;

1 0

[kamailio/kamailio] http_client: Add parameter connect_timeout_ms / timeout_ms (PR #3609)
by Nicolas C 24 Oct '23

24 Oct '23

#### 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 The new parameter connect_timeout_ms (global) / timeout_ms (in httpcon) allows to specify a timeout in milliseconds on curl requests. If this parameter is defined (non zero), then the timeout in seconds is ignored. See https://curl.se/libcurl/c/CURLOPT_TIMEOUT_MS.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3609 -- Commit Summary -- * http_client: Add parameter connect_timeout_ms / timeout_ms -- File Changes -- M src/modules/http_client/curlcon.c (55) M src/modules/http_client/doc/http_client_admin.xml (29) M src/modules/http_client/functions.c (22) M src/modules/http_client/http_client.c (12) M src/modules/http_client/http_client.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3609.patch https://github.com/kamailio/kamailio/pull/3609.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3609 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3609(a)github.com>

3 12

git:master:111d9f70: app_ruby: Fix rpc documentation typo
by Victor Seva 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 111d9f70cf55eca08b78e21213f3452fa8622d21 URL: https://github.com/kamailio/kamailio/commit/111d9f70cf55eca08b78e21213f3452… Author: Konstantin Tumalevich <userad(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-24T14:21:27+02:00 app_ruby: Fix rpc documentation typo --- Modified: src/modules/app_ruby/app_ruby_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/111d9f70cf55eca08b78e21213f3452… Patch: https://github.com/kamailio/kamailio/commit/111d9f70cf55eca08b78e21213f3452… --- diff --git a/src/modules/app_ruby/app_ruby_mod.c b/src/modules/app_ruby/app_ruby_mod.c index cf0574e325a..4d08464a996 100644 --- a/src/modules/app_ruby/app_ruby_mod.c +++ b/src/modules/app_ruby/app_ruby_mod.c @@ -556,7 +556,7 @@ static sr_kemi_t sr_kemi_app_ruby_exports[] = { /* clang-format on */ -static const char *app_ruby_rpc_reload_doc[2] = {"Reload javascript file", 0}; +static const char *app_ruby_rpc_reload_doc[2] = {"Reload ruby file", 0}; static void app_ruby_rpc_reload(rpc_t *rpc, void *ctx)

1 0

[kamailio/kamailio] app_ruby: Fix rpc documentation typo (PR #3614)
by Konstantin Tumalevich 24 Oct '23

24 Oct '23

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Just a small change in app_ruby_rpc_reload_doc constant which mistakingly says javascript instead of ruby file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3614 -- Commit Summary -- * app_ruby: Fix rpc documentation typo -- File Changes -- M src/modules/app_ruby/app_ruby_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3614.patch https://github.com/kamailio/kamailio/pull/3614.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3614 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3614(a)github.com>

2 2

git:master:7731fc3a: tls: add log line-break, increase buffer size (related to GH 3612 and GH 3607)
by Henning Westerholt 24 Oct '23

24 Oct '23

Module: kamailio Branch: master Commit: 7731fc3a1d793ffc7204e5c042a8bfc38d97e691 URL: https://github.com/kamailio/kamailio/commit/7731fc3a1d793ffc7204e5c042a8bfc… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-10-24T11:13:36Z tls: add log line-break, increase buffer size (related to GH 3612 and GH 3607) --- Modified: src/modules/tls/tls_util.c --- Diff: https://github.com/kamailio/kamailio/commit/7731fc3a1d793ffc7204e5c042a8bfc… Patch: https://github.com/kamailio/kamailio/commit/7731fc3a1d793ffc7204e5c042a8bfc… --- diff --git a/src/modules/tls/tls_util.c b/src/modules/tls/tls_util.c index 0377397200c..40d2bf07d22 100644 --- a/src/modules/tls/tls_util.c +++ b/src/modules/tls/tls_util.c @@ -106,9 +106,9 @@ void collect_garbage(void) void tls_openssl_clear_errors(void) { int i; - char err[160]; + char err[256]; while((i = ERR_get_error())) { ERR_error_string(i, err); - INFO("clearing leftover error before SSL_* calls: %s", err); + INFO("clearing leftover error before SSL_* calls: %s\n", err); } }

1 0

git:master:0a98a0d5: corex: read fmatch as str rpc parameter for shm.rprint
by Daniel-Constantin Mierla 23 Oct '23

23 Oct '23

Module: kamailio Branch: master Commit: 0a98a0d504f79cc6aa0cac13e2b30a00e6181636 URL: https://github.com/kamailio/kamailio/commit/0a98a0d504f79cc6aa0cac13e2b30a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-23T10:42:54+02:00 corex: read fmatch as str rpc parameter for shm.rprint --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/0a98a0d504f79cc6aa0cac13e2b30a0… Patch: https://github.com/kamailio/kamailio/commit/0a98a0d504f79cc6aa0cac13e2b30a0… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index bdfcbe71213..ed37b22c757 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -93,7 +93,7 @@ static int corex_dns_cache_param_add(str *pval); static int corex_sip_reply_out(sr_event_param_t *evp); -/*clang-format off*/ +/* clang-format off */ static pv_export_t mod_pvs[] = { {{"cfg", (sizeof("cfg") - 1)}, PVT_OTHER, pv_get_cfg, 0, pv_parse_cfg_name, 0, 0, 0}, @@ -196,7 +196,7 @@ struct module_exports exports = { child_init, /* per-child init function */ mod_destroy /* module destroy function */ }; -/*clang-format on*/ +/* clang-format on */ /** * init module function diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 02fa08f8a36..81866ab2bc8 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -129,7 +129,7 @@ static void corex_rpc_shm_rprint(rpc_t *rpc, void *ctx) str fmatch = STR_NULL; FILE *fp = NULL; - if(rpc->scan(ctx, "ss", &fname, &fmatch) < 2) { + if(rpc->scan(ctx, "sS", &fname, &fmatch) < 2) { rpc->fault(ctx, 400, "Filename and filter not provided"); return; } @@ -139,18 +139,20 @@ static void corex_rpc_shm_rprint(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Cannot open file"); return; } + LM_DBG("matching file name with: %.*s\n", fmatch.len, fmatch.s); shm_status_filter(&fmatch, fp); fclose(fp); } -/*clang-format off*/ +/* clang-format off */ rpc_export_t corex_rpc_shm_cmds[] = { - {"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}, - {"shm.rprint", corex_rpc_shm_rprint, corex_rpc_shm_rprint_doc, 0}, - {0, 0, 0, 0}}; -/*clang-format on*/ + {"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}, + {"shm.rprint", corex_rpc_shm_rprint, corex_rpc_shm_rprint_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ /** * register RPC shm commands

1 0

git:master:1ebdc5c2: core: mem - print line after file name in qm_status_filter()
by Daniel-Constantin Mierla 23 Oct '23

23 Oct '23

Module: kamailio Branch: master Commit: 1ebdc5c2dd7640b778c0efac2baafe1894a75b77 URL: https://github.com/kamailio/kamailio/commit/1ebdc5c2dd7640b778c0efac2baafe1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-23T10:42:54+02:00 core: mem - print line after file name in qm_status_filter() --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/1ebdc5c2dd7640b778c0efac2baafe1… Patch: https://github.com/kamailio/kamailio/commit/1ebdc5c2dd7640b778c0efac2baafe1… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 5d05af88f9e..f440f452c1c 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1023,9 +1023,9 @@ void qm_status_filter(void *qmp, str *fmatch, FILE *fp) i, (f->u.is_free) ? 'A' : 'N', (char *)f + sizeof(struct qm_frag), f, f->size, FRAG_WAS_USED(f)); - fprintf(fp, " %s from %s: %s(%ld)\n", - (f->u.is_free) ? "freed" : "alloc'd", f->file, f->func, - f->line); + fprintf(fp, " %s from %s:%ld / %s()\n", + (f->u.is_free) ? "freed" : "alloc'd", f->file, f->line, + f->func); fprintf(fp, " start check=%lx, end check= %lx, %lx\n", f->check, FRAG_END(f)->check1, FRAG_END(f)->check2); if(f->check != ST_CHECK_PATTERN) { @@ -1061,9 +1061,9 @@ void qm_status_filter(void *qmp, str *fmatch, FILE *fp) != NULL))) { fprintf(fp, "unused fragm.: hash = %3d, fragment %p," - " address %p size %lu, created from %s: %s(%lu)\n", + " address %p size %lu, created from %s:%lu / %s()\n", h, f, (char *)f + sizeof(struct qm_frag), f->size, - f->file, f->func, f->line); + f->file, f->line, f->func); } #endif }

1 0

git:master:338f848c: github: CODEOWNERS to protect workflows [skip ci]
by Victor Seva 23 Oct '23

23 Oct '23

Module: kamailio Branch: master Commit: 338f848c2dedac837c09914dafd29e1d39c22842 URL: https://github.com/kamailio/kamailio/commit/338f848c2dedac837c09914dafd29e1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-23T10:41:41+02:00 github: CODEOWNERS to protect workflows [skip ci] > https://docs.github.com/en/repositories/managing-your-repositorys-settings-… > https://docs.github.com/en/actions/security-guides/security-hardening-for-g… --- Added: CODEOWNERS --- Diff: https://github.com/kamailio/kamailio/commit/338f848c2dedac837c09914dafd29e1… Patch: https://github.com/kamailio/kamailio/commit/338f848c2dedac837c09914dafd29e1… --- diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000000..7234200e5c6 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,2 @@ +# workflows changes need admin approval +.github/workflows/ @kamailio/admin

1 0

git:master:e5ecb666: topos: remove check of th_param_mask_callid() for api callid masking
by Daniel-Constantin Mierla 21 Oct '23

21 Oct '23

Module: kamailio Branch: master Commit: e5ecb666abd24433b0de030980f79e2521439524 URL: https://github.com/kamailio/kamailio/commit/e5ecb666abd24433b0de030980f79e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-21T09:07:39+02:00 topos: remove check of th_param_mask_callid() for api callid masking - functions are not for topoh internal usage, but for intermodule API - reported as part of GH #3606 --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/e5ecb666abd24433b0de030980f79e2… Patch: https://github.com/kamailio/kamailio/commit/e5ecb666abd24433b0de030980f79e2… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index f7ef0257f54..47637d3401a 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -508,12 +508,6 @@ int th_mask_callid_str(str *icallid, str *ocallid) { str out; - if(th_param_mask_callid == 0) - return 0; - - if(th_param_mask_callid == 0) - return 0; - if(icallid->s == NULL) { LM_ERR("invalid call-id value\n"); return -1; @@ -535,9 +529,6 @@ int th_unmask_callid_str(str *icallid, str *ocallid) { str out; - if(th_param_mask_callid == 0) - return 0; - if(icallid->s == NULL) { LM_ERR("invalid Call-Id value\n"); return -1;

1 0

git:master:37aa5b5f: core: set shm xsetfunc api field
by Daniel-Constantin Mierla 21 Oct '23

21 Oct '23

Module: kamailio Branch: master Commit: 37aa5b5f885d9c6a4915a3b3283d3cbbc04ecedd URL: https://github.com/kamailio/kamailio/commit/37aa5b5f885d9c6a4915a3b3283d3cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-21T09:07:39+02:00 core: set shm xsetfunc api field - fix wrong variable added in previous commit for pkg api --- Modified: src/core/mem/pkg.c Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/37aa5b5f885d9c6a4915a3b3283d3cb… Patch: https://github.com/kamailio/kamailio/commit/37aa5b5f885d9c6a4915a3b3283d3cb… --- diff --git a/src/core/mem/pkg.c b/src/core/mem/pkg.c index 6baf6ef6e64..803a68fca68 100644 --- a/src/core/mem/pkg.c +++ b/src/core/mem/pkg.c @@ -51,7 +51,7 @@ int pkg_init_api(sr_pkg_api_t *ap) _pkg_root.xrealloc = ap->xrealloc; _pkg_root.xreallocxf = ap->xreallocxf; _pkg_root.xstatus = ap->xstatus; - _shm_root.xstatus_filter = ap->xstatus_filter; + _pkg_root.xstatus_filter = ap->xstatus_filter; _pkg_root.xinfo = ap->xinfo; _pkg_root.xreport = ap->xreport; _pkg_root.xavailable = ap->xavailable; diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index 7a211856ac5..f321fff721c 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -252,6 +252,7 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.xfmodstats = ap->xfmodstats; _shm_root.xglock = ap->xglock; _shm_root.xgunlock = ap->xgunlock; + _shm_root.xsetfunc = ap->xsetfunc; return 0; }

1 0

git:master:e4f2cde5: core: mem - set xstatus_filter api field
by Daniel-Constantin Mierla 21 Oct '23

21 Oct '23

Module: kamailio Branch: master Commit: e4f2cde596387cc81ff0a26d89654d9d0e24ae10 URL: https://github.com/kamailio/kamailio/commit/e4f2cde596387cc81ff0a26d89654d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-21T09:07:39+02:00 core: mem - set xstatus_filter api field --- Modified: src/core/mem/pkg.c Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f2cde596387cc81ff0a26d89654d9… Patch: https://github.com/kamailio/kamailio/commit/e4f2cde596387cc81ff0a26d89654d9… --- diff --git a/src/core/mem/pkg.c b/src/core/mem/pkg.c index 3ad06ec4930..6baf6ef6e64 100644 --- a/src/core/mem/pkg.c +++ b/src/core/mem/pkg.c @@ -51,6 +51,7 @@ int pkg_init_api(sr_pkg_api_t *ap) _pkg_root.xrealloc = ap->xrealloc; _pkg_root.xreallocxf = ap->xreallocxf; _pkg_root.xstatus = ap->xstatus; + _shm_root.xstatus_filter = ap->xstatus_filter; _pkg_root.xinfo = ap->xinfo; _pkg_root.xreport = ap->xreport; _pkg_root.xavailable = ap->xavailable; diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index 75f2dde2790..7a211856ac5 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -242,6 +242,7 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.xreallocxf = ap->xreallocxf; _shm_root.xresize = ap->xresize; _shm_root.xstatus = ap->xstatus; + _shm_root.xstatus_filter = ap->xstatus_filter; _shm_root.xinfo = ap->xinfo; _shm_root.xreport = ap->xreport; _shm_root.xavailable = ap->xavailable;

1 0

[kamailio/kamailio] ims_dialog: Support for db storage (Issue #3602)
by mtryfoss 20 Oct '23

20 Oct '23

### Description I've been looking at the ims_dialog module and notice that the documentation states that db storage is not yet supported. According to the source code that only partial true. Not sure if it's residues from the other dialog module, or some unfinished work. After some initial testing and small adjustments, the main issue seems to that for my use the "Dialog-iD"/did is not filled. I can not see this being set for calls that are not "concurrently confirmed". The field in the database for this id is NON NULL, so the insert fails. It's also used as WHERE-criteria when restarting and fetching the dialog_out entries, belonging to each dialog_in, so it needs to be set for this to work. This is not really a feature request. It's more about a confirmation that my assumptions are correct, before trying to do the proposed changes. ### Expected behavior I do assume that this "did"-field should be or be linked to the same did added as Record-Route parameter, identifying each dialog. #### Actual observed behavior kamcmd dlg2.list displays NULL for Dialog-ID. ``` kamcmd dlg2.list { Size: 4096 Dialogs: { Dialog: { Entry: 1096 Id: 8069 RURI: sip:+4791500025@10.111.64.16;user=phone From: sip:+4746180445@10.111.64.16;user=phone Call-ID: 34c5d9f15ff42a0564f809cb35e19c75@10.111.64.16:5060 Caller Contact: sip:+4746180445@10.111.64.16:5060 Caller Route Set: <null string> Dialog-ID: <null string> From Tag: as4df55540 State: Confirmed Ref: 2 dlg_outs: { dlg_out: { Entry: 2680 Id: 0 } } } } } ``` ### Possible Solutions Always set this did field when a new dialog is created. I've also been studying the DB schema. All operations for the dialog_in table are done using hash_entry and hash_id as keys. Why are they not used as primary key instead, which would be much more efficient? Also, having an integer with auto_increment as primary key would make this stop when the integer hits max value, if it's not reset regularly. I can not see this field used anywhere in the code either, so it could probably just be removed. The same applies to dialog_out, but this one should have an index on the did field used for looking up the corresponding entries too. Altering this could have negative impact if there are old entries from a previous running process laying around. A duplicate key on an insert should be handled, and updated instead. The current behaviour would mean that Kamailio instead updates two records with the same values. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` master ``` * **Operating System**:  ``` CentOS 7.9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3602 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3602(a)github.com>

2 2

git:master:664a788e: modules: readme files regenerated - ims_dialog ... [skip ci]
by Kamailio Dev 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 664a788e9ed40c72f34310e65a5b6b85f80eead3 URL: https://github.com/kamailio/kamailio/commit/664a788e9ed40c72f34310e65a5b6b8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-20T20:16:19+02:00 modules: readme files regenerated - ims_dialog ... [skip ci] --- Modified: src/modules/ims_dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/664a788e9ed40c72f34310e65a5b6b8… Patch: https://github.com/kamailio/kamailio/commit/664a788e9ed40c72f34310e65a5b6b8…

1 0

[kamailio/kamailio] ims_dialog: Add support for database backend (PR #3603)
by mtryfoss 20 Oct '23

20 Oct '23

#### 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 - [x] Related to issue #3602 #### Description Added missing code for database backend to work. Tested basic scenarios locally for all db modes. DB schema could be tweaked according to my thoughts in issue #3602, but that also applies to several other modules which are done in the same matter. Because of that, I didn't consider such a change now. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3603 -- Commit Summary -- * ims_dialog: Add support for database backend -- File Changes -- M src/modules/ims_dialog/dlg_db_handler.c (9) M src/modules/ims_dialog/dlg_handlers.c (52) M src/modules/ims_dialog/dlg_hash.c (5) M src/modules/ims_dialog/doc/ims_dialog_admin.xml (93) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3603.patch https://github.com/kamailio/kamailio/pull/3603.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3603 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3603(a)github.com>

2 6

git:master:cd54fdde: ims_dialog: Add support for database backend
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: cd54fdde0572c62dc26fb8a8d11ddf60073a67a9 URL: https://github.com/kamailio/kamailio/commit/cd54fdde0572c62dc26fb8a8d11ddf6… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T20:11:09+02:00 ims_dialog: Add support for database backend --- Modified: src/modules/ims_dialog/dlg_db_handler.c Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_hash.c Modified: src/modules/ims_dialog/doc/ims_dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cd54fdde0572c62dc26fb8a8d11ddf6… Patch: https://github.com/kamailio/kamailio/commit/cd54fdde0572c62dc26fb8a8d11ddf6…

1 0

[kamailio/kamailio] Segfault tls.so on master branch when TLS_MALLOC_DBG is defined (Issue #3595)
by space88man 20 Oct '23

20 Oct '23

### Description Build kamailio master branch and define `TLS_MALLOC_DBG` in the `tls` module. There is an immediate segfault on startup. ### Troubleshooting Build kamailio master branch without `TLS_MALLOC_DBG` in the `tls` module. kamailio can start normally. #### Reproduction * use a distro with OpenSSL 3, e.g., AlmaLinux 9, Debian 12 * checkout kamailio master branch * in `src/modules/tls/tls_init.c` define `TLS_MALLOC_DBG` * build and run kamailio #### Debugging Data ``` Program terminated with signal SIGSEGV, Segmentation fault. #0 0x0000000000000000 in ?? () (gdb) bt #0 0x0000000000000000 in ?? () #1 0x00007efcca8f59ac in ser_malloc (size=56, file=0x7efc8a3399e3 "crypto/threads_pthread.c", line=50) at tls_init.c:269 #2 0x00007efc8a1b0b6e in CRYPTO_zalloc (num=56, file=<optimized out>, line=<optimized out>) at crypto/mem.c:197 #3 0x00007efc8a1bd7b4 in CRYPTO_THREAD_lock_new () at crypto/threads_pthread.c:50 #4 0x00007efc8a1b38cd in ossl_init_base () at crypto/init.c:64 #5 ossl_init_base_ossl_ () at crypto/init.c:55 #6 0x00007efcca6a4a48 in __pthread_once_slow (once_control=0x7efc8a42db84 <base>, init_routine=0x7efc8a1b38c0 <ossl_init_base_ossl_>) at pthread_once.c:117 #7 0x00007efc8a1bd92d in CRYPTO_THREAD_run_once (once=<optimized out>, init=<optimized out>) at crypto/threads_pthread.c:156 #8 0x00007efc8a1b823a in OPENSSL_init_crypto (settings=0x0, opts=131148) at crypto/init.c:507 #9 OPENSSL_init_crypto (opts=opts@entry=131148, settings=0x0) at crypto/init.c:462 #10 0x00007efcca84edf7 in OPENSSL_init_ssl (settings=<optimized out>, opts=131148) at ssl/ssl_init.c:115 #11 OPENSSL_init_ssl (opts=<optimized out>, settings=<optimized out>) at ssl/ssl_init.c:91 #12 0x00007efcca8f88ec in tls_h_mod_pre_init_f () at tls_init.c:767 #13 0x00000000006e5524 in pre_init_tls () at core/tls_hooks.c:68 #14 0x00000000004389d4 in main (argc=11, argv=0x7ffcb25aae08) at main.c:3141 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.0-dev1 (x86_64/linux) cd6d03 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_SEND_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: cd6d03 compiled on 08:53:04 Oct 7 2023 with gcc 11.3.1 ``` * **Operating System**: ``` NAME="AlmaLinux" VERSION="9.2 (Turquoise Kodkod)" ID="almalinux" ID_LIKE="rhel centos fedora" VERSION_ID="9.2" PLATFORM_ID="platform:el9" PRETTY_NAME="AlmaLinux 9.2 (Turquoise Kodkod)" ANSI_COLOR="0;34" LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:almalinux:almalinux:9::baseos" HOME_URL="https://almalinux.org/" DOCUMENTATION_URL="https://wiki.almalinux.org/" BUG_REPORT_URL="https://bugs.almalinux.org/" ALMALINUX_MANTISBT_PROJECT="AlmaLinux-9" ALMALINUX_MANTISBT_PROJECT_VERSION="9.2" REDHAT_SUPPORT_PRODUCT="AlmaLinux" REDHAT_SUPPORT_PRODUCT_VERSION="9.2" 5.14.0-284.30.1.el9_2.x86_64 #1 SMP PREEMPT_DYNAMIC Tue Sep 12 09:28:32 EDT 2023 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3595 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3595(a)github.com>

2 3

git:master:54868f83: corex: rpc corex.list_sockets prints advertise as full socket string
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 54868f83f09691a5283a0d7eb57e230e7b8a2514 URL: https://github.com/kamailio/kamailio/commit/54868f83f09691a5283a0d7eb57e230… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T16:48:33+02:00 corex: rpc corex.list_sockets prints advertise as full socket string - new field to print socket string field also for bind address --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/54868f83f09691a5283a0d7eb57e230… Patch: https://github.com/kamailio/kamailio/commit/54868f83f09691a5283a0d7eb57e230… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 8ec479528cb..fa553fbf911 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -86,12 +86,14 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) } } - if(rpc->struct_add(th, "ssssss", "port", si->port_no_str.s, "mcast", - si->flags & SI_IS_MCAST ? "yes" : "no", "mhomed", - si->flags & SI_IS_MHOMED ? "yes" : "no", "virtual", - si->flags & SI_IS_VIRTUAL ? "yes" : "no", "sockname", - si->sockname.s ? si->sockname.s : "-", "advertise", - si->useinfo.name.s ? si->useinfo.name.s : "-") + if(rpc->struct_add(th, "sssssss", "port", si->port_no_str.s, + "sockstr", si->sock_str.s ? si->sock_str.s : "-", + "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no", + "sockname", si->sockname.s ? si->sockname.s : "-", + "advertise", + si->useinfo.sock_str.s ? si->useinfo.sock_str.s : "-") < 0) { rpc->fault(ctx, 500, "Internal error attrs structure"); return; @@ -251,19 +253,19 @@ static void corex_rpc_debug(rpc_t *rpc, void *ctx) } } -/*clang-format off*/ +/* clang-format off */ rpc_export_t corex_rpc_cmds[] = { {"corex.list_sockets", corex_rpc_list_sockets, - corex_rpc_list_sockets_doc, RET_ARRAY}, + corex_rpc_list_sockets_doc, RET_ARRAY}, {"corex.list_aliases", corex_rpc_list_aliases, - corex_rpc_list_aliases_doc, RET_ARRAY}, + corex_rpc_list_aliases_doc, RET_ARRAY}, {"corex.shm_status", corex_rpc_shm_status, corex_rpc_shm_status_doc, 0}, {"corex.shm_summary", corex_rpc_shm_summary, corex_rpc_shm_summary_doc, 0}, {"corex.pkg_summary", corex_rpc_pkg_summary, corex_rpc_pkg_summary_doc, 0}, {"corex.debug", corex_rpc_debug, corex_rpc_debug_doc, 0}, {0, 0, 0, 0} }; -/*clang-format on*/ +/* clang-format on */ /** * register RPC commands

1 0

git:master:54d8cce2: core: use advertised proto to build advertised sock string
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 54d8cce28a5c4cbd944d39b1523571fbb5776baa URL: https://github.com/kamailio/kamailio/commit/54d8cce28a5c4cbd944d39b1523571f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T16:39:08+02:00 core: use advertised proto to build advertised sock string --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/54d8cce28a5c4cbd944d39b1523571f… Patch: https://github.com/kamailio/kamailio/commit/54d8cce28a5c4cbd944d39b1523571f… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index ae2ee6f20a4..230eab02ff5 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -456,7 +456,11 @@ int socketinfo2str(char *s, int *len, struct socket_info *si, int mode) str proto; int l; - proto.s = get_valid_proto_name(si->proto); + if(si->useinfo.proto != PROTO_NONE) { + proto.s = get_valid_proto_name(si->useinfo.proto); + } else { + proto.s = get_valid_proto_name(si->proto); + } proto.len = strlen(proto.s); if(mode == 1)

1 0

git:master:b6148ef1: corex: rpc corex.list_sockets use now lowercase for field names
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: b6148ef161a8652b398080ec136e207fb6ee3b1a URL: https://github.com/kamailio/kamailio/commit/b6148ef161a8652b398080ec136e207… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T15:53:39+02:00 corex: rpc corex.list_sockets use now lowercase for field names --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b6148ef161a8652b398080ec136e207… Patch: https://github.com/kamailio/kamailio/commit/b6148ef161a8652b398080ec136e207… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 8a57a6a7a38..8ec479528cb 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -61,15 +61,15 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) return; } - if(rpc->struct_add(th, "sss{", "AF", get_af_name(proto), "PROTO", - get_valid_proto_name(proto), "NAME", si->name.s, - "ADDRLIST", &ih) + if(rpc->struct_add(th, "sss{", "af", get_af_name(proto), "proto", + get_valid_proto_name(proto), "name", si->name.s, + "addrlist", &ih) < 0) { rpc->fault(ctx, 500, "Internal error address list structure"); return; } - if(rpc->struct_add(ih, "s", "ADDR", si->address_str.s) < 0) { + if(rpc->struct_add(ih, "s", "addr", si->address_str.s) < 0) { rpc->fault(ctx, 500, "Internal error address structure"); return; } @@ -77,7 +77,7 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) if(si->addr_info_lst) { for(ai = si->addr_info_lst; ai; ai = ai->next) { - if(rpc->struct_add(ih, "s", "ADDR", ai->address_str.s) + if(rpc->struct_add(ih, "s", "addr", ai->address_str.s) < 0) { rpc->fault(ctx, 500, "Internal error extra address structure"); @@ -86,11 +86,11 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) } } - if(rpc->struct_add(th, "ssssss", "PORT", si->port_no_str.s, "MCAST", - si->flags & SI_IS_MCAST ? "yes" : "no", "MHOMED", - si->flags & SI_IS_MHOMED ? "yes" : "no", "VIRTUAL", - si->flags & SI_IS_VIRTUAL ? "yes" : "no", "SOCKNAME", - si->sockname.s ? si->sockname.s : "-", "ADVERTISE", + if(rpc->struct_add(th, "ssssss", "port", si->port_no_str.s, "mcast", + si->flags & SI_IS_MCAST ? "yes" : "no", "mhomed", + si->flags & SI_IS_MHOMED ? "yes" : "no", "virtual", + si->flags & SI_IS_VIRTUAL ? "yes" : "no", "sockname", + si->sockname.s ? si->sockname.s : "-", "advertise", si->useinfo.name.s ? si->useinfo.name.s : "-") < 0) { rpc->fault(ctx, 500, "Internal error attrs structure");

1 0

git:master:e5c145f6: corex: rpc corex.list_aliases use now lowercase for field names
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: e5c145f69508658a692be9be219f466ee2aca5d9 URL: https://github.com/kamailio/kamailio/commit/e5c145f69508658a692be9be219f466… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T14:55:53+02:00 corex: rpc corex.list_aliases use now lowercase for field names - better coherence with the other rpc commands --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e5c145f69508658a692be9be219f466… Patch: https://github.com/kamailio/kamailio/commit/e5c145f69508658a692be9be219f466… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index b6e959c88d3..8a57a6a7a38 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -121,8 +121,8 @@ static void corex_rpc_list_aliases(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error alias structure"); return; } - if(rpc->struct_add(th, "sSd", "PROTO", get_valid_proto_name(a->proto), - "ADDR", &a->alias, "PORT", a->port) + if(rpc->struct_add(th, "sSd", "proto", get_valid_proto_name(a->proto), + "addr", &a->alias, "port", a->port) < 0) { rpc->fault(ctx, 500, "Internal error alias attributes"); return;

1 0

git:master:c2e8baad: core: allow proto in advertise for a couple of listen variants
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: c2e8baad3b39b2e5871c0cdc796b3be48462c2a9 URL: https://github.com/kamailio/kamailio/commit/c2e8baad3b39b2e5871c0cdc796b3be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T14:51:17+02:00 core: allow proto in advertise for a couple of listen variants --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/c2e8baad3b39b2e5871c0cdc796b3be… Patch: https://github.com/kamailio/kamailio/commit/c2e8baad3b39b2e5871c0cdc796b3be… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index c8ca68f4cca..98effbd9b75 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1665,6 +1665,19 @@ assign_stm: } free_socket_id_lst($3); } + | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER { + for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { + if (add_listen_advertise_iface( lst_tmp->addr_lst->name, + lst_tmp->addr_lst->next, + lst_tmp->port, lst_tmp->proto, + $5, $7, $9, + lst_tmp->flags)!=0) { + LM_CRIT("cfg. parser: failed to add listen address\n"); + break; + } + } + free_socket_id_lst($3); + } | LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER VIRTUAL { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { lst_tmp->flags |= SI_IS_VIRTUAL; @@ -1692,6 +1705,19 @@ assign_stm: } free_socket_id_lst($3); } + | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER STRNAME STRING { + for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { + if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name, + lst_tmp->addr_lst->next, + lst_tmp->port, lst_tmp->proto, + $5, $7, $9, $11, + lst_tmp->flags)!=0) { + LM_CRIT("cfg. parser: failed to add listen address\n"); + break; + } + } + free_socket_id_lst($3); + } | LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER STRNAME STRING VIRTUAL { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { lst_tmp->flags |= SI_IS_VIRTUAL; @@ -1706,6 +1732,20 @@ assign_stm: } free_socket_id_lst($3); } + | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER STRNAME STRING VIRTUAL { + for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { + lst_tmp->flags |= SI_IS_VIRTUAL; + if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name, + lst_tmp->addr_lst->next, + lst_tmp->port, lst_tmp->proto, + $5, $7, $9, $11, + lst_tmp->flags)!=0) { + LM_CRIT("cfg. parser: failed to add listen address\n"); + break; + } + } + free_socket_id_lst($3); + } | LISTEN EQUAL id_lst ADVERTISE listen_id { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { if (add_listen_advertise_iface( lst_tmp->addr_lst->name,

1 0

git:master:fe8eafd3: tls: include file to fix warning about tls_openssl_clear_errors()
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: fe8eafd31327c14e7b081cd8f4a6532953e0a1c6 URL: https://github.com/kamailio/kamailio/commit/fe8eafd31327c14e7b081cd8f4a6532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T10:34:21+02:00 tls: include file to fix warning about tls_openssl_clear_errors() --- Modified: src/modules/tls/tls_ct_wrq.c --- Diff: https://github.com/kamailio/kamailio/commit/fe8eafd31327c14e7b081cd8f4a6532… Patch: https://github.com/kamailio/kamailio/commit/fe8eafd31327c14e7b081cd8f4a6532… --- diff --git a/src/modules/tls/tls_ct_wrq.c b/src/modules/tls/tls_ct_wrq.c index 53346f0eee6..f407e33f29f 100644 --- a/src/modules/tls/tls_ct_wrq.c +++ b/src/modules/tls/tls_ct_wrq.c @@ -28,6 +28,7 @@ #include "tls_ct_wrq.h" #include "tls_cfg.h" #include "tls_server.h" +#include "tls_util.h" #include "../../core/atomic_ops.h" #include "../../core/mem/shm_mem.h" #include <openssl/err.h>

1 0

git:master:91eca5aa: core: print advertised proto on startup
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 91eca5aaa20f7b22488b14fdf89127daaeea47d3 URL: https://github.com/kamailio/kamailio/commit/91eca5aaa20f7b22488b14fdf89127d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T10:30:58+02:00 core: print advertised proto on startup --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/91eca5aaa20f7b22488b14fdf89127d… Patch: https://github.com/kamailio/kamailio/commit/91eca5aaa20f7b22488b14fdf89127d… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c67a09b2a6b..ae2ee6f20a4 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -2424,8 +2424,9 @@ void print_all_socket_lists() printf(" name %s", si->sockname.s); } if(si->useinfo.name.s) { - printf(" advertise %s:%d", si->useinfo.name.s, - si->useinfo.port_no); + printf(" advertise %s:%s:%d", + get_valid_proto_name(si->useinfo.proto), + si->useinfo.name.s, si->useinfo.port_no); } printf("\n"); }

1 0

git:master:91c31a8e: modules: readme files regenerated - rtpproxy ... [skip ci]
by Kamailio Dev 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 91c31a8e406b84ef026def7fcec0d429356e424d URL: https://github.com/kamailio/kamailio/commit/91c31a8e406b84ef026def7fcec0d42… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-20T10:02:17+02:00 modules: readme files regenerated - rtpproxy ... [skip ci] --- Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/91c31a8e406b84ef026def7fcec0d42… Patch: https://github.com/kamailio/kamailio/commit/91c31a8e406b84ef026def7fcec0d42…

1 0

[kamailio/kamailio] Make timeout mechanism useful by adding support for supplying timeout tag (PR #3598)
by Maksym Sobolyev 20 Oct '23

20 Oct '23

#### 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  The timeout_socket feature has been added in 2010, but from the look of it it has been designed for the "ngcp-mediaproxy-ng" and never worked with the real RTPProxy. As such both the documentation and the code needs to be adjusted to make it actually useful with the RTPProxy. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3598 -- Commit Summary -- * Make timeout notification useable by allowing a notify tag to * Update rtpproxy module documentation: -- File Changes -- M src/modules/rtpproxy/doc/rtpproxy.xml (2) M src/modules/rtpproxy/doc/rtpproxy_admin.xml (38) M src/modules/rtpproxy/rtpproxy.c (53) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3598.patch https://github.com/kamailio/kamailio/pull/3598.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3598 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3598(a)github.com>

3 7

git:master:190ef9a5: rtpproxy: Update rtpproxy module documentation.
by Victor Seva 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 190ef9a54df33b4d053a4225e9d6257e0a045008 URL: https://github.com/kamailio/kamailio/commit/190ef9a54df33b4d053a4225e9d6257… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-20T09:57:47+02:00 rtpproxy: Update rtpproxy module documentation. o Correct description of the timeout_socket; o Document timeout_tag_pv; o Update (c); o Remove reference to the ngcp-mediaproxy-ng which does not exist anymore. --- Modified: src/modules/rtpproxy/doc/rtpproxy.xml Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/190ef9a54df33b4d053a4225e9d6257… Patch: https://github.com/kamailio/kamailio/commit/190ef9a54df33b4d053a4225e9d6257… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy.xml b/src/modules/rtpproxy/doc/rtpproxy.xml index 94886eaf404..ee1fdad9fc8 100644 --- a/src/modules/rtpproxy/doc/rtpproxy.xml +++ b/src/modules/rtpproxy/doc/rtpproxy.xml @@ -67,7 +67,7 @@ </editor> </authorgroup> <copyright> - <year>2003-2008</year> + <year>2003-2023</year> <holder>Sippy Software, Inc.</holder> </copyright> <copyright> diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 79a85edad70..b04baa5e3dc 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -18,11 +18,7 @@ <title>Overview</title> <para> This is a module that enables media streams to be proxied - via an rtpproxy. Rtpproxies know to work with this module - are Sippy RTPproxy <ulink url="http://www.rtpproxy.org"></ulink> - and ngcp-rtpproxy-ng - <ulink url="http://deb.sipwise.com/spce/2.6/pool/main/n/ngcp-mediaproxy-ng"></ulink>. - Some features of the rtpproxy module apply only to one of the two rtpproxies. + via the Sippy RTPproxy <ulink url="http://www.rtpproxy.org"></ulink>. </para> </section> @@ -235,7 +231,37 @@ modparam("rtpproxy", "nortpproxy_str", "a=sdpmangled:yes\r\n") <title>Set <varname>timeout_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("rtpproxy", "timeout_socket", "xmlrpc:http://127.0.0.1:8000/RPC2") +modparam("rtpproxy", "timeout_socket", "tcp:127.0.0.1:8000") +... +</programlisting> + </example> + </section> + <section id="rtpproxy.p.timeout_tag_pv"> + <title><varname>timeout_tag_pv</varname> (string)</title> + <para> + The parameter devines the AVP of the string to be provided to the + RTP-Proxy. + </para> + <para> + The content of the AVP must be a valid URL-encoded string with + no spaces. + It will be decoded and send by the RTP proxy to the timeout socket if the + media timeout has happened. + </para> + <para> + This parameter is required in order for the timeout notification + mechanism to work properly. + </para> + <para> + <emphasis> + Default value is <quote></quote> (nothing). + </emphasis> + </para> + <example> + <title>Set <varname>timeout_tag_pv</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpproxy", "timeout_tag_pv", "$avp(rtpp_ntag)") ... </programlisting> </example>

1 0

git:master:8ac57094: rtpproxy: Make timeout notification feature useable.
by Victor Seva 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 8ac570943f1dfd47f9d02686cc399d3cd1cdcd92 URL: https://github.com/kamailio/kamailio/commit/8ac570943f1dfd47f9d02686cc399d3… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-20T09:56:56+02:00 rtpproxy: Make timeout notification feature useable. Add an new "timeout_tag_pv" option to set notify tag along with the notification socket path. Both are required by the RTPProxy. Reported by: James Lipski <jameslipski(a)protonmail.com> --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/8ac570943f1dfd47f9d02686cc399d3… Patch: https://github.com/kamailio/kamailio/commit/8ac570943f1dfd47f9d02686cc399d3… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index bc252982e1c..74da691e705 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2003-2008 Sippy Software, Inc., http://www.sippysoft.com + * Copyright (C) 2003-2023 Sippy Software, Inc., http://www.sippysoft.com * * This file is part of Kamailio, a free SIP server. * @@ -187,6 +187,8 @@ static struct tm_binds tmb; unsigned int *natping_state = 0; static str timeout_socket_str = {0, 0}; +static str timeout_tag_pv_str = {0, 0}; +static pv_elem_t *timeout_tag_pv = NULL; static pv_elem_t *extra_id_pv = NULL; static cmd_export_t cmds[] = { @@ -243,6 +245,7 @@ static param_export_t params[] = { {"rtpproxy_retr", INT_PARAM, &rtpproxy_retr}, {"rtpproxy_tout", INT_PARAM, &rtpproxy_tout}, {"timeout_socket", PARAM_STR, &timeout_socket_str}, + {"timeout_tag_pv", PARAM_STR, &timeout_tag_pv_str}, {"ice_candidate_priority_avp", PARAM_STRING, &ice_candidate_priority_avp_param}, {"extra_id_pv", PARAM_STR, &extra_id_pv_param}, @@ -735,6 +738,20 @@ static int mod_init(void) } else { extra_id_pv = NULL; } + if(timeout_socket_str.s != NULL && timeout_tag_pv_str.s == NULL) { + LM_ERR("The timeout_tag_pv has to be set along with timeout_socket\n"); + return -1; + } + if(timeout_tag_pv_str.s != NULL) { + if(timeout_tag_pv_str.len == 0) { + LM_ERR("Empty timeout_tag_pv is not allowed\n"); + return -1; + } + if(pv_parse_format(&timeout_tag_pv_str, &timeout_tag_pv) < 0) { + LM_ERR("malformed PV string: %s\n", timeout_tag_pv_str.s); + return -1; + } + } if(rtpp_strings) pkg_free(rtpp_strings); @@ -1488,6 +1505,21 @@ static int get_extra_id(struct sip_msg *msg, str *id_str) } +static int get_timeout_tag(struct sip_msg *msg, str *ntag_str) +{ + if(msg == NULL || timeout_tag_pv == NULL || ntag_str == NULL) { + LM_ERR("bad parameters\n"); + return 0; + } + if(pv_printf_s(msg, timeout_tag_pv, ntag_str) < 0) { + LM_ERR("cannot print the notify tag\n"); + return 0; + } + + return 1; +} + + static int unforce_rtp_proxy1_f(struct sip_msg *msg, char *str1, char *str2) { str flags; @@ -1969,6 +2001,8 @@ static int force_rtp_proxy( {NULL, 0}, /* medianum */ {" ", 1}, /* separator */ {NULL, 0}, /* Timeout-Socket */ + {" ", 1}, /* separator */ + {NULL, 0}, /* Timeout-Tag */ }; int iovec_param_count; int autobridge_ipv4v6; @@ -2410,14 +2444,21 @@ static int force_rtp_proxy( } if(to_tag.len > 0) { iovec_param_count = 20; - if(opts.s.s[0] == 'U' && timeout_socket_str.len > 0) { - iovec_param_count = 22; - STR2IOVEC(timeout_socket_str, v[21]); - } } else { iovec_param_count = 16; } - + if(opts.s.s[0] == 'U' && timeout_socket_str.len > 0) { + str ntag = {0, 0}; + if(get_timeout_tag(msg, &ntag) == 0 || ntag.s == NULL + || ntag.len == 0) { + LM_ERR("can't get timeout notification tag\n"); + FORCE_RTP_PROXY_RET(-1); + } + STR2IOVEC(timeout_socket_str, v[iovec_param_count + 1]); + iovec_param_count += 2; + STR2IOVEC(ntag, v[iovec_param_count + 1]); + iovec_param_count += 2; + } cp = send_rtpp_command(node, v, iovec_param_count); } while(cp == NULL); LM_DBG("proxy reply: %s\n", cp);

1 0

Kamailio module http_client - setting timeout in ms - new parameter ?
by Chaigneau, Nicolas 20 Oct '23

20 Oct '23

Hello, I would like to set a timeout in milliseconds when using Kamailio module http_client. From what I read, the module is accepting a parameter "connection_timeout": https://www.kamailio.org/docs/modules/devel/modules/http_client.html#http_c… This is used to set curl option "CURLOPT_TIMEOUT". I would like to set instead curl option "CURLOPT_TIMEOUT_MS". I think changing the parameter "connection_timeout" from seconds to milliseconds is not a good idea, since it would break existing configurations. What about adding a new parameter "connection_timeout_ms" to the module ? Curl documentation says that: "If both CURLOPT_TIMEOUT and CURLOPT_TIMEOUT_MS are set, the value set last is used." The CURLOPT_TIMEOUT_MS should only be set if the parameter is non-zero, so that the current behaviour is kept if the new parameter is not configured. What do you think ? Regards, Nicolas. This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message.

3 5

[kamailio/kamailio] presence: active_watcher cleanup timer (PR #3605)
by Victor Seva 19 Oct '23

19 Oct '23

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3074 #### Description Since some customers are complaining on leftovers at active_watchers. Let's create a cleanup timer for that table too. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3605 -- Commit Summary -- * presence: active_watcher cleanup timer -- File Changes -- M src/modules/presence/notify.c (33) M src/modules/presence/notify.h (1) M src/modules/presence/presence.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3605.patch https://github.com/kamailio/kamailio/pull/3605.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3605 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3605(a)github.com>

2 2

git:master:f27eda6f: presence: active_watcher cleanup timer
by Victor Seva 19 Oct '23

19 Oct '23

Module: kamailio Branch: master Commit: f27eda6fe3d99d1352d4df86d79e4646b0a4c17a URL: https://github.com/kamailio/kamailio/commit/f27eda6fe3d99d1352d4df86d79e464… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-19T14:33:45+02:00 presence: active_watcher cleanup timer related #3074 --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/f27eda6fe3d99d1352d4df86d79e464… Patch: https://github.com/kamailio/kamailio/commit/f27eda6fe3d99d1352d4df86d79e464… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 4edbef12dbe..a3bba03e298 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -3197,3 +3197,36 @@ void pres_timer_send_notify(unsigned int ticks, void *param) return; } } + +void ps_active_watchers_db_timer_clean(unsigned int ticks, void *param) +{ + db_key_t db_keys[2]; + db_val_t db_vals[2]; + db_op_t db_ops[2]; + + if(pa_db == NULL) { + return; + } + + LM_DBG("cleaning expired active_watchers\n"); + + db_keys[0] = &str_expires_col; + db_ops[0] = OP_LT; + db_vals[0].type = DB1_INT; + db_vals[0].nul = 0; + db_vals[0].val.int_val = (int)time(NULL); + + db_keys[1] = &str_expires_col; + db_ops[1] = OP_GT; + db_vals[1].type = DB1_INT; + db_vals[1].nul = 0; + db_vals[1].val.int_val = 0; + + if(pa_dbf.use_table(pa_db, &active_watchers_table) < 0) { + LM_ERR("unsuccessful use table sql operation\n"); + return; + } + + if(pa_dbf.delete(pa_db, db_keys, db_ops, db_vals, 2) < 0) + LM_ERR("cleaning expired active_watchers\n"); +} diff --git a/src/modules/presence/notify.h b/src/modules/presence/notify.h index 4bac84b481a..3d875f3d452 100644 --- a/src/modules/presence/notify.h +++ b/src/modules/presence/notify.h @@ -129,4 +129,5 @@ char *get_status_str(int flag); str *get_p_notify_body(str pres_uri, pres_ev_t *event, str *etag, str *contact); void free_notify_body(str *body, pres_ev_t *ev); void pres_timer_send_notify(unsigned int ticks, void *param); +void ps_active_watchers_db_timer_clean(unsigned int ticks, void *param); #endif diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index a02c49baf01..93b89fdafa3 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -453,12 +453,16 @@ static int mod_init(void) if(pres_timer_mode == 0) { register_timer(ps_presentity_db_timer_clean, 0, pres_clean_period); register_timer(ps_watchers_db_timer_clean, 0, pres_clean_period); + register_timer( + ps_active_watchers_db_timer_clean, 0, pres_clean_period); if(publ_cache_mode == PS_PCACHE_RECORD) { register_timer(ps_ptable_timer_clean, 0, pres_clean_period); } } else { sr_wtimer_add(ps_presentity_db_timer_clean, 0, pres_clean_period); sr_wtimer_add(ps_watchers_db_timer_clean, 0, pres_clean_period); + sr_wtimer_add( + ps_active_watchers_db_timer_clean, 0, pres_clean_period); if(publ_cache_mode == PS_PCACHE_RECORD) { sr_wtimer_add(ps_ptable_timer_clean, 0, pres_clean_period); } @@ -1842,6 +1846,7 @@ void rpc_presence_cleanup(rpc_t *rpc, void *c) (void)ps_watchers_db_timer_clean(0, 0); (void)ps_presentity_db_timer_clean(0, 0); + (void)ps_active_watchers_db_timer_clean(0, 0); (void)ps_ptable_timer_clean(0, 0); (void)timer_db_update(0, 0);

1 0

[kamailio/kamailio] Make tcp_check_timer default to depend on tcp_msg_data_timeout and tcp_msg_read_timeout values (PR #3608)
by juha-h 19 Oct '23

19 Oct '23

If `tcp_check_timer` is not set, use default value that is half of `tcp_msg_data_timeout` or `tcp_msg_read_timeout` value depending on which one is smaller and not zero. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3608 -- Commit Summary -- * Make tcp_check_timer default to depend on tcp_msg_data_timeout and -- File Changes -- M src/main.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3608.patch https://github.com/kamailio/kamailio/pull/3608.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3608 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3608(a)github.com>

3 6

[kamailio/kamailio] tls: Add and apply tls_openssl_clear_errors function. (PR #3607)
by Xenofon Karamanos 19 Oct '23

19 Oct '23

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3607 -- Commit Summary -- * Add and apply tls_openssl_clear_errors function. -- File Changes -- M src/modules/tls/tls_ct_wrq.c (3) M src/modules/tls/tls_server.c (11) M src/modules/tls/tls_util.c (15) M src/modules/tls/tls_util.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3607.patch https://github.com/kamailio/kamailio/pull/3607.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3607 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3607(a)github.com>

4 6

git:master:110ebbaf: tls: Add and apply tls_openssl_clear_errors function
by Henning Westerholt 19 Oct '23

19 Oct '23

Module: kamailio Branch: master Commit: 110ebbafadcc225f4e88749287f06ae29a6cfa2e URL: https://github.com/kamailio/kamailio/commit/110ebbafadcc225f4e88749287f06ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-10-19T12:18:38Z tls: Add and apply tls_openssl_clear_errors function --- Modified: src/modules/tls/tls_ct_wrq.c Modified: src/modules/tls/tls_server.c Modified: src/modules/tls/tls_util.c Modified: src/modules/tls/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/110ebbafadcc225f4e88749287f06ae… Patch: https://github.com/kamailio/kamailio/commit/110ebbafadcc225f4e88749287f06ae…

1 0

git:master:5077127b: core: change tcp_check_timer initialization
by Daniel-Constantin Mierla 19 Oct '23

19 Oct '23

Module: kamailio Branch: master Commit: 5077127b0fe1a2d803e42abe19cfcd93339f0519 URL: https://github.com/kamailio/kamailio/commit/5077127b0fe1a2d803e42abe19cfcd9… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-19T13:36:32+02:00 core: change tcp_check_timer initialization - make tcp_check_timer default to depend on tcp_msg_data_timeout and ksr_tcp_msg_read_timeout values, set to half of the minimum of the two, it is not explicitely set - GH #3608 --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5077127b0fe1a2d803e42abe19cfcd9… Patch: https://github.com/kamailio/kamailio/commit/5077127b0fe1a2d803e42abe19cfcd9… --- diff --git a/src/main.c b/src/main.c index 0fa2da6ec27..e299db3b319 100644 --- a/src/main.c +++ b/src/main.c @@ -535,7 +535,7 @@ int ksr_tcp_msg_read_timeout = 20; /* timeout (secs) to read SIP message */ int ksr_tcp_msg_data_timeout = 20; /* timeout (secs) to receive first msg data */ int ksr_tcp_accept_iplimit = 1024; /* limit of accepted connections per IP */ -int ksr_tcp_check_timer = 10; /* seconds to check tcp connections */ +int ksr_tcp_check_timer = -1; /* seconds to check tcp connections */ /* memory manager */ #define SR_MEMMNG_DEFAULT "qm" @@ -1726,12 +1726,25 @@ int main_loop(void) cfg_main_reset_local(); #ifdef USE_TCP - if(!tcp_disable && ksr_tcp_check_timer > 0) { - if(sr_wtimer_add( - tcp_timer_check_connections, NULL, ksr_tcp_check_timer) - < 0) { - LM_CRIT("cannot add timer for tcp connection checks\n"); - goto error; + if(!tcp_disable) { + if(ksr_tcp_check_timer == -1) { + if(ksr_tcp_msg_data_timeout > 0 && ksr_tcp_msg_read_timeout > 0) + ksr_tcp_check_timer = MIN(ksr_tcp_msg_data_timeout, + ksr_tcp_msg_read_timeout) + / 2; + else + ksr_tcp_check_timer = + ksr_tcp_msg_data_timeout > 0 + ? ksr_tcp_msg_data_timeout / 2 + : ksr_tcp_msg_read_timeout / 2; + } + if(ksr_tcp_check_timer > 0) { + if(sr_wtimer_add(tcp_timer_check_connections, NULL, + ksr_tcp_check_timer) + < 0) { + LM_CRIT("cannot add timer for tcp connection checks\n"); + goto error; + } } } #endif

1 0

git:master:1acede64: core: added tcp_check_timer parameter
by Daniel-Constantin Mierla 19 Oct '23

19 Oct '23

Module: kamailio Branch: master Commit: 1acede64041307b783ed90736ca114917bafbc14 URL: https://github.com/kamailio/kamailio/commit/1acede64041307b783ed90736ca1149… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T08:35:09+02:00 core: added tcp_check_timer parameter - set the check interval (in seconds) for tcp connections - default 10 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1acede64041307b783ed90736ca1149… Patch: https://github.com/kamailio/kamailio/commit/1acede64041307b783ed90736ca1149… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index c8548c4eb6a..44c62279b7d 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -367,6 +367,7 @@ MAXSNDBUFFER maxsndbuffer SQL_BUFFER_SIZE sql_buffer_size MSG_RECV_MAX_SIZE msg_recv_max_size TCP_MSG_READ_TIMEOUT tcp_msg_read_timeout +TCP_CHECK_TIMER tcp_check_timer CHILDREN children SOCKET socket BIND bind @@ -854,6 +855,7 @@ IMPORTFILE "import_file" <INITIAL>{SQL_BUFFER_SIZE} { count(); yylval.strval=yytext; return SQL_BUFFER_SIZE; } <INITIAL>{MSG_RECV_MAX_SIZE} { count(); yylval.strval=yytext; return MSG_RECV_MAX_SIZE; } <INITIAL>{TCP_MSG_READ_TIMEOUT} { count(); yylval.strval=yytext; return TCP_MSG_READ_TIMEOUT; } +<INITIAL>{TCP_CHECK_TIMER} { count(); yylval.strval=yytext; return TCP_CHECK_TIMER; } <INITIAL>{CHILDREN} { count(); yylval.strval=yytext; return CHILDREN; } <INITIAL>{SOCKET} { count(); yylval.strval=yytext; return SOCKET; } <INITIAL>{BIND} { count(); yylval.strval=yytext; return BIND; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 9c7efd83f92..a5e16e259e1 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -423,6 +423,7 @@ extern char *default_routename; %token SQL_BUFFER_SIZE %token MSG_RECV_MAX_SIZE %token TCP_MSG_READ_TIMEOUT +%token TCP_CHECK_TIMER %token USER %token GROUP %token CHROOT @@ -1019,6 +1020,8 @@ assign_stm: | MSG_RECV_MAX_SIZE EQUAL error { yyerror("number expected"); } | TCP_MSG_READ_TIMEOUT EQUAL NUMBER { ksr_tcp_msg_read_timeout=$3; } | TCP_MSG_READ_TIMEOUT EQUAL error { yyerror("number expected"); } + | TCP_CHECK_TIMER EQUAL NUMBER { ksr_tcp_check_timer=$3; } + | TCP_CHECK_TIMER EQUAL error { yyerror("number expected"); } | CHILDREN EQUAL NUMBER { children_no=$3; } | CHILDREN EQUAL error { yyerror("number expected"); } | STATS_NAMESEP EQUAL STRING { ksr_stats_namesep=$3; } diff --git a/src/core/globals.h b/src/core/globals.h index 91c97ae9a4a..aac82563d51 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -240,6 +240,7 @@ extern int ksr_rpc_exec_delta; extern int ksr_msg_recv_max_size; extern int ksr_tcp_msg_read_timeout; +extern int ksr_tcp_check_timer; #ifdef USE_DNS_CACHE extern int diff --git a/src/main.c b/src/main.c index 719debba099..a949d930407 100644 --- a/src/main.c +++ b/src/main.c @@ -532,6 +532,7 @@ char *pgid_file = 0; int ksr_msg_recv_max_size = 32767; /* 2^15 - 1 */ int ksr_tcp_msg_read_timeout = KSR_TCP_MSGREAD_TIMEOUT; +int ksr_tcp_check_timer = 10; /* seconds to check tcp connections */ /* memory manager */ #define SR_MEMMNG_DEFAULT "qm" @@ -1722,8 +1723,10 @@ int main_loop(void) cfg_main_reset_local(); #ifdef USE_TCP - if(!tcp_disable) { - if(sr_wtimer_add(tcp_timer_check_connections, NULL, 10) < 0) { + if(!tcp_disable && ksr_tcp_check_timer > 0) { + if(sr_wtimer_add( + tcp_timer_check_connections, NULL, ksr_tcp_check_timer) + < 0) { LM_CRIT("cannot add timer for tcp connection checks\n"); goto error; }

2 9

[kamailio/kamailio] tm:local-request not documented (#980)
by Olle E. Johansson 18 Oct '23

18 Oct '23

The local-request event route is not documented. When using our friend google I find an old blog post by @miconda but not much else. I can come up with some good text, but need to know what can be done in the route, like - modify request uri - add/remove headers - drop request - add/modify destination uri ($du) -- 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/980

3 8

[kamailio/kamailio] tools: route_graph - added README file (PR #3604)
by VoIPNuggets.com 18 Oct '23

18 Oct '23

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3604 -- Commit Summary -- * tools: route_graph - added README file -- File Changes -- A misc/tools/route_graph/README (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3604.patch https://github.com/kamailio/kamailio/pull/3604.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3604 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3604(a)github.com>

3 8

git:master:976da8c7: tools: route_graph - added README file and updated reference URL [skip ci]
by Victor Seva 18 Oct '23

18 Oct '23

Module: kamailio Branch: master Commit: 976da8c72e9a056b724f584a803a4a8114f70d30 URL: https://github.com/kamailio/kamailio/commit/976da8c72e9a056b724f584a803a4a8… Author: VoIPNuggets.com <akash(a)voipnuggets.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-18T12:15:55+02:00 tools: route_graph - added README file and updated reference URL [skip ci] --- Added: misc/tools/route_graph/README --- Diff: https://github.com/kamailio/kamailio/commit/976da8c72e9a056b724f584a803a4a8… Patch: https://github.com/kamailio/kamailio/commit/976da8c72e9a056b724f584a803a4a8… --- diff --git a/misc/tools/route_graph/README b/misc/tools/route_graph/README new file mode 100644 index 00000000000..c78cc8c49db --- /dev/null +++ b/misc/tools/route_graph/README @@ -0,0 +1,16 @@ +This Python script, route_graph.py, serves as a utility tool for visualizing Kamailio SIP server configuration files. +It generates a graphical representation of the routing logic defined in the configuration. + +Usage: +1. Clone the GitHub repository: + git clone https://github.com/kamailio/kamailio.git +2. Navigate to the tool's directory: + cd kamailio/misc/tools/route_graph/ +3. Run the script on your Kamailio configuration file: + python3 route_graph.py /path/to/kamailio.cfg + +For a more detailed walkthrough, please refer to this article: +Visualizing Kamailio Configuration File Using Route Graph Tool. +https://voipnuggets.com/2023/06/13/visualizing-kamailio-configuration-file-using-route_graph-tool/ + +[ README written by Akash Gupta ]

1 0

git:master:93fc6bc9: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 18 Oct '23

18 Oct '23

Module: kamailio Branch: master Commit: 93fc6bc9c965391aa1e4ca546119ce2cc8699fbd URL: https://github.com/kamailio/kamailio/commit/93fc6bc9c965391aa1e4ca546119ce2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-18T10:02:28+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/93fc6bc9c965391aa1e4ca546119ce2… Patch: https://github.com/kamailio/kamailio/commit/93fc6bc9c965391aa1e4ca546119ce2… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 033acf3a1e1..ad13698a204 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -233,7 +233,7 @@ modparam("topos", "db_url", "dbdriver://username:password@dbhost/dbname") Call-id in the SIP message payload or header, so it is safe to not encode Call-id in such cases. Well-known extensions such as call transfer or conference join will be added to work with encoded Call-id. - Topoh module should be loaded with use_mode paramerter set to 1 + Topoh module should be loaded with use_mode parameter set to 1 Default value is 0 (do not mask).

1 0

git:master:d2f0e1c3: topos: spelling fix in docs
by Henning Westerholt 18 Oct '23

18 Oct '23

Module: kamailio Branch: master Commit: d2f0e1c31920e5b2b38ddbc823c6bc332fac86a5 URL: https://github.com/kamailio/kamailio/commit/d2f0e1c31920e5b2b38ddbc823c6bc3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-10-18T07:55:59Z topos: spelling fix in docs --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d2f0e1c31920e5b2b38ddbc823c6bc3… Patch: https://github.com/kamailio/kamailio/commit/d2f0e1c31920e5b2b38ddbc823c6bc3… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 9c1e4d3df1f..ebedcd13999 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -141,7 +141,7 @@ modparam("topos", "db_url", "&exampledb;") not encode Call-id in such cases. Well-known extensions such as call transfer or conference join will be added to work with encoded Call-id. - Topoh module should be loaded with use_mode paramerter set to 1 + Topoh module should be loaded with use_mode parameter set to 1 </para> <para>

1 0

git:master:ac69e7d7: github: codeql remove downloaded packages [skip ci]
by Victor Seva 18 Oct '23

18 Oct '23

Module: kamailio Branch: master Commit: ac69e7d7e65d2e65bc182d189ece8df28acfc5c3 URL: https://github.com/kamailio/kamailio/commit/ac69e7d7e65d2e65bc182d189ece8df… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-18T09:50:11+02:00 github: codeql remove downloaded packages [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/ac69e7d7e65d2e65bc182d189ece8df… Patch: https://github.com/kamailio/kamailio/commit/ac69e7d7e65d2e65bc182d189ece8df… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 3b36e5edd05..62fe2dc5c04 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -30,6 +30,7 @@ jobs: run: | sudo apt-get update sudo apt-get install --yes bison default-libmysqlclient-dev flex libcurl4-openssl-dev libjansson-dev libhiredis-dev libevent-dev liblua5.1-0-dev libpcre3-dev libncurses5-dev libpq-dev libreadline-dev libssl-dev libunistring-dev libmicrohttpd-dev libxml2-dev pkg-config python3 python3-dev uuid-dev zlib1g-dev + sudo apt-get clean - name: Configure (cpp) if: ${{ matrix.language == 'cpp' }}

1 0

git:master:70ff7c29: github: disable CodeQL scan for pull requests [skip ci]
by Victor Seva 18 Oct '23

18 Oct '23

Module: kamailio Branch: master Commit: 70ff7c298f257bec48809b9bc80fd06cfe87c7b4 URL: https://github.com/kamailio/kamailio/commit/70ff7c298f257bec48809b9bc80fd06… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-18T09:41:01+02:00 github: disable CodeQL scan for pull requests [skip ci] job is failling due to "java.io.IOException: No space left on device" --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/70ff7c298f257bec48809b9bc80fd06… Patch: https://github.com/kamailio/kamailio/commit/70ff7c298f257bec48809b9bc80fd06… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 59e3dbf476f..3b36e5edd05 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,8 +1,6 @@ name: "CodeQL" on: - pull_request: - branches: [ "master" ] schedule: - cron: "30 0 * * *" # Allows you to run this workflow manually from the Actions tab

1 0

git:master:4747f724: presence: clang-format
by Victor Seva 18 Oct '23

18 Oct '23

Module: kamailio Branch: master Commit: 4747f724325e69033a052d078b161186dc2e5c21 URL: https://github.com/kamailio/kamailio/commit/4747f724325e69033a052d078b16118… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-17T14:19:01+02:00 presence: clang-format --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/4747f724325e69033a052d078b16118… Patch: https://github.com/kamailio/kamailio/commit/4747f724325e69033a052d078b16118… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 688b6dfeb3b..a02c49baf01 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1858,8 +1858,9 @@ static const char *rpc_presence_cleanup_doc[3] = { void rpc_presence_publish_cache_sync(rpc_t *rpc, void *ctx) { LM_DBG("Synchronizing presentity table with the publish cache.\n"); - if (pres_htable_db_restore() == -1 ) { - rpc->fault(ctx, 500, "Failed to sync presinity table with the publish cache."); + if(pres_htable_db_restore() == -1) { + rpc->fault(ctx, 500, + "Failed to sync presinity table with the publish cache."); } else { rpc->rpl_printf(ctx, "OK"); } @@ -1867,9 +1868,7 @@ void rpc_presence_publish_cache_sync(rpc_t *rpc, void *ctx) } static const char *rpc_presence_publish_cache_sync_doc[4] = { - "Syncs changes made to presentity table with the publish cache.", - 0 -}; + "Syncs changes made to presentity table with the publish cache.", 0}; /*! \brief @@ -2137,8 +2136,8 @@ static const char *rpc_presence_watcher_list_doc[2] = { rpc_export_t presence_rpc[] = { - {"presence.publish_cache_sync", rpc_presence_publish_cache_sync, - rpc_presence_publish_cache_sync_doc, 0}, + {"presence.publish_cache_sync", rpc_presence_publish_cache_sync, + rpc_presence_publish_cache_sync_doc, 0}, {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, {"presence.refreshWatchers", rpc_presence_refresh_watchers, rpc_presence_refresh_watchers_doc, 0},

1 0

git:master:b7b3f755: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: b7b3f75537e9d816833b3718b7f6290a655c9f45 URL: https://github.com/kamailio/kamailio/commit/b7b3f75537e9d816833b3718b7f6290… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-16T15:46:34+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README --- Diff: https://github.com/kamailio/kamailio/commit/b7b3f75537e9d816833b3718b7f6290… Patch: https://github.com/kamailio/kamailio/commit/b7b3f75537e9d816833b3718b7f6290… --- diff --git a/src/modules/ims_qos/README b/src/modules/ims_qos/README index b0981a0c151..71b7dc1b711 100644 --- a/src/modules/ims_qos/README +++ b/src/modules/ims_qos/README @@ -498,13 +498,13 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) 3.24. suspend_transaction integer - If eneabled, suspends the tm transaction while doing the AAR. + If enabled, suspends the tm transaction while doing the AAR. Default value is 1 (enabled) Example 1.24. suspend_transaction parameter usage ... -modparam("ims_qos", "suspend_transaction", 2000) +modparam("ims_qos", "suspend_transaction", 0) ... 4. Functions

1 0

git:master:672b72d6: ims_qos: spelling fix for suspend_transaction docs, more sensible value for example docs
by Henning Westerholt 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 672b72d65aba0b30fb363d60ab648f9705810ba7 URL: https://github.com/kamailio/kamailio/commit/672b72d65aba0b30fb363d60ab648f9… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-10-16T13:36:42Z ims_qos: spelling fix for suspend_transaction docs, more sensible value for example docs --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/672b72d65aba0b30fb363d60ab648f9… Patch: https://github.com/kamailio/kamailio/commit/672b72d65aba0b30fb363d60ab648f9… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index b84f9193f91..359f88514ee 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -521,7 +521,7 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) <section> <title><varname>suspend_transaction</varname> integer</title> - <para>If eneabled, suspends the tm transaction while doing the AAR.</para> + <para>If enabled, suspends the tm transaction while doing the AAR.</para> <para><emphasis> Default value is 1 (enabled)</emphasis></para> @@ -531,7 +531,7 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) <programlisting format="linespecific"> ... -modparam("ims_qos", "suspend_transaction", 2000) +modparam("ims_qos", "suspend_transaction", 0) ... </programlisting> </example>

1 0

git:5.7:02958e56: jwt: use proper internal function for jwt_verify_key()
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: 5.7 Commit: 02958e56fed877275b98a5cf0c568cc4e9175a8c URL: https://github.com/kamailio/kamailio/commit/02958e56fed877275b98a5cf0c568cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T10:47:55+02:00 jwt: use proper internal function for jwt_verify_key() (cherry picked from commit 319df7fc417e898e945cac0d44e978c9ff151e3c) --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02958e56fed877275b98a5cf0c568cc… Patch: https://github.com/kamailio/kamailio/commit/02958e56fed877275b98a5cf0c568cc… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index adda8d38456..caebefd346a 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -628,7 +628,7 @@ static int w_jwt_verify_key(sip_msg_t* msg, char* pkey, char* palg, char* pclaim return -1; } - return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); + return ki_jwt_verify_key(msg, &skey, &salg, &sclaims, &sjwtval); } /**

1 0

git:master:319df7fc: jwt: use proper internal function for jwt_verify_key()
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 319df7fc417e898e945cac0d44e978c9ff151e3c URL: https://github.com/kamailio/kamailio/commit/319df7fc417e898e945cac0d44e978c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T10:46:34+02:00 jwt: use proper internal function for jwt_verify_key() --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/319df7fc417e898e945cac0d44e978c… Patch: https://github.com/kamailio/kamailio/commit/319df7fc417e898e945cac0d44e978c… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 6d4b6f7e6ec..0efb793c47f 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -629,7 +629,7 @@ static int w_jwt_verify_key( return -1; } - return ki_jwt_verify(msg, &skey, &salg, &sclaims, &sjwtval); + return ki_jwt_verify_key(msg, &skey, &salg, &sclaims, &sjwtval); } /**

1 0

git:master:241127c5: core: added tcp_accept_iplimit parameter
by Daniel-Constantin Mierla 16 Oct '23

16 Oct '23

Module: kamailio Branch: master Commit: 241127c5f0820614a3e2ac1467e9f8cb8a0eeb23 URL: https://github.com/kamailio/kamailio/commit/241127c5f0820614a3e2ac1467e9f8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T09:09:08+02:00 core: added tcp_accept_iplimit parameter - set limit for accepted connections from the same ip address - default 1024 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/241127c5f0820614a3e2ac1467e9f8c… Patch: https://github.com/kamailio/kamailio/commit/241127c5f0820614a3e2ac1467e9f8c…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev