sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

The recursive lock of tm module is not safe?
by 王斌 14 Apr '22

14 Apr '22

Hi： See lock_hash in h_table.c: Flowing lines of code do not guarantee atomicity and I think it is not safe: - atomic_get(&_tm_table->entries[i].locker_pid) != mypid - lock(&_tm_table->entries[i].mutex) - atomic_set(&_tm_table->entries[i].locker_pid, mypid) Would you mind solving my confusion? Best Regards!

2 1

git:master:190e172f: siprepo: timer routing to clean up stored items
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: 190e172fee572c169a0caa14bb08d7d271aa4f48 URL: https://github.com/kamailio/kamailio/commit/190e172fee572c169a0caa14bb08d7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T10:02:50+02:00 siprepo: timer routing to clean up stored items --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/190e172fee572c169a0caa14bb08d7d… Patch: https://github.com/kamailio/kamailio/commit/190e172fee572c169a0caa14bb08d7d… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 9010eceb6d..55deed3b75 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -43,6 +43,7 @@ static siprepo_slot_t *_siprepo_table = NULL; extern int _siprepo_table_size; +extern int _siprepo_expire; /** * @@ -342,3 +343,47 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) return 0; } + +/** + * + */ +void siprepo_timer_exec(unsigned int ticks, int worker, void *param) +{ + time_t tnow; + int i; + siprepo_msg_t *it = NULL; + siprepo_msg_t *elist = NULL; + + tnow = time(NULL); + for(i=0; i<_siprepo_table_size; i++) { + lock_get(&_siprepo_table[i].lock); + for(it=_siprepo_table[i].plist; it!=NULL; it=it->next) { + if(it->itime+_siprepo_expire < tnow) { + if(it->prev==NULL) { + _siprepo_table[i].plist = it->next; + if(_siprepo_table[i].plist) { + _siprepo_table[i].plist->prev = NULL; + } + } else { + it->prev->next = it->next; + } + if(it->next!=NULL) { + it->next->prev = it->prev; + } + if(elist) { + it->next = elist; + elist = it; + } else { + it->next = NULL; + elist = it; + } + } + } + lock_release(&_siprepo_table[i].lock); + } + while(elist) { + it = elist; + elist = elist->next; + shm_free(it); + } +} diff --git a/src/modules/siprepo/siprepo_data.h b/src/modules/siprepo/siprepo_data.h index f7c01fbf28..ed568fa90a 100644 --- a/src/modules/siprepo/siprepo_data.h +++ b/src/modules/siprepo/siprepo_data.h @@ -55,5 +55,6 @@ int siprepo_msg_set(sip_msg_t *msg, str *msgid); int siprepo_msg_rm(sip_msg_t *msg, str *callid, str *msgid); int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname); int siprepo_msg_check(sip_msg_t *msg); +void siprepo_msg_timer(unsigned int ticks, int worker, void *param); #endif diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index 129317b853..5a3210d425 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -32,6 +32,7 @@ #include "../../core/receive.h" #include "../../core/mod_fix.h" #include "../../core/async_task.h" +#include "../../core/timer_proc.h" #include "../../core/kemi.h" #include "siprepo_data.h" @@ -54,6 +55,8 @@ static int w_sr_msg_async_pull(sip_msg_t *msg, char *pcallid, char *pmsgid, static int w_sr_msg_rm(sip_msg_t *msg, char *pcallid, char *pmsgid); static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2); +static void siprepo_timer_exec(unsigned int ticks, int worker, void *param); + /* clang-format off */ typedef struct sworker_task_param { char *buf; @@ -108,6 +111,7 @@ static int mod_init(void) LM_ERR("failed to initialize hash table\n"); return -1; } + register_basic_timers(_siprepo_timer_procs); return 0; } @@ -116,6 +120,21 @@ static int mod_init(void) */ static int child_init(int rank) { + int i; + char si_desc[MAX_PT_DESC]; + + if(rank!=PROC_MAIN) { + return 0; + } + for(i=0; i<_siprepo_timer_procs; i++) { + snprintf(si_desc, MAX_PT_DESC, "SIPREPO child=%d", i); + if(fork_basic_timer_w(PROC_TIMER, si_desc, 1 /*socks flag*/, + siprepo_timer_exec, i, NULL, _siprepo_timer_interval + /*sec*/)<0) { + LM_ERR("failed to start timer routine as process\n"); + return -1; /* error */ + } + } return 0; } @@ -295,6 +314,11 @@ static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2) return ki_sr_msg_check(msg); } +static void siprepo_timer_exec(unsigned int ticks, int worker, void *param) +{ + siprepo_msg_timer(ticks, worker, param); +} + /** * */

1 0

git:master:4e86a159: siprepo: new module to store sip message content in a hash table
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Module: kamailio Branch: master Commit: 4e86a15979249a881ccbe4828588e8be0f241626 URL: https://github.com/kamailio/kamailio/commit/4e86a15979249a881ccbe4828588e8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T07:54:20+02:00 siprepo: new module to store sip message content in a hash table - push/pull sip messages - wip --- Added: src/modules/siprepo/Makefile Added: src/modules/siprepo/README Added: src/modules/siprepo/doc/Makefile Added: src/modules/siprepo/doc/siprepo.xml Added: src/modules/siprepo/doc/siprepo_admin.xml Added: src/modules/siprepo/siprepo_data.c Added: src/modules/siprepo/siprepo_data.h Added: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4e86a15979249a881ccbe4828588e8b… Patch: https://github.com/kamailio/kamailio/commit/4e86a15979249a881ccbe4828588e8b…

1 0

Roadmap to the next major release - v5.6.0
by Daniel-Constantin Mierla 14 Apr '22

14 Apr '22

