sr-dev October 2022

sr-dev@lists.kamailio.org

12 participants
203 discussions

git:master:3bcef382: rtp_media_server: init global variables
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 3bcef382b810b4cd2a5a03b079086fee3bbbe187 URL: https://github.com/kamailio/kamailio/commit/3bcef382b810b4cd2a5a03b079086fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T18:45:33+02:00 rtp_media_server: init global variables --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/3bcef382b810b4cd2a5a03b079086fe… Patch: https://github.com/kamailio/kamailio/commit/3bcef382b810b4cd2a5a03b079086fe… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index cbe5798518..efd4c26f68 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -23,7 +23,7 @@ extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; -gen_lock_t *dialog_list_mutex; +gen_lock_t *dialog_list_mutex = NULL; static void rms_action_free(rms_dialog_info_t *si) { diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index cb4939f840..bc528d40a3 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -24,20 +24,22 @@ MODULE_VERSION -rms_dialog_info_t *rms_dialog_list; -static int mod_init(void); -static void mod_destroy(void); -static int child_init(int); +rms_dialog_info_t *rms_dialog_list = NULL; + str playback_fn = {0, 0}; str log_fn = {0, 0}; static char *rms_bridge_default_route = "rms:bridged"; static char *rms_answer_default_route = "rms:start"; -int in_rms_process; -rms_t *rms; +int in_rms_process = 0; +rms_t *rms = NULL; struct tm_binds tmb; +static int mod_init(void); +static void mod_destroy(void); +static int child_init(int); + static rms_dialog_info_t *rms_dialog_create_leg(rms_dialog_info_t *di, struct sip_msg *msg); static int fixup_rms_action_play(void **param, int param_no); static int fixup_rms_bridge(void **param, int param_no);

1 0

git:master:d5afbf0f: nats: formatted module exports structures
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: d5afbf0fb2f006d38fdfe32f6d2094638ad938b0 URL: https://github.com/kamailio/kamailio/commit/d5afbf0fb2f006d38fdfe32f6d20946… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T10:16:07+02:00 nats: formatted module exports structures --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5afbf0fb2f006d38fdfe32f6d20946… Patch: https://github.com/kamailio/kamailio/commit/d5afbf0fb2f006d38fdfe32f6d20946… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 344466a586..5285158ec8 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -18,8 +18,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * */ #include "defs.h" @@ -44,36 +42,40 @@ static str nats_event_callback = STR_NULL; static nats_evroutes_t _nats_rts = {0}; +/* clang-format off */ static pv_export_t nats_mod_pvs[] = { - {{"natsData", (sizeof("natsData") - 1)}, PVT_OTHER, + {{"natsData", (sizeof("natsData") - 1)}, PVT_OTHER, nats_pv_get_event_payload, 0, 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"nats_url", PARAM_STRING | USE_FUNC_PARAM, (void *)_init_nats_server_url_add}, - {"num_publish_workers", INT_PARAM, &nats_pub_workers_num}, - {"subject_queue_group", PARAM_STRING | USE_FUNC_PARAM, - (void *)_init_nats_sub_add}, - {"event_callback", PARAM_STR, &nats_event_callback}, - {0, 0, 0} + {"nats_url", PARAM_STRING|USE_FUNC_PARAM, (void*)_init_nats_server_url_add}, + {"num_publish_workers", INT_PARAM, &nats_pub_workers_num}, + {"subject_queue_group", PARAM_STRING|USE_FUNC_PARAM, (void*)_init_nats_sub_add}, + {"event_callback", PARAM_STR, &nats_event_callback}, + {0, 0, 0} }; -static cmd_export_t cmds[] = {{"nats_publish", (cmd_function)w_nats_publish_f, - 2, fixup_publish_get_value, - fixup_publish_get_value_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"nats_publish", (cmd_function)w_nats_publish_f, + 2, fixup_publish_get_value, fixup_publish_get_value_free, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "nats", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported MI functions */ - nats_mod_pvs, /* exported pseudo-variables */ - 0, /* response function*/ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy /* destroy function */ + "nats", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* Exported parameters */ + 0, /* exported MI functions */ + nats_mod_pvs, /* exported pseudo-variables */ + 0, /* response function*/ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ static void onMsg( natsConnection *nc, natsSubscription *sub, natsMsg *msg, void *closure)

1 0

git:master:619ff95d: nats: init global variables
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 619ff95d760c9b98df515ddccc5aa1e39275beeb URL: https://github.com/kamailio/kamailio/commit/619ff95d760c9b98df515ddccc5aa1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T10:08:42+02:00 nats: init global variables --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/619ff95d760c9b98df515ddccc5aa1e… Patch: https://github.com/kamailio/kamailio/commit/619ff95d760c9b98df515ddccc5aa1e… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 6d26b621ec..344466a586 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -35,14 +35,14 @@ nats_consumer_worker_t *nats_workers = NULL; nats_pub_worker_t *nats_pub_workers = NULL; int nats_pub_workers_num = DEFAULT_NUM_PUB_WORKERS; -int _nats_proc_count; +static int _nats_proc_count = 0; char *eventData = NULL; int *nats_pub_worker_pipes_fds = NULL; int *nats_pub_worker_pipes = NULL; static str nats_event_callback = STR_NULL; -static nats_evroutes_t _nats_rts; +static nats_evroutes_t _nats_rts = {0}; static pv_export_t nats_mod_pvs[] = { {{"natsData", (sizeof("natsData") - 1)}, PVT_OTHER,

