sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
308 discussions

by MD-star-cloud33

#### 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/3476 -- Commit Summary -- * github/workflow: add gcc-problem-patcher [skip ci] * Update Makefile -- File Changes -- M .github/workflows/main.yml (1) M src/Makefile (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3476.patch https://github.com/kamailio/kamailio/pull/3476.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3476 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3476(a)github.com>

1 year, 5 months

git:master:c285b16b: Makefile: fixed paths for init.d scripts install on debian and centos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c285b16bc066ca4236ee00cf3e7fb24539fa9f2b URL: https://github.com/kamailio/kamailio/commit/c285b16bc066ca4236ee00cf3e7fb24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T11:16:51+02:00 Makefile: fixed paths for init.d scripts install on debian and centos - GH #3476 --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c285b16bc066ca4236ee00cf3e7fb24… Patch: https://github.com/kamailio/kamailio/commit/c285b16bc066ca4236ee00cf3e7fb24… --- diff --git a/src/Makefile b/src/Makefile index 46847d03cc..6c2b35b415 100644 --- a/src/Makefile +++ b/src/Makefile @@ -982,11 +982,11 @@ install_initd_debian install-initd-debian: -e "s#HOMEDIR=/run/kamailio#HOMEDIR=/run/$(NAME)#g" \ -e "s#DEFAULTS=/etc/default/kamailio#DEFAULTS=/etc/default/$(NAME)#g" \ -e "s#CFGFILE=/etc/kamailio/kamailio.cfg#CFGFILE=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ - < pkg/kamailio/deb/debian/kamailio.init \ + < ../pkg/kamailio/deb/debian/kamailio.init \ > /etc/init.d/$(NAME) chmod +x /etc/init.d/$(NAME) sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ - < pkg/kamailio/deb/debian/kamailio.default \ + < ../pkg/kamailio/deb/debian/kamailio.default \ > /etc/default/$(NAME) mkdir -p /run/$(NAME) adduser --quiet --system --group --disabled-password \ @@ -1002,13 +1002,13 @@ install_initd_centos install-initd-centos: -e "s#PID_FILE=/run/kamailio.pid#PID_FILE=/run/$(NAME).pid#g" \ -e "s#LOCK_FILE=/var/lock/subsys/kamailio#LOCK_FILE=/var/lock/subsys/$(NAME)#g" \ -e "s#KAMCFG=/etc/kamailio/kamailio.cfg#KAMCFG=$(cfg_prefix)/$(cfg_dir)$(NAME).cfg#g" \ - < pkg/kamailio/rpm/kamailio.init \ + < ../pkg/kamailio/rpm/kamailio.init \ > /etc/init.d/$(NAME) chmod +x /etc/init.d/$(NAME) sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ -e "s#USER=kamailio#USER=$(NAME)#g" \ -e "s#GROUP=kamailio#GROUP=$(NAME)#g" \ - < pkg/kamailio/rpm/kamailio.default \ + < ../pkg/kamailio/rpm/kamailio.default \ > /etc/default/$(NAME) mkdir -p /run/$(NAME) /usr/sbin/groupadd -r $(NAME)

1 year, 5 months

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, 5 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, 5 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, 5 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, 5 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, 5 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, 5 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, 5 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, 5 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