sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
306 discussions

git:master:7b1fe048: tools: use python3 for route_graph.py tool, for old systems with both python2/python3, fix file closing

by Henning Westerholt

Module: kamailio Branch: master Commit: 7b1fe0483b684693c7baea9b62b471b64c6e22a9 URL: https://github.com/kamailio/kamailio/commit/7b1fe0483b684693c7baea9b62b471b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-06-12T08:24:01Z tools: use python3 for route_graph.py tool, for old systems with both python2/python3, fix file closing --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/7b1fe0483b684693c7baea9b62b471b… Patch: https://github.com/kamailio/kamailio/commit/7b1fe0483b684693c7baea9b62b471b… --- diff --git a/misc/tools/route_graph/route_graph.py b/misc/tools/route_graph/route_graph.py index 307f847b114..ae935a450bf 100755 --- a/misc/tools/route_graph/route_graph.py +++ b/misc/tools/route_graph/route_graph.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 """ * $Id$ * @@ -232,4 +232,4 @@ def traverse_routes(_level, _name): traverse_routes(1, r) print() - +cfg.close()

1 year, 2 months

[kamailio/kamailio] tool: port the route_graph.py script to python version 3.x (PR #3480)

by VoIPNuggets.com

#### Pre-Submission Checklist    - [x] 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/3480 -- Commit Summary -- * tool: port the route_graph.py script to python version 3.x -- File Changes -- M misc/tools/route_graph/route_graph.py (341) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3480.patch https://github.com/kamailio/kamailio/pull/3480.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3480 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3480(a)github.com>

1 year, 2 months

git:master:fa2a69e2: tool: port the route_graph.py script to python version 3.x

by Henning Westerholt

Module: kamailio Branch: master Commit: fa2a69e2ae919b7ba221e87e2001bde83113ce2a URL: https://github.com/kamailio/kamailio/commit/fa2a69e2ae919b7ba221e87e2001bde… Author: Akash Gupta <listen2akash(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-06-12T10:21:16+02:00 tool: port the route_graph.py script to python version 3.x --- Modified: misc/tools/route_graph/route_graph.py --- Diff: https://github.com/kamailio/kamailio/commit/fa2a69e2ae919b7ba221e87e2001bde… Patch: https://github.com/kamailio/kamailio/commit/fa2a69e2ae919b7ba221e87e2001bde…

1 year, 2 months

git:master:f867d219: kamzo: kemi exports formatted for kemidocs.py

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f867d2190853b9f21791d83573de3f96f4337242 URL: https://github.com/kamailio/kamailio/commit/f867d2190853b9f21791d83573de3f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T10:03:06+02:00 kamzo: kemi exports formatted for kemidocs.py --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/f867d2190853b9f21791d83573de3f9… Patch: https://github.com/kamailio/kamailio/commit/f867d2190853b9f21791d83573de3f9… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 2cf34becebe..757fa2cdce9 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -386,16 +386,22 @@ static int mod_init(void) return 0; } +/* clang-format off */ static sr_kemi_t kazoo_kemi_exports[] = { - {str_init("kazoo"), str_init("kazoo_publish"), SR_KEMIP_INT, - ki_kz_amqp_publish, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("kazoo"), str_init("kazoo_subscribe"), SR_KEMIP_INT, - ki_kz_amqp_subscribe, - {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}}}; + { str_init("kazoo"), str_init("kazoo_publish"), + SR_KEMIP_INT, ki_kz_amqp_publish, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kazoo"), str_init("kazoo_subscribe"), + SR_KEMIP_INT, ki_kz_amqp_subscribe, + { 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} } +}; +/* clang-format on */ int mod_register(char *path, int *dlflags, void *p1, void *p2) {

1 year, 2 months

git:master:cabf1968: ims_charging: kemi exports format for kemidocs.py

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cabf1968bf75f2b85894e5cfda63e1cd3cb7bd82 URL: https://github.com/kamailio/kamailio/commit/cabf1968bf75f2b85894e5cfda63e1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T10:03:06+02:00 ims_charging: kemi exports format for kemidocs.py --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cabf1968bf75f2b85894e5cfda63e1c… Patch: https://github.com/kamailio/kamailio/commit/cabf1968bf75f2b85894e5cfda63e1c… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index 96c50b1c16a..94ac9dbd0a5 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -743,20 +743,27 @@ static int ro_fixup_stop(void **param, int param_no) return 0; } +/* clang-format off */ static sr_kemi_t ims_charging_kemi_exports[] = { - {str_init("ims_charging"), str_init("Ro_CCR"), SR_KEMIP_INT, ki_ro_ccr, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, - SR_KEMIP_STR, SR_KEMIP_NONE}}, - {str_init("ims_charging"), str_init("Ro_CCR_Stop"), SR_KEMIP_INT, - ki_ro_ccr_stop, - {SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("ims_charging"), str_init("Ro_set_session_id_avp"), - SR_KEMIP_INT, ki_ro_set_session_id_avp, - {SR_KEMIP_NONE, 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}}}; + { str_init("ims_charging"), str_init("Ro_CCR"), + SR_KEMIP_INT, ki_ro_ccr, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ims_charging"), str_init("Ro_CCR_Stop"), + SR_KEMIP_INT, ki_ro_ccr_stop, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_charging"), str_init("Ro_set_session_id_avp"), + SR_KEMIP_INT, ki_ro_set_session_id_avp, + { SR_KEMIP_NONE, 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} } +}; +/* clang-format on */ int mod_register(char *path, int *dlflags, void *p1, void *p2) {

1 year, 2 months

git:master:d9f9e5c6: ratelimit: ending struct whitespace for kemi exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d9f9e5c6be4d8d30bdccb0154e95a87982d5c736 URL: https://github.com/kamailio/kamailio/commit/d9f9e5c6be4d8d30bdccb0154e95a87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T10:03:06+02:00 ratelimit: ending struct whitespace for kemi exports --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/d9f9e5c6be4d8d30bdccb0154e95a87… Patch: https://github.com/kamailio/kamailio/commit/d9f9e5c6be4d8d30bdccb0154e95a87… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 4162a04dbfd..6c20589f8cb 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -1363,12 +1363,12 @@ static sr_kemi_t sr_kemi_ratelimit_exports[] = { { str_init("ratelimit"), str_init("rl_check"), SR_KEMIP_INT, ki_rl_check, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("ratelimit"), str_init("rl_check_pipe"), SR_KEMIP_INT, ki_rl_check_pipe, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, 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} }

1 year, 2 months

git:master:fd7ea1ba: ratelimit: reformat kemi exports for kemidocs.py

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fd7ea1bac7c5a0bc7e79e5bb90072898c6652e9d URL: https://github.com/kamailio/kamailio/commit/fd7ea1bac7c5a0bc7e79e5bb9007289… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T10:03:06+02:00 ratelimit: reformat kemi exports for kemidocs.py --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/fd7ea1bac7c5a0bc7e79e5bb9007289… Patch: https://github.com/kamailio/kamailio/commit/fd7ea1bac7c5a0bc7e79e5bb9007289… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 92e68bf0174..4162a04dbfd 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -1104,6 +1104,17 @@ static ticks_t rl_timer_handle(ticks_t ticks, struct timer_ln *tl, void *data) return (ticks_t)(-1); /* periodical */ } +static int ki_rl_check(struct sip_msg *msg) +{ + return rl_check(msg, -1); +} + +static int ki_rl_check_pipe(struct sip_msg *msg, int pipe) +{ + + LM_DBG("trying kemi pipe %d\n", pipe); + return rl_check(msg, pipe); +} /* rpc function documentation */ static const char *rpc_stats_doc[2] = { @@ -1347,29 +1358,23 @@ static rpc_export_t rpc_methods[] = {{"rl.stats", rpc_stats, rpc_stats_doc, 0}, {"rl.push_load", rpc_push_load, rpc_push_load_doc, 0}, {"rl.set_dbg", rpc_set_dbg, rpc_set_dbg_doc, 0}, {0, 0, 0, 0}}; +/* clang-format off */ static sr_kemi_t sr_kemi_ratelimit_exports[] = { - {str_init("ratelimit"), str_init("rl_check"), SR_KEMIP_INT, ki_rl_check, - {SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("ratelimit"), str_init("rl_check_pipe"), SR_KEMIP_INT, - ki_rl_check_pipe, - {SR_KEMIP_INT, 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}} - + { str_init("ratelimit"), str_init("rl_check"), + SR_KEMIP_INT, ki_rl_check, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("ratelimit"), str_init("rl_check_pipe"), + SR_KEMIP_INT, ki_rl_check_pipe, + { SR_KEMIP_INT, 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} } }; +/* clang-format on */ -static int ki_rl_check(struct sip_msg *msg) -{ - return rl_check(msg, -1); -} - -static int ki_rl_check_pipe(struct sip_msg *msg, int pipe) -{ - - LM_DBG("trying kemi pipe %d\n", pipe); - return rl_check(msg, pipe); -} int mod_register(char *path, int *dlflags, void *p1, void *p2) {

1 year, 2 months

git:master:d9d4ef01: jansson: reformat kemi exports for kemdocs.py tool

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d9d4ef011c9ee4f9c664ad945b36197a98efa9cd URL: https://github.com/kamailio/kamailio/commit/d9d4ef011c9ee4f9c664ad945b36197… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T10:03:06+02:00 jansson: reformat kemi exports for kemdocs.py tool --- Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9d4ef011c9ee4f9c664ad945b36197… Patch: https://github.com/kamailio/kamailio/commit/d9d4ef011c9ee4f9c664ad945b36197… --- diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 17bf8aefd8f..820a5492574 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -250,12 +250,17 @@ static int ki_jansson_get(sip_msg_t *msg, str *spath, str *sdoc, str *spv) /** * */ +/* clang-format off */ static sr_kemi_t sr_kemi_jansson_exports[] = { - {str_init("jansson"), str_init("get"), SR_KEMIP_INT, ki_jansson_get, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, + { str_init("jansson"), str_init("get"), + SR_KEMIP_INT, ki_jansson_get, + {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, - {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}}}; + { {0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0} } +}; +/* clang-format on */ /** *

1 year, 2 months

[kamailio/kamailio] mqueue: no support for db_text (Issue #3474)

by Ovidiu Sas

### Description If mqueue is configured to use db_text, kamailio will not start. #### Reproduction Here's a simple config that will expose the issue: ``` loadmodule "xlog.so" loadmodule "db_text.so" loadmodule "mqueue.so" modparam("mqueue", "db_url", "text:///usr/local/etc/kamailio/dbtext") modparam("mqueue", "mqueue", "name=mqueue_dbtext;dbmode=1") # ------------------------- request routing logic ------------------- # main routing logic route{ xlog("\n"); } ``` Content of the dbtext file: ``` $ cat /usr/local/etc/kamailio/dbtext/mqueue_dbtext id(int,auto) key(string) val(string) ``` #### Log Messages ``` May 31 23:07:47 asrock kamailio: INFO: mqueue [mqueue_mod.c:247]: mq_param(): mqueue param: [mqueue_dbtext|1|0] May 31 23:07:47 asrock kamailio: DEBUG: <core> [core/sr_module.c:752]: find_mod_export_record(): found export of <db_bind_api> in module db_text [/home/osas/src/kamailio/src/modules/db_text/db_text.so] May 31 23:07:47 asrock kamailio: DEBUG: <core> [db.c:210]: db_bind_mod(): using db bind api for db_text May 31 23:07:47 asrock kamailio: DEBUG: db_text [dbt_base.c:54]: dbt_init(): initializing for db url: [text:///usr/local/etc/kamailio/dbtext] May 31 23:07:47 asrock kamailio: ERROR: db_text [dbt_lib.c:111]: dbt_cache_get_db(): dbtext cache is not initialized! Check if you loaded dbtext before any other module that uses it May 31 23:07:47 asrock kamailio: ERROR: db_text [dbt_base.c:97]: dbt_init(): cannot get the link to database May 31 23:07:47 asrock kamailio: ERROR: mqueue [mqueue_db.c:67]: mqueue_db_open_con(): failed to connect to the database May 31 23:07:47 asrock kamailio: ERROR: mqueue [mqueue_db.c:101]: mqueue_db_load_queue(): no db connection May 31 23:07:47 asrock kamailio: ERROR: mqueue [mqueue_mod.c:251]: mq_param(): error loading mqueue: mqueue_dbtext from DB May 31 23:07:47 asrock kamailio: CRITICAL: <core> [core/cfg.y:3903]: yyerror_at(): parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 18, column 61: Can't set module parameter ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3474 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3474(a)github.com>

1 year, 2 months

git:master:848d5538: mqueue: fix support for db_text

by Ovidiu Sas

Module: kamailio Branch: master Commit: 848d55388dda0c135820d9f24950561946249bbc URL: https://github.com/kamailio/kamailio/commit/848d55388dda0c135820d9f24950561… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-12T00:24:15-04:00 mqueue: fix support for db_text - db_operations are safe only after db mod_init() - closes #3474 --- Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/848d55388dda0c135820d9f24950561… Patch: https://github.com/kamailio/kamailio/commit/848d55388dda0c135820d9f24950561… --- diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 912a36b33bb..d51b65f5d19 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -101,6 +101,8 @@ struct module_exports exports = { */ static int mod_init(void) { + mq_head_t *mh = mq_head_get(NULL); + if(!mq_head_defined()) LM_WARN("no mqueue defined\n"); @@ -109,6 +111,17 @@ static int mod_init(void) return 1; } + while(mh != NULL) { + if (mh->dbmode == 1 || mh->dbmode == 2) { + if(mqueue_db_load_queue(&(mh->name)) < 0) { + LM_ERR("error loading mqueue: %.*s from DB\n", + mh->name.len, mh->name.s); + return 1; + } + } + mh = mh->next; + } + return 0; } @@ -245,13 +258,6 @@ int mq_param(modparam_t type, void *val) } LM_INFO("mqueue param: [%.*s|%d|%d]\n", qname.len, qname.s, dbmode, addmode); - if(dbmode == 1 || dbmode == 2) { - if(mqueue_db_load_queue(&qname) < 0) { - LM_ERR("error loading mqueue: %.*s from DB\n", qname.len, qname.s); - free_params(params_list); - return -1; - } - } mq_set_dbmode(&qname, dbmode); free_params(params_list); return 0;

1 year, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2023