1 0

git:master:51d2f707: nats: safety check for nats_workers and nats_pub_workers on mod destroy
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 51d2f707562f70749dd02727a34dc5e4fa20712e URL: https://github.com/kamailio/kamailio/commit/51d2f707562f70749dd02727a34dc5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T10:06:06+02:00 nats: safety check for nats_workers and nats_pub_workers on mod destroy --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/51d2f707562f70749dd02727a34dc5e… Patch: https://github.com/kamailio/kamailio/commit/51d2f707562f70749dd02727a34dc5e… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index b89bab5bd1..6d26b621ec 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -549,47 +549,51 @@ int nats_destroy_workers() int i; nats_consumer_worker_t *worker; nats_pub_worker_t *pub_worker; - for(i = 0; i < _nats_proc_count; i++) { - worker = &nats_workers[i]; - if(worker != NULL) { - if(worker->subscription != NULL) { - natsSubscription_Unsubscribe(worker->subscription); - natsSubscription_Destroy(worker->subscription); - } - if(worker->uvLoop != NULL) { - uv_loop_close(worker->uvLoop); - } - if(worker->subject != NULL) { - shm_free(worker->subject); - } - if(worker->queue_group != NULL) { - shm_free(worker->queue_group); - } - if(worker->nc != NULL) { - if(nats_cleanup_connection(worker->nc) < 0) { - LM_ERR("could not cleanup worker connection\n"); + if(nats_workers != NULL) { + for(i = 0; i < _nats_proc_count; i++) { + worker = &nats_workers[i]; + if(worker != NULL) { + if(worker->subscription != NULL) { + natsSubscription_Unsubscribe(worker->subscription); + natsSubscription_Destroy(worker->subscription); } - } - if(worker->on_message != NULL) { - if (worker->on_message->_evname) { - free(worker->on_message->_evname); + if(worker->uvLoop != NULL) { + uv_loop_close(worker->uvLoop); + } + if(worker->subject != NULL) { + shm_free(worker->subject); } - shm_free(worker->on_message); + if(worker->queue_group != NULL) { + shm_free(worker->queue_group); + } + if(worker->nc != NULL) { + if(nats_cleanup_connection(worker->nc) < 0) { + LM_ERR("could not cleanup worker connection\n"); + } + } + if(worker->on_message != NULL) { + if (worker->on_message->_evname) { + free(worker->on_message->_evname); + } + shm_free(worker->on_message); + } + shm_free(worker); } - shm_free(worker); } } - for(i = 0; i < nats_pub_workers_num; i++) { - pub_worker = &nats_pub_workers[i]; - if(pub_worker != NULL) { - if(pub_worker->nc != NULL) { - if(nats_cleanup_connection(pub_worker->nc) < 0) { - LM_ERR("could not cleanup worker connection\n"); + if(nats_pub_workers != NULL) { + for(i = 0; i < nats_pub_workers_num; i++) { + pub_worker = &nats_pub_workers[i]; + if(pub_worker != NULL) { + if(pub_worker->nc != NULL) { + if(nats_cleanup_connection(pub_worker->nc) < 0) { + LM_ERR("could not cleanup worker connection\n"); + } } + uv_poll_stop(&pub_worker->poll); + shm_free(pub_worker); } - uv_poll_stop(&pub_worker->poll); - shm_free(pub_worker); } } return 0; @@ -600,9 +604,6 @@ int nats_destroy_workers() */ static void mod_destroy(void) { - if(nats_workers==NULL) { - return; - } if(nats_destroy_workers() < 0) { LM_ERR("could not cleanup workers\n"); }

1 0

git:master:51fc7673: pv: set str type for $hfl()
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 51fc76737319f9b06ee4aa86e8c15c3fd5b62248 URL: https://github.com/kamailio/kamailio/commit/51fc76737319f9b06ee4aa86e8c15c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T09:53:26+02:00 pv: set str type for $hfl() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/51fc76737319f9b06ee4aa86e8c15c3… Patch: https://github.com/kamailio/kamailio/commit/51fc76737319f9b06ee4aa86e8c15c3… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 903389bf59..d279afccbf 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2287,6 +2287,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + res->flags = PV_VAL_STR; if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { if(msg->h_via1==NULL) { LM_WARN("no Via header\n");

1 0

git:master:9ffafd5d: db_postgres: use DBG loglevel for memory cleanup, we output an error already
by Henning Westerholt 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 9ffafd5d218eeec158081ae51c994ececab43944 URL: https://github.com/kamailio/kamailio/commit/9ffafd5d218eeec158081ae51c994ec… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-25T06:28:51Z db_postgres: use DBG loglevel for memory cleanup, we output an error already --- Modified: src/modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/9ffafd5d218eeec158081ae51c994ec… Patch: https://github.com/kamailio/kamailio/commit/9ffafd5d218eeec158081ae51c994ec… --- diff --git a/src/modules/db_postgres/km_pg_con.c b/src/modules/db_postgres/km_pg_con.c index 895c644db67..02ceecffeb7 100644 --- a/src/modules/db_postgres/km_pg_con.c +++ b/src/modules/db_postgres/km_pg_con.c @@ -159,7 +159,7 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) err: if(ptr) { - LM_ERR("cleaning up %p=pkg_free()\n", ptr); + LM_DBG("cleaning up %p=pkg_free()\n", ptr); pkg_free(ptr); } return 0;

1 0

git:master:baa961f6: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 22 Oct '22

22 Oct '22

Module: kamailio Branch: master Commit: baa961f60508f7bcc0564059eeb86981a79f6d42 URL: https://github.com/kamailio/kamailio/commit/baa961f60508f7bcc0564059eeb8698… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-22T16:46:18+02:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/baa961f60508f7bcc0564059eeb8698… Patch: https://github.com/kamailio/kamailio/commit/baa961f60508f7bcc0564059eeb8698…

1 0

[kamailio/kamailio] secfilter: cleanup old data after a reload by timer function (PR #3271)
by Jose Luis Verdeguer 22 Oct '22

22 Oct '22

#### 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) - [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 - [x] Related to issue #3263 (replace XXXX with an open issue number) #### Description  New params: - reload_delta: To set the number of seconds that have to be waited before executing a new RPC reload - cleanup_interval: To set the number of seconds that have to be wait before cleanup the previous values from memory after a RPC reload The purpose is to avoid problems when accessing data lists while doing an RPC reload. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3271 -- Commit Summary -- * secfilter: cleanup old data after a reload by timer function -- File Changes -- M src/modules/secfilter/secfilter.c (148) M src/modules/secfilter/secfilter.h (9) M src/modules/secfilter/secfilter_db.c (22) M src/modules/secfilter/secfilter_rpc.c (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3271.patch https://github.com/kamailio/kamailio/pull/3271.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3271 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3271(a)github.com>

1 2

git:master:e7b3724d: secfilter: Added information about two new params in the README file [skip ci]
by Jose Luis Verdeguer 22 Oct '22

22 Oct '22

Module: kamailio Branch: master Commit: e7b3724d3fc514c8a541a6a7f7fb1a782f21f2e7 URL: https://github.com/kamailio/kamailio/commit/e7b3724d3fc514c8a541a6a7f7fb1a7… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-10-22T16:43:26+02:00 secfilter: Added information about two new params in the README file [skip ci] --- Modified: src/modules/secfilter/doc/secfilter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e7b3724d3fc514c8a541a6a7f7fb1a7… Patch: https://github.com/kamailio/kamailio/commit/e7b3724d3fc514c8a541a6a7f7fb1a7… --- diff --git a/src/modules/secfilter/doc/secfilter_admin.xml b/src/modules/secfilter/doc/secfilter_admin.xml index fff4ca3b2c8..48c54868de6 100644 --- a/src/modules/secfilter/doc/secfilter_admin.xml +++ b/src/modules/secfilter/doc/secfilter_admin.xml @@ -212,6 +212,47 @@ </programlisting> </example> </section> + + <section id="secfilter.p.reload_delta"> + <title><varname>reload_delta</varname> (integer)</title> + + <para> + The number of seconds that have to be waited before executing a new RPC reload. + By default there is a rate limiting of maximum one reload in five seconds. + + If set to <emphasis>0</emphasis>, no rate limit is configured. + </para> + <para><emphasis> Default value is 5</emphasis></para> + + <example> + <title>Set <varname>reload_delta</varname> parameter</title> + + <programlisting format="linespecific"> + ... + modparam("secfilter", "reload_delta", 1) + ... + </programlisting> + </example> + </section> + + <section id="secfilter.p.cleanup_interval"> + <title><varname>cleanup_interval</varname> (integer)</title> + + <para> + The number of seconds that have to be wait before cleanup the previous values from memory after a RPC reload. + </para> + <para><emphasis> Default value is 60</emphasis></para> + + <example> + <title>Set <varname>cleanup_interval</varname> parameter</title> + + <programlisting format="linespecific"> + ... + modparam("secfilter", "cleanup_interval", 120) + ... + </programlisting> + </example> + </section> </section> <section>

1 0

git:master:518f874e: secfilter: cleanup old data after a reload by timer function
by Jose Luis Verdeguer 22 Oct '22

22 Oct '22

Module: kamailio Branch: master Commit: 518f874e7e177e5696b76c7148c1b4d2c9ab7af4 URL: https://github.com/kamailio/kamailio/commit/518f874e7e177e5696b76c7148c1b4d… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-10-22T16:43:26+02:00 secfilter: cleanup old data after a reload by timer function --- Modified: src/modules/secfilter/secfilter.c Modified: src/modules/secfilter/secfilter.h Modified: src/modules/secfilter/secfilter_db.c Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/518f874e7e177e5696b76c7148c1b4d… Patch: https://github.com/kamailio/kamailio/commit/518f874e7e177e5696b76c7148c1b4d…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2022