sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
286 discussions

[kamailio/kamailio] http_client: Add parameter connect_timeout_ms / timeout_ms (2) (PR #3611)

by Nicolas C

#### 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>

1 year, 1 month

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

by mtryfoss

#### 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>

1 year, 1 month

git:master:309565b0: ims_dialog: Add function to get dialog by hash entry and id

by Daniel-Constantin Mierla

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 year, 1 month

[kamailio/kamailio] http_client: Add parameter connect_timeout_ms / timeout_ms (PR #3609)

by Nicolas C

#### 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>

1 year, 1 month

git:master:111d9f70: app_ruby: Fix rpc documentation typo

by Victor Seva

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 year, 1 month

[kamailio/kamailio] app_ruby: Fix rpc documentation typo (PR #3614)

by Konstantin Tumalevich

#### 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>

1 year, 1 month

git:master:7731fc3a: tls: add log line-break, increase buffer size (related to GH 3612 and GH 3607)

by Henning Westerholt

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 year, 1 month

git:master:0a98a0d5: corex: read fmatch as str rpc parameter for shm.rprint

by Daniel-Constantin Mierla

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 year, 1 month

git:master:1ebdc5c2: core: mem - print line after file name in qm_status_filter()

by Daniel-Constantin Mierla

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 year, 1 month

git:master:338f848c: github: CODEOWNERS to protect workflows [skip ci]

by Victor Seva

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 year, 1 month

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023