sr-dev October 2022

sr-dev@lists.kamailio.org

12 participants
200 discussions

git:master:51d2f707: nats: safety check for nats_workers and nats_pub_workers on mod destroy

by Daniel-Constantin Mierla

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"); }

2 years

git:master:51fc7673: pv: set str type for $hfl()

by Daniel-Constantin Mierla

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");

2 years

git:master:9ffafd5d: db_postgres: use DBG loglevel for memory cleanup, we output an error already

by Henning Westerholt

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;

2 years

git:master:baa961f6: modules: readme files regenerated - secfilter ... [skip ci]

by Kamailio Dev

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…

2 years, 1 month

[kamailio/kamailio] secfilter: cleanup old data after a reload by timer function (PR #3271)

by Jose Luis Verdeguer

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

2 years, 1 month

git:master:e7b3724d: secfilter: Added information about two new params in the README file [skip ci]

by Jose Luis Verdeguer

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>

2 years, 1 month

git:master:518f874e: secfilter: cleanup old data after a reload by timer function

by Jose Luis Verdeguer

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…

2 years, 1 month

[kamailio/kamailio] Pepelux/secfilter (PR #3270)

by Jose Luis Verdeguer

#### 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: - eload_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/3270 -- Commit Summary -- * secfilter: added locks while check list values * secfilter: lock position changed * secfilter: cleanup old data after a reload by timer function * Merge branch 'master' into pepelux/secfilter * secfilter: cleanup old data after a reload by timer function * secfilter: Added information about two new params in the README file [skip ci] * cleanup old data after a reload by timer function -- File Changes -- M src/modules/secfilter/doc/secfilter_admin.xml (41) 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/3270.patch https://github.com/kamailio/kamailio/pull/3270.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3270 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3270(a)github.com>

2 years, 1 month

[kamailio/kamailio] Pepelux/secfilter (PR #3269)

by Jose Luis Verdeguer

#### 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 - [ ] Related to issue #XXXX (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/3269 -- Commit Summary -- * secfilter: added locks while check list values * secfilter: lock position changed * secfilter: cleanup old data after a reload by timer function -- File Changes -- M src/modules/secfilter/secfilter.c (122) M src/modules/secfilter/secfilter.h (9) M src/modules/secfilter/secfilter_db.c (22) M src/modules/secfilter/secfilter_rpc.c (57) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3269.patch https://github.com/kamailio/kamailio/pull/3269.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3269 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3269(a)github.com>

2 years, 1 month

[kamailio/kamailio] secfilter crash when using kamcmd secfilter.reload (Issue #3263)

by amoizard

### Description Hello! I'm running a sip service and have several crash per day. The crash is happening in secfilter module, method "w_check_ip" line 651 https://github.com/kamailio/kamailio/blob/master/src/modules/secfilter/secf… #### Reproduction I noticed that every core is generated when I insert a new IP and most probably, when I call kamcmd secfilter.reload NOTE: I'm calling the above command line from the kamailio script #### Debugging Data ``` (gdb) bt #0 __strncasecmp_l_avx () at ../sysdeps/x86_64/multiarch/strcmp-sse42.S:271 #1 0x0000564a161b6413 in cmpi_str (s1=0x7f0bdcbc1b28, s2=0x7ffd88e2c580) at core/strutils.c:443 #2 0x00007f0bd069c983 in w_check_ip (msg=0x7f0be1619620) at secfilter.c:651 #3 0x0000564a15f8cafc in do_action (h=0x7ffd88e2d640, a=0x7f0be142f118, msg=0x7f0be1619620) at core/action.c:1079 #4 0x0000564a15f9bb26 in run_actions (h=0x7ffd88e2d640, a=0x7f0be14296e8, msg=0x7f0be1619620) at core/action.c:1584 #5 0x0000564a15f889d9 in do_action (h=0x7ffd88e2d640, a=0x7f0be15996f0, msg=0x7f0be1619620) at core/action.c:703 #6 0x0000564a15f9bb26 in run_actions (h=0x7ffd88e2d640, a=0x7f0be1598c70, msg=0x7f0be1619620) at core/action.c:1584 #7 0x0000564a15f9c3a0 in run_top_route (a=0x7f0be1598c70, msg=0x7f0be1619620, c=0x0) at core/action.c:1669 #8 0x0000564a160f2e96 in receive_msg ( buf=0x564a16549ea0 <buf> "REGISTER sip:sip.antisip.com SIP/2.0\r\nVia: SIP/2.0/UDP 10.1.1.78:5060;branch=z9hG4bKVsAO82I6G4Oe4Okgc;rport\r\nFrom: \"504f9410db5c\" <sip:XXXXXXXXXXXX@sip.antisip.com>;tag=D2yOicg8WAMe4Sii\r\nTo: \"XXXXXXXX"..., len=429, rcv_info=0x7ffd88e2daf0) at core/receive.c:501 #9 0x0000564a16251d97 in udp_rcv_loop () at core/udp_server.c:543 #10 0x0000564a15f75ce9 in main_loop () at main.c:1730 #11 0x0000564a15f829a1 in main (argc=10, argv=0x7ffd88e2e508) at main.c:3061 ``` #### Log Messages Oct 12 00:28:08 sip kamailio[19274]: ALERT: <core> [main.c:788]: handle_sigs(): child process 19474 exited by a signal 11 Oct 12 00:28:08 sip kamailio[19274]: ALERT: <core> [main.c:791]: handle_sigs(): core was generated Oct 12 00:28:08 sip kamailio[19274]: INFO: <core> [main.c:813]: handle_sigs(): terminating due to SIGCHLD #### SIP Traffic not applicable ### Possible Solutions I guess the secfilter reload is happening at the same time w_check_ip loops over the data. Some mutex should probably be missing. ### Additional Information Debian GNU/Linux 11 (bullseye) kamailio 5.5.5 (x86_64/linux) installed from http://deb.kamailio.org/ secfilter module hasn't changed much since 5.5.5, so I it looks like master branch is still affected. Thanks a lot. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3263 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3263(a)github.com>

2 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2022