sr-dev August 2020

sr-dev@lists.kamailio.org

17 participants
244 discussions

git:master:d9dd2abe: core: kemi - exported core route function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d9dd2abeb82be8b992ddf534864b6d84594b7a47 URL: https://github.com/kamailio/kamailio/commit/d9dd2abeb82be8b992ddf534864b6d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-20T16:16:56+02:00 core: kemi - exported core route function --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d9dd2abeb82be8b992ddf534864b6d8… Patch: https://github.com/kamailio/kamailio/commit/d9dd2abeb82be8b992ddf534864b6d8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 3cbeee6d08..6ca519e804 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1482,6 +1482,41 @@ static int sr_kemi_core_get_debug(sip_msg_t *msg) return get_cfg_debug_level(); } +/** + * + */ +static int sr_kemi_core_route(sip_msg_t *msg, str *route) +{ + run_act_ctx_t tctx; + run_act_ctx_t *pctx = NULL; + int rtid = -1; + int ret = 0; + + if(route == NULL || route->s == NULL) { + return -1; + } + + rtid = route_lookup(&main_rt, route->s); + if (rtid < 0) { + return -1; + } + + if(_sr_kemi_act_ctx != NULL) { + pctx = _sr_kemi_act_ctx; + } else { + init_run_actions_ctx(&tctx); + pctx = &tctx; + } + + ret=run_actions(pctx, main_rt.rlist[rtid], msg); + + if (pctx->run_flags & EXIT_R_F) { + return 0; + } + + return ret; +} + /** * */ @@ -1881,6 +1916,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("route"), + SR_KEMIP_INT, sr_kemi_core_route, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

3 years, 9 months

git:master:ecba550f: cfgutils: exported route check functions to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ecba550f5d35435adfa9c692cec8cee6cae8a77b URL: https://github.com/kamailio/kamailio/commit/ecba550f5d35435adfa9c692cec8cee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-20T15:59:05+02:00 cfgutils: exported route check functions to kemi --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/ecba550f5d35435adfa9c692cec8cee… Patch: https://github.com/kamailio/kamailio/commit/ecba550f5d35435adfa9c692cec8cee… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 7be7181d82..9a77b40aed 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -790,28 +790,23 @@ static int w_cfg_trylock(struct sip_msg *msg, char *key, char *s2) /*! Check if a route block exists - only request routes */ -static int w_check_route_exists(struct sip_msg *msg, char *route) +static int ki_check_route_exists(sip_msg_t *msg, str *route) { - str s; - - if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) - { - LM_ERR("invalid route parameter\n"); - return -1; + if(route == NULL || route->s == NULL) { + return -1; } - if (route_lookup(&main_rt, s.s)<0) { + + if (route_lookup(&main_rt, route->s)<0) { /* not found */ return -1; } return 1; } -/*! Run a request route block if it exists +/*! Check if a route block exists - only request routes */ -static int w_route_exists(struct sip_msg *msg, char *route) +static int w_check_route_exists(struct sip_msg *msg, char *route) { - struct run_act_ctx ctx; - int newroute, ret; str s; if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) { @@ -819,18 +814,49 @@ static int w_route_exists(struct sip_msg *msg, char *route) return -1; } - newroute = route_lookup(&main_rt, s.s); + return ki_check_route_exists(msg, &s); +} + +/*! Run a request route block if it exists + */ +static int ki_route_if_exists(sip_msg_t *msg, str *route) +{ + struct run_act_ctx ctx; + int newroute, ret; + + if(route == NULL || route->s == NULL) { + return -1; + } + + newroute = route_lookup(&main_rt, route->s); if (newroute<0) { return -1; } + init_run_actions_ctx(&ctx); ret=run_actions(&ctx, main_rt.rlist[newroute], msg); if (ctx.run_flags & EXIT_R_F) { return 0; } + return ret; } + +/*! Run a request route block if it exists + */ +static int w_route_exists(struct sip_msg *msg, char *route) +{ + str s; + + if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) { + LM_ERR("invalid route parameter\n"); + return -1; + } + + return ki_route_if_exists(msg, &s); +} + static int mod_init(void) { /* Register RPC commands */ @@ -1078,6 +1104,16 @@ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("cfgutils"), str_init("check_route_exists"), + SR_KEMIP_INT, ki_check_route_exists, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("route_if_exists"), + SR_KEMIP_INT, ki_route_if_exists, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

3 years, 9 months

git:5.3:3af15354: async: fix async_ms_route and export it to kemi

by Federico Cabiddu

Module: kamailio Branch: 5.3 Commit: 3af15354836f69ec2cbd6f107f860cfc1ffc334e URL: https://github.com/kamailio/kamailio/commit/3af15354836f69ec2cbd6f107f860cf… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-08-20T15:35:31+02:00 async: fix async_ms_route and export it to kemi (cherry picked from commit b787627819fc93dcc8c68a4950c9760d298ce555) --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3af15354836f69ec2cbd6f107f860cf… Patch: https://github.com/kamailio/kamailio/commit/3af15354836f69ec2cbd6f107f860cf… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index aae3c65500..3415d60224 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -404,7 +404,7 @@ static int w_async_ms_route(sip_msg_t *msg, char *rt, char *sec) LM_ERR("no async interval value\n"); return -1; } - return ki_async_route(msg, &rn, s); + return ki_async_ms_route(msg, &rn, s); } /** @@ -505,6 +505,11 @@ static sr_kemi_t sr_kemi_async_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("async"), str_init("ms_route"), + SR_KEMIP_INT, ki_async_ms_route, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("async"), str_init("task_route"), SR_KEMIP_INT, ki_async_task_route, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 9 months

git:5.4:bf38c7b0: async: fix async_ms_route and export it to kemi

by Federico Cabiddu

Module: kamailio Branch: 5.4 Commit: bf38c7b04171e6f410ff885f10abe0f815d27de9 URL: https://github.com/kamailio/kamailio/commit/bf38c7b04171e6f410ff885f10abe0f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-08-20T15:35:04+02:00 async: fix async_ms_route and export it to kemi (cherry picked from commit b787627819fc93dcc8c68a4950c9760d298ce555) --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bf38c7b04171e6f410ff885f10abe0f… Patch: https://github.com/kamailio/kamailio/commit/bf38c7b04171e6f410ff885f10abe0f… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index aae3c65500..3415d60224 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -404,7 +404,7 @@ static int w_async_ms_route(sip_msg_t *msg, char *rt, char *sec) LM_ERR("no async interval value\n"); return -1; } - return ki_async_route(msg, &rn, s); + return ki_async_ms_route(msg, &rn, s); } /** @@ -505,6 +505,11 @@ static sr_kemi_t sr_kemi_async_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("async"), str_init("ms_route"), + SR_KEMIP_INT, ki_async_ms_route, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("async"), str_init("task_route"), SR_KEMIP_INT, ki_async_task_route, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 9 months

[kamailio/kamailio] async: fix async_ms_route and export it to kemi (#2450)

by Federico Cabiddu

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  async_ms_route currently does not work, because w_async_ms_route calls ki_async_route instead of ki_async_ms_route. This PR also exports ki_async_ms_route to kemi. I've noticed that other async functions (async_sleep and async_ms_sleep) are not exposed via kemi. Should be add them? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2450 -- Commit Summary -- * async: fix async_ms_route and export it to kemi -- File Changes -- M src/modules/async/async_mod.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2450.patch https://github.com/kamailio/kamailio/pull/2450.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2450

3 years, 9 months

git:master:46f4aaec: Merge pull request #2450 from kamailio/grumvalski/fix_async_ms_route

by GitHub

Module: kamailio Branch: master Commit: 46f4aaecbd95acea4877d072fecf787bd9f65a40 URL: https://github.com/kamailio/kamailio/commit/46f4aaecbd95acea4877d072fecf787… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-08-20T15:33:59+02:00 Merge pull request #2450 from kamailio/grumvalski/fix_async_ms_route async: fix async_ms_route and export it to kemi --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/46f4aaecbd95acea4877d072fecf787… Patch: https://github.com/kamailio/kamailio/commit/46f4aaecbd95acea4877d072fecf787… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index aae3c65500..3415d60224 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -404,7 +404,7 @@ static int w_async_ms_route(sip_msg_t *msg, char *rt, char *sec) LM_ERR("no async interval value\n"); return -1; } - return ki_async_route(msg, &rn, s); + return ki_async_ms_route(msg, &rn, s); } /** @@ -505,6 +505,11 @@ static sr_kemi_t sr_kemi_async_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("async"), str_init("ms_route"), + SR_KEMIP_INT, ki_async_ms_route, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("async"), str_init("task_route"), SR_KEMIP_INT, ki_async_task_route, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 9 months

git:master:b7876278: async: fix async_ms_route and export it to kemi

by Federico Cabiddu

Module: kamailio Branch: master Commit: b787627819fc93dcc8c68a4950c9760d298ce555 URL: https://github.com/kamailio/kamailio/commit/b787627819fc93dcc8c68a4950c9760… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-08-20T11:06:56+02:00 async: fix async_ms_route and export it to kemi --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b787627819fc93dcc8c68a4950c9760… Patch: https://github.com/kamailio/kamailio/commit/b787627819fc93dcc8c68a4950c9760… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index aae3c65500..3415d60224 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -404,7 +404,7 @@ static int w_async_ms_route(sip_msg_t *msg, char *rt, char *sec) LM_ERR("no async interval value\n"); return -1; } - return ki_async_route(msg, &rn, s); + return ki_async_ms_route(msg, &rn, s); } /** @@ -505,6 +505,11 @@ static sr_kemi_t sr_kemi_async_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("async"), str_init("ms_route"), + SR_KEMIP_INT, ki_async_ms_route, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("async"), str_init("task_route"), SR_KEMIP_INT, ki_async_task_route, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 9 months

git:master:232df1a7: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 232df1a75c12bc3109624a819038a7621375f5e5 URL: https://github.com/kamailio/kamailio/commit/232df1a75c12bc3109624a819038a76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-08-20T12:01:15+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/232df1a75c12bc3109624a819038a76… Patch: https://github.com/kamailio/kamailio/commit/232df1a75c12bc3109624a819038a76… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index e80d339f5b..c7ace804a2 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -254,10 +254,15 @@ modparam("ims_ipsec_pcscf", "ipsec_spi_id_range", 1000) Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. + flags - bitwise flag: 0x01 - if set - delete unused tunnels before + every registration. This is an optional parameter, default value - + 0. Example 1.9. ipsec_create ... ipsec_create("location"); +# or +ipsec_create("location", "1"); ... 4.2. ipsec_forward(domain, flags)

3 years, 9 months

[kamailio/kamailio] Ims ipsec delete unused tunnels (#2443)

by alexyosifov

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2443 -- Commit Summary -- * ims_ipsec_pcscf: delete unused tunnels * ims_usrloc_pcscf: changes in get_all_mem_ucontacts -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (42) M src/modules/ims_ipsec_pcscf/cmd.h (2) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (7) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (23) M src/modules/ims_ipsec_pcscf/ipsec.c (477) M src/modules/ims_ipsec_pcscf/ipsec.h (2) M src/modules/ims_usrloc_pcscf/dlist.c (116) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2443.patch https://github.com/kamailio/kamailio/pull/2443.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2443

3 years, 9 months

git:master:d4186af3: ims_usrloc_pcscf: changes in get_all_mem_ucontacts

by Henning Westerholt

Module: kamailio Branch: master Commit: d4186af30b9c8ab94b4970a5ced5da7529cf9499 URL: https://github.com/kamailio/kamailio/commit/d4186af30b9c8ab94b4970a5ced5da7… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-20T11:47:44+02:00 ims_usrloc_pcscf: changes in get_all_mem_ucontacts Chnages in unused funciton get_all_mem_ucontacts. Now the function is used to get all contacts and check for unused tunnels. --- Modified: src/modules/ims_usrloc_pcscf/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/d4186af30b9c8ab94b4970a5ced5da7… Patch: https://github.com/kamailio/kamailio/commit/d4186af30b9c8ab94b4970a5ced5da7…

3 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2020