sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
286 discussions

[kamailio/kamailio] presence: active_watcher cleanup timer (PR #3605)

by Victor Seva

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3074 #### Description Since some customers are complaining on leftovers at active_watchers. Let's create a cleanup timer for that table too. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3605 -- Commit Summary -- * presence: active_watcher cleanup timer -- File Changes -- M src/modules/presence/notify.c (33) M src/modules/presence/notify.h (1) M src/modules/presence/presence.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3605.patch https://github.com/kamailio/kamailio/pull/3605.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3605 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3605(a)github.com>

1 year, 1 month

git:master:f27eda6f: presence: active_watcher cleanup timer

by Victor Seva

Module: kamailio Branch: master Commit: f27eda6fe3d99d1352d4df86d79e4646b0a4c17a URL: https://github.com/kamailio/kamailio/commit/f27eda6fe3d99d1352d4df86d79e464… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-19T14:33:45+02:00 presence: active_watcher cleanup timer related #3074 --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/f27eda6fe3d99d1352d4df86d79e464… Patch: https://github.com/kamailio/kamailio/commit/f27eda6fe3d99d1352d4df86d79e464… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 4edbef12dbe..a3bba03e298 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -3197,3 +3197,36 @@ void pres_timer_send_notify(unsigned int ticks, void *param) return; } } + +void ps_active_watchers_db_timer_clean(unsigned int ticks, void *param) +{ + db_key_t db_keys[2]; + db_val_t db_vals[2]; + db_op_t db_ops[2]; + + if(pa_db == NULL) { + return; + } + + LM_DBG("cleaning expired active_watchers\n"); + + db_keys[0] = &str_expires_col; + db_ops[0] = OP_LT; + db_vals[0].type = DB1_INT; + db_vals[0].nul = 0; + db_vals[0].val.int_val = (int)time(NULL); + + db_keys[1] = &str_expires_col; + db_ops[1] = OP_GT; + db_vals[1].type = DB1_INT; + db_vals[1].nul = 0; + db_vals[1].val.int_val = 0; + + if(pa_dbf.use_table(pa_db, &active_watchers_table) < 0) { + LM_ERR("unsuccessful use table sql operation\n"); + return; + } + + if(pa_dbf.delete(pa_db, db_keys, db_ops, db_vals, 2) < 0) + LM_ERR("cleaning expired active_watchers\n"); +} diff --git a/src/modules/presence/notify.h b/src/modules/presence/notify.h index 4bac84b481a..3d875f3d452 100644 --- a/src/modules/presence/notify.h +++ b/src/modules/presence/notify.h @@ -129,4 +129,5 @@ char *get_status_str(int flag); str *get_p_notify_body(str pres_uri, pres_ev_t *event, str *etag, str *contact); void free_notify_body(str *body, pres_ev_t *ev); void pres_timer_send_notify(unsigned int ticks, void *param); +void ps_active_watchers_db_timer_clean(unsigned int ticks, void *param); #endif diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index a02c49baf01..93b89fdafa3 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -453,12 +453,16 @@ static int mod_init(void) if(pres_timer_mode == 0) { register_timer(ps_presentity_db_timer_clean, 0, pres_clean_period); register_timer(ps_watchers_db_timer_clean, 0, pres_clean_period); + register_timer( + ps_active_watchers_db_timer_clean, 0, pres_clean_period); if(publ_cache_mode == PS_PCACHE_RECORD) { register_timer(ps_ptable_timer_clean, 0, pres_clean_period); } } else { sr_wtimer_add(ps_presentity_db_timer_clean, 0, pres_clean_period); sr_wtimer_add(ps_watchers_db_timer_clean, 0, pres_clean_period); + sr_wtimer_add( + ps_active_watchers_db_timer_clean, 0, pres_clean_period); if(publ_cache_mode == PS_PCACHE_RECORD) { sr_wtimer_add(ps_ptable_timer_clean, 0, pres_clean_period); } @@ -1842,6 +1846,7 @@ void rpc_presence_cleanup(rpc_t *rpc, void *c) (void)ps_watchers_db_timer_clean(0, 0); (void)ps_presentity_db_timer_clean(0, 0); + (void)ps_active_watchers_db_timer_clean(0, 0); (void)ps_ptable_timer_clean(0, 0); (void)timer_db_update(0, 0);

1 year, 1 month

[kamailio/kamailio] Make tcp_check_timer default to depend on tcp_msg_data_timeout and tcp_msg_read_timeout values (PR #3608)

by juha-h

If `tcp_check_timer` is not set, use default value that is half of `tcp_msg_data_timeout` or `tcp_msg_read_timeout` value depending on which one is smaller and not zero. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3608 -- Commit Summary -- * Make tcp_check_timer default to depend on tcp_msg_data_timeout and -- File Changes -- M src/main.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3608.patch https://github.com/kamailio/kamailio/pull/3608.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3608 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3608(a)github.com>

1 year, 1 month

[kamailio/kamailio] tls: Add and apply tls_openssl_clear_errors function. (PR #3607)

by Xenofon Karamanos

#### 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/3607 -- Commit Summary -- * Add and apply tls_openssl_clear_errors function. -- File Changes -- M src/modules/tls/tls_ct_wrq.c (3) M src/modules/tls/tls_server.c (11) M src/modules/tls/tls_util.c (15) M src/modules/tls/tls_util.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3607.patch https://github.com/kamailio/kamailio/pull/3607.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3607 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3607(a)github.com>

1 year, 1 month

git:master:110ebbaf: tls: Add and apply tls_openssl_clear_errors function

by Henning Westerholt

Module: kamailio Branch: master Commit: 110ebbafadcc225f4e88749287f06ae29a6cfa2e URL: https://github.com/kamailio/kamailio/commit/110ebbafadcc225f4e88749287f06ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-10-19T12:18:38Z tls: Add and apply tls_openssl_clear_errors function --- Modified: src/modules/tls/tls_ct_wrq.c Modified: src/modules/tls/tls_server.c Modified: src/modules/tls/tls_util.c Modified: src/modules/tls/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/110ebbafadcc225f4e88749287f06ae… Patch: https://github.com/kamailio/kamailio/commit/110ebbafadcc225f4e88749287f06ae…

1 year, 1 month

git:master:5077127b: core: change tcp_check_timer initialization

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5077127b0fe1a2d803e42abe19cfcd93339f0519 URL: https://github.com/kamailio/kamailio/commit/5077127b0fe1a2d803e42abe19cfcd9… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-19T13:36:32+02:00 core: change tcp_check_timer initialization - make tcp_check_timer default to depend on tcp_msg_data_timeout and ksr_tcp_msg_read_timeout values, set to half of the minimum of the two, it is not explicitely set - GH #3608 --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5077127b0fe1a2d803e42abe19cfcd9… Patch: https://github.com/kamailio/kamailio/commit/5077127b0fe1a2d803e42abe19cfcd9… --- diff --git a/src/main.c b/src/main.c index 0fa2da6ec27..e299db3b319 100644 --- a/src/main.c +++ b/src/main.c @@ -535,7 +535,7 @@ int ksr_tcp_msg_read_timeout = 20; /* timeout (secs) to read SIP message */ int ksr_tcp_msg_data_timeout = 20; /* timeout (secs) to receive first msg data */ int ksr_tcp_accept_iplimit = 1024; /* limit of accepted connections per IP */ -int ksr_tcp_check_timer = 10; /* seconds to check tcp connections */ +int ksr_tcp_check_timer = -1; /* seconds to check tcp connections */ /* memory manager */ #define SR_MEMMNG_DEFAULT "qm" @@ -1726,12 +1726,25 @@ int main_loop(void) cfg_main_reset_local(); #ifdef USE_TCP - if(!tcp_disable && ksr_tcp_check_timer > 0) { - if(sr_wtimer_add( - tcp_timer_check_connections, NULL, ksr_tcp_check_timer) - < 0) { - LM_CRIT("cannot add timer for tcp connection checks\n"); - goto error; + if(!tcp_disable) { + if(ksr_tcp_check_timer == -1) { + if(ksr_tcp_msg_data_timeout > 0 && ksr_tcp_msg_read_timeout > 0) + ksr_tcp_check_timer = MIN(ksr_tcp_msg_data_timeout, + ksr_tcp_msg_read_timeout) + / 2; + else + ksr_tcp_check_timer = + ksr_tcp_msg_data_timeout > 0 + ? ksr_tcp_msg_data_timeout / 2 + : ksr_tcp_msg_read_timeout / 2; + } + if(ksr_tcp_check_timer > 0) { + if(sr_wtimer_add(tcp_timer_check_connections, NULL, + ksr_tcp_check_timer) + < 0) { + LM_CRIT("cannot add timer for tcp connection checks\n"); + goto error; + } } } #endif

1 year, 1 month

git:master:1acede64: core: added tcp_check_timer parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1acede64041307b783ed90736ca114917bafbc14 URL: https://github.com/kamailio/kamailio/commit/1acede64041307b783ed90736ca1149… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-16T08:35:09+02:00 core: added tcp_check_timer parameter - set the check interval (in seconds) for tcp connections - default 10 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1acede64041307b783ed90736ca1149… Patch: https://github.com/kamailio/kamailio/commit/1acede64041307b783ed90736ca1149… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index c8548c4eb6a..44c62279b7d 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -367,6 +367,7 @@ MAXSNDBUFFER maxsndbuffer SQL_BUFFER_SIZE sql_buffer_size MSG_RECV_MAX_SIZE msg_recv_max_size TCP_MSG_READ_TIMEOUT tcp_msg_read_timeout +TCP_CHECK_TIMER tcp_check_timer CHILDREN children SOCKET socket BIND bind @@ -854,6 +855,7 @@ IMPORTFILE "import_file" <INITIAL>{SQL_BUFFER_SIZE} { count(); yylval.strval=yytext; return SQL_BUFFER_SIZE; } <INITIAL>{MSG_RECV_MAX_SIZE} { count(); yylval.strval=yytext; return MSG_RECV_MAX_SIZE; } <INITIAL>{TCP_MSG_READ_TIMEOUT} { count(); yylval.strval=yytext; return TCP_MSG_READ_TIMEOUT; } +<INITIAL>{TCP_CHECK_TIMER} { count(); yylval.strval=yytext; return TCP_CHECK_TIMER; } <INITIAL>{CHILDREN} { count(); yylval.strval=yytext; return CHILDREN; } <INITIAL>{SOCKET} { count(); yylval.strval=yytext; return SOCKET; } <INITIAL>{BIND} { count(); yylval.strval=yytext; return BIND; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 9c7efd83f92..a5e16e259e1 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -423,6 +423,7 @@ extern char *default_routename; %token SQL_BUFFER_SIZE %token MSG_RECV_MAX_SIZE %token TCP_MSG_READ_TIMEOUT +%token TCP_CHECK_TIMER %token USER %token GROUP %token CHROOT @@ -1019,6 +1020,8 @@ assign_stm: | MSG_RECV_MAX_SIZE EQUAL error { yyerror("number expected"); } | TCP_MSG_READ_TIMEOUT EQUAL NUMBER { ksr_tcp_msg_read_timeout=$3; } | TCP_MSG_READ_TIMEOUT EQUAL error { yyerror("number expected"); } + | TCP_CHECK_TIMER EQUAL NUMBER { ksr_tcp_check_timer=$3; } + | TCP_CHECK_TIMER EQUAL error { yyerror("number expected"); } | CHILDREN EQUAL NUMBER { children_no=$3; } | CHILDREN EQUAL error { yyerror("number expected"); } | STATS_NAMESEP EQUAL STRING { ksr_stats_namesep=$3; } diff --git a/src/core/globals.h b/src/core/globals.h index 91c97ae9a4a..aac82563d51 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -240,6 +240,7 @@ extern int ksr_rpc_exec_delta; extern int ksr_msg_recv_max_size; extern int ksr_tcp_msg_read_timeout; +extern int ksr_tcp_check_timer; #ifdef USE_DNS_CACHE extern int diff --git a/src/main.c b/src/main.c index 719debba099..a949d930407 100644 --- a/src/main.c +++ b/src/main.c @@ -532,6 +532,7 @@ char *pgid_file = 0; int ksr_msg_recv_max_size = 32767; /* 2^15 - 1 */ int ksr_tcp_msg_read_timeout = KSR_TCP_MSGREAD_TIMEOUT; +int ksr_tcp_check_timer = 10; /* seconds to check tcp connections */ /* memory manager */ #define SR_MEMMNG_DEFAULT "qm" @@ -1722,8 +1723,10 @@ int main_loop(void) cfg_main_reset_local(); #ifdef USE_TCP - if(!tcp_disable) { - if(sr_wtimer_add(tcp_timer_check_connections, NULL, 10) < 0) { + if(!tcp_disable && ksr_tcp_check_timer > 0) { + if(sr_wtimer_add( + tcp_timer_check_connections, NULL, ksr_tcp_check_timer) + < 0) { LM_CRIT("cannot add timer for tcp connection checks\n"); goto error; }

1 year, 1 month

[kamailio/kamailio] tm:local-request not documented (#980)

by Olle E. Johansson

The local-request event route is not documented. When using our friend google I find an old blog post by @miconda but not much else. I can come up with some good text, but need to know what can be done in the route, like - modify request uri - add/remove headers - drop request - add/modify destination uri ($du) -- 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/issues/980

1 year, 1 month

[kamailio/kamailio] tools: route_graph - added README file (PR #3604)

by VoIPNuggets.com

#### 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/3604 -- Commit Summary -- * tools: route_graph - added README file -- File Changes -- A misc/tools/route_graph/README (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3604.patch https://github.com/kamailio/kamailio/pull/3604.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3604 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3604(a)github.com>

1 year, 1 month

git:master:976da8c7: tools: route_graph - added README file and updated reference URL [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 976da8c72e9a056b724f584a803a4a8114f70d30 URL: https://github.com/kamailio/kamailio/commit/976da8c72e9a056b724f584a803a4a8… Author: VoIPNuggets.com <akash(a)voipnuggets.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-18T12:15:55+02:00 tools: route_graph - added README file and updated reference URL [skip ci] --- Added: misc/tools/route_graph/README --- Diff: https://github.com/kamailio/kamailio/commit/976da8c72e9a056b724f584a803a4a8… Patch: https://github.com/kamailio/kamailio/commit/976da8c72e9a056b724f584a803a4a8… --- diff --git a/misc/tools/route_graph/README b/misc/tools/route_graph/README new file mode 100644 index 00000000000..c78cc8c49db --- /dev/null +++ b/misc/tools/route_graph/README @@ -0,0 +1,16 @@ +This Python script, route_graph.py, serves as a utility tool for visualizing Kamailio SIP server configuration files. +It generates a graphical representation of the routing logic defined in the configuration. + +Usage: +1. Clone the GitHub repository: + git clone https://github.com/kamailio/kamailio.git +2. Navigate to the tool's directory: + cd kamailio/misc/tools/route_graph/ +3. Run the script on your Kamailio configuration file: + python3 route_graph.py /path/to/kamailio.cfg + +For a more detailed walkthrough, please refer to this article: +Visualizing Kamailio Configuration File Using Route Graph Tool. +https://voipnuggets.com/2023/06/13/visualizing-kamailio-configuration-file-using-route_graph-tool/ + +[ README written by Akash Gupta ]

1 year, 1 month

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023