Hello, it is the time to plan a bit the road to the next major release, to be versioned 5.6.0. The 5.5.0 was release about one year ago, therefore it is time to set the milestones for getting 5.6.0 out. I would propose to freeze the development on Thursday, April 14, 2020, test till mid of May or so, then release v5.6.0. There is a lot of development to existing components and a couple of new modules. If anyone wants a different time line towards 5.6.0, let's discuss and choose the one that suits most of the developers. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:master:d542cb89: htable: reset entries field if hash table initialization fails
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: d542cb89afb1a34cba35cbcf0f40315581fbb767 URL: https://github.com/kamailio/kamailio/commit/d542cb89afb1a34cba35cbcf0f40315… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T12:52:15+02:00 htable: reset entries field if hash table initialization fails --- Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d542cb89afb1a34cba35cbcf0f40315… Patch: https://github.com/kamailio/kamailio/commit/d542cb89afb1a34cba35cbcf0f40315… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index daf088d1f8..00023e7153 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -395,7 +395,6 @@ int ht_init_tables(void) if(ht->entries==NULL) { LM_ERR("no more shared memory for [%.*s]\n", ht->name.len, ht->name.s); - shm_free(ht); return -1; } memset(ht->entries, 0, ht->htsize*sizeof(ht_entry_t)); @@ -413,7 +412,7 @@ int ht_init_tables(void) i--; } shm_free(ht->entries); - shm_free(ht); + ht->entries = NULL; return -1; }

1 0

git:master:b1fa63b1: htable: track when records were successfully loaded from database
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: b1fa63b1547fc5af6cc1e97db42ea76db1bf927b URL: https://github.com/kamailio/kamailio/commit/b1fa63b1547fc5af6cc1e97db42ea76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T13:11:30+02:00 htable: track when records were successfully loaded from database - write back only in such case --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/ht_db.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/b1fa63b1547fc5af6cc1e97db42ea76… Patch: https://github.com/kamailio/kamailio/commit/b1fa63b1547fc5af6cc1e97db42ea76… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 00023e7153..f212600e21 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -1099,7 +1099,7 @@ int ht_db_sync_tables(void) ht = _ht_root; while(ht) { - if(ht->dbtable.len>0 && ht->dbmode!=0 && ht->ncols==0) + if(ht->dbtable.len>0 && ht->dbmode!=0 && ht->dbload!=0 && ht->ncols==0) { LM_DBG("sync db table [%.*s] from ht [%.*s]\n", ht->dbtable.len, ht->dbtable.s, diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4cee835325..b3d0436ea3 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -63,6 +63,7 @@ typedef struct _ht unsigned int htexpire; str dbtable; int dbmode; + int dbload; int ncols; str scols[HT_MAX_COLS]; char pack[4]; diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 5cdecb1814..5b9a5942ed 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -211,6 +211,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) LM_ERR("failed to use_table\n"); return -1; } + ht->dbload = 0; if(ht->ncols>0) { db_ord = &ht->scols[0]; for(c=0; c<ht->ncols; c++) { @@ -527,6 +528,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) ht_dbf.free_result(ht_db_con, db_res); LM_DBG("loaded %d values in hash table\n", cnt); + ht->dbload = 1; return 0; error: diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index f7a9cb389a..fea9786298 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -2053,6 +2053,8 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) ht_slot_unlock(ht, i); nht.entries[i].first = first; } + ht->dbload = 1; + /* free old entries */ for(i=0; i<nht.htsize; i++) {

1 0

git:master:9a8974a8: htable: check if entries are initialized before sync'ing to db
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 9a8974a80b8ce5ffc9166e81f43f8581777cd48f URL: https://github.com/kamailio/kamailio/commit/9a8974a80b8ce5ffc9166e81f43f858… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T17:05:18+02:00 htable: check if entries are initialized before sync'ing to db --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/9a8974a80b8ce5ffc9166e81f43f858… Patch: https://github.com/kamailio/kamailio/commit/9a8974a80b8ce5ffc9166e81f43f858… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 5b9a5942ed..cbce085f6c 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -551,6 +551,11 @@ int ht_db_save_table(ht_t *ht, str *dbtable) time_t now; int ncols; + if(ht==NULL || ht->entries==NULL) { + LM_DBG("hash table not initialized yet\n"); + return -1; + } + if(ht_db_con==NULL) { LM_ERR("no db connection\n");

1 0

The recursive lock of tm module is not safe?
by progrom 13 Apr '22

13 Apr '22

Hi： See lock_hash in h_table.c: Flowing lines of code do not guarantee atomicity and I think it is not safe: -      atomic_get(&_tm_table->entries[i].locker_pid) != mypid -      lock(&_tm_table->entries[i].mutex) -      atomic_set(&_tm_table->entries[i].locker_pid, mypid) Would you mind solving my confusion?

1 0

Questions about dlg_search
by progrom 13 Apr '22

13 Apr '22

Hi： See dlg_new_dialog in dlg_handlers.c. After dlg_search, the dlg has locked and referenced, but there is no dlg_hash_release/dlg_release in some places ?

1 0

How to add CLI parameter in kamailio.cfg-Json formatting
by Jeetha P J 13 Apr '22

13 Apr '22

Hi all I want the syslog output in json structure. When I run 'kamailio --log-engine=json:M' I am getting this but only for that command.I want all syslog out in the json format. Any one please help me to achieve this Thanks & Regards Jeetha P J -- _This message contains information that may be privileged or confidential and is the property of the Quantiphi Inc and/or its affiliates_. It is intended only for the person to whom it is addressed. _If you are not the intended recipient, any review, dissemination, distribution, copying, storage or other use of all or any portion of this message is strictly prohibited. If you received this message in error, please immediately notify the sender by reply e-mail and delete this message in its *entirety*___

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev