- sr-dev - kamailio.org

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

[kamailio/kamailio] dead lock of dialog module (Issue #3084)
by progromm 13 Apr '22

13 Apr '22

### Description See `internal_get_dlg`: ```C static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, str* callid, str* ftag, str* ttag, unsigned int* dir, int mode) { struct dlg_cell* dlg; struct dlg_entry* d_entry; d_entry = &(d_table->entries[h_entry]); dlg_lock(d_table, d_entry); for (dlg = d_entry->first ; dlg ; dlg = dlg->next) { /* Check callid / fromtag / totag */ if (match_dialog(dlg, callid, ftag, ttag, dir) == 1) { ref_dlg_unsafe(dlg, 1); if (likely(mode == 0)) { dlg_unlock(d_table, d_entry); } LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", callid->len, callid->s, h_entry, *dir); return dlg; } } if (likely(mode == 0)) { dlg_unlock(d_table, d_entry); } LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; } ``` Should judge whether `mode` is 0 before `dlg_lock` . -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3084 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3084(a)github.com>

3 4

(no subject)
by 王斌 13 Apr '22

13 Apr '22

1 0

Memleak and deadlock abount dlg_search?
by 王斌 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 ? Best Regards!

1 0

[kamailio/kamailio] the recursive lock of tm module is not safe? (Issue #3083)
by progromm 13 Apr '22

13 Apr '22

### Description See `lock_hash` in `h_table.c`: ```C void lock_hash(int i) { int mypid; mypid = my_pid(); if (likely(atomic_get(&_tm_table->entries[i].locker_pid) != mypid)) { lock(&_tm_table->entries[i].mutex); atomic_set(&_tm_table->entries[i].locker_pid, mypid); } else { /* locked within the same process that called us*/ _tm_table->entries[i].rec_lock_level++; } } ``` 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? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3083 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3083(a)github.com>

2 2

git:master:bf69b85f: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: bf69b85fe9f383debcae6420c5d2d53a2ba452e9 URL: https://github.com/kamailio/kamailio/commit/bf69b85fe9f383debcae6420c5d2d53… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T12:01:10+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/bf69b85fe9f383debcae6420c5d2d53… Patch: https://github.com/kamailio/kamailio/commit/bf69b85fe9f383debcae6420c5d2d53… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 98d8d97f5c..80691c5516 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -37,7 +37,7 @@ Henning Westerholt 5. RPC Commands - 5.1. userblocklist.reload_blocklist + 5.1. geoip2.reload 6. Exported pseudo-variables @@ -67,7 +67,7 @@ Chapter 1. Admin Guide 5. RPC Commands - 5.1. userblocklist.reload_blocklist + 5.1. geoip2.reload 6. Exported pseudo-variables @@ -144,9 +144,9 @@ if(geoip2_match("$si", "src")) 5. RPC Commands - 5.1. userblocklist.reload_blocklist + 5.1. geoip2.reload -5.1. userblocklist.reload_blocklist +5.1. geoip2.reload Reload the internal GeoIP database. This is necessary after the database file has been changed on the disk.

1 0

git:master:282bbf18: geoip2: docs - fixed the rpc command geoip2.reload title
by Daniel-Constantin Mierla 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 282bbf188831bf9b4187fa2aa54fd9b2412e066c URL: https://github.com/kamailio/kamailio/commit/282bbf188831bf9b4187fa2aa54fd9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-13T11:58:01+02:00 geoip2: docs - fixed the rpc command geoip2.reload title --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/282bbf188831bf9b4187fa2aa54fd9b… Patch: https://github.com/kamailio/kamailio/commit/282bbf188831bf9b4187fa2aa54fd9b… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index cbcc2d8c79..8c5a96caa8 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -128,9 +128,9 @@ if(geoip2_match("$si", "src")) <section> <title>RPC Commands</title> - <section id="userblocklist.r.reload_blocklist"> + <section id="geoip2.r.reload"> <title> - <function moreinfo="none">userblocklist.reload_blocklist</function> + <function moreinfo="none">geoip2.reload</function> </title> <para> Reload the internal GeoIP database. This is necessary after

1 0

[kamailio/kamailio] The I-CSCF does not send Ringing under heavy load. (Issue #3071)
by Eugeniy 13 Apr '22

13 Apr '22

### Description  I set up Kamailio IMS , in the end everything turned out great, calls are made, and I decided to check how Kamailio copes with the load. I am creating load using sipp application. There is no problem with a low call generation rate, but if you raise the call generation to more than 20 calls per second, some of the calls fail. ### Troubleshooting Challenges are always dropped sequentially ![image](https://user-images.githubusercontent.com/92918808/161745286-264d6e9b-47bb-4fcb-923a-1f5ded4cd999.png) I compared the calls and saw that the ICSCF does not send a 180 Ringing message towards the SCSCF. ![image](https://user-images.githubusercontent.com/92918808/161745354-2f97f8d1-2eb4-4a53-a9b0-2cb9d9d536d6.png) Below is an example of a successful call. ![image](https://user-images.githubusercontent.com/92918808/161745412-20f0ecc6-3952-4e01-9c74-4f6fa6cfd3c8.png) CPU, MEM indicators are normal. I increased the shr_mem and pkg_mem parameters. S-CSCF and I-CSCF communicate over UDP, but reside on the same server. It doesn't look like the packets are dropping or suffering from collisions. 10.21.4.226 external IP P-CSCF 10.10.0.1 IP P-CSCF 10.10.0.2 IP S/I-CSCF #### Reproduction  Using the sipp application, generate 100 calls at a generation rate greater than 20 calls per second. #### Debugging Data  ``` none ``` #### Log Messages  ``` attached below ``` [logs.zip](https://github.com/kamailio/kamailio/files/8417659/logs.zip) #### SIP Traffic  ``` attached below ``` [call_rejected.zip](https://github.com/kamailio/kamailio/files/8417640/call_… ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.2 (x86_64/linux) 42be5d flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 42be5d compiled on 10:39:53 Dec 27 2021 with gcc 9.3.0 ``` * **Operating System**:  ``` Ubuntu 20.04.3 LTS Linux ims-core 5.4.0-104-generic #118-Ubuntu SMP Wed Mar 2 19:02:41 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3071 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3071(a)github.com>

2 12

git:master:c43432e6: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: c43432e6fda8db527ffca3442d7cea8e601a211e URL: https://github.com/kamailio/kamailio/commit/c43432e6fda8db527ffca3442d7cea8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T11:16:09+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/c43432e6fda8db527ffca3442d7cea8… Patch: https://github.com/kamailio/kamailio/commit/c43432e6fda8db527ffca3442d7cea8… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 0362750258..98d8d97f5c 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -91,7 +91,10 @@ Chapter 1. Admin Guide to enable access to the results of a query to the database. Many queries can be done and store results in different containers to - be able to use in parallel. Database is loaded at startup in cache. + be able to use in parallel. Database is loaded at startup in cache. The + cache can be reloaded with an RPC command. In this case make sure that + you do not overwrite the file in place, but replace it, e.g. with a + “move” command. 2. Dependencies

1 0

git:master:166edc37: geoip2: add a note about db replacement recommendations
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 166edc37177c2a92f57a31591ca781b15202a57f URL: https://github.com/kamailio/kamailio/commit/166edc37177c2a92f57a31591ca781b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T09:04:31Z geoip2: add a note about db replacement recommendations --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/166edc37177c2a92f57a31591ca781b… Patch: https://github.com/kamailio/kamailio/commit/166edc37177c2a92f57a31591ca781b… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index d3d0228946..cbcc2d8c79 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -44,6 +44,9 @@ <para> Many queries can be done and store results in different containers to be able to use in parallel. Database is loaded at startup in cache. + The cache can be reloaded with an RPC command. In this case make sure + that you do not overwrite the file in place, but replace it, e.g. with + a <quote>move</quote> command. </para> </section> <section>

1 0

git:master:6a001d3f: geoip2: fix logging for reload failures, initialize memory for db
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 6a001d3f90a8cfa2514b5b2781fc61dec50fc0c4 URL: https://github.com/kamailio/kamailio/commit/6a001d3f90a8cfa2514b5b2781fc61d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T08:20:54Z geoip2: fix logging for reload failures, initialize memory for db --- Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/6a001d3f90a8cfa2514b5b2781fc61d… Patch: https://github.com/kamailio/kamailio/commit/6a001d3f90a8cfa2514b5b2781fc61d… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index 0b50fd4447..0995ae2d25 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -490,6 +490,8 @@ int geoip2_init_pv(char *path) { int status; _handle_GeoIP = shm_malloc(sizeof(struct MMDB_s)); + memset(_handle_GeoIP, 0, sizeof(struct MMDB_s)); + if (_handle_GeoIP == NULL) { SHM_MEM_ERROR; @@ -522,9 +524,13 @@ int geoip2_reload_pv(char *path) if(MMDB_SUCCESS != status) { LM_ERR("cannot reload GeoIP database file at: %s\n", path); + + } + else + { + LM_INFO("reloaded GeoIP database file at: %s\n", path); } lock_release(lock); - LM_INFO("reloaded GeoIP database file at: %s\n", path); return status; }

1 0

git:master:85c4ad10: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 85c4ad1025cc3aa882ddfb42cb35257500f4528b URL: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:46:12+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… Patch: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 697ccf0889..0362750258 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -10,6 +10,10 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> +Henning Westerholt + + gilawa.com + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ @@ -31,12 +35,17 @@ Daniel-Constantin Mierla 4.1. geoip2_match(ipaddr, pvc) - 5. Exported pseudo-variables + 5. RPC Commands + + 5.1. userblocklist.reload_blocklist + + 6. Exported pseudo-variables List of Examples 1.1. Set path parameter 1.2. geoip2_match usage + 1.3. geoip2.reload usage Chapter 1. Admin Guide @@ -56,7 +65,11 @@ Chapter 1. Admin Guide 4.1. geoip2_match(ipaddr, pvc) - 5. Exported pseudo-variables + 5. RPC Commands + + 5.1. userblocklist.reload_blocklist + + 6. Exported pseudo-variables 1. Overview @@ -126,7 +139,21 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... -5. Exported pseudo-variables +5. RPC Commands + + 5.1. userblocklist.reload_blocklist + +5.1. userblocklist.reload_blocklist + + Reload the internal GeoIP database. This is necessary after the + database file has been changed on the disk. + + Example 1.3. geoip2.reload usage +... +kamcmd geoip2.reload +... + +6. Exported pseudo-variables * $gip2(pvc=>key) - pvc is an identifier for this query result; it is designated by the second parameter of geoip2_match(). The key can

1 0

[kamailio/kamailio] [Feature Request] Add reload capability for geoip2 module (#2029)
by Joel Serrano 13 Apr '22

13 Apr '22

### Description Currently, the `geoip2` module loads the IP database at startup and keeps it in cache and there is no way to tell Kamailio to reload the database without a full restart. ### Possible Solutions To keep this module inline with other modules that use external datasources, I would suggest to implement a new RPC command and a new geoip2 function to reload the database defined in the `path` geoip2 modparam without the need of a restart. I'm not aware of the effort required for implementing either of them, but only having an RPC command would effectively solve this issue as you can call RPC commands from within Kamailio conf, thus, the reload function would not be something strictly required but more of a nice-to-have. ### Examples: Function: ``` geoip2_reload() ``` RPC command: ``` kamctl rpc gip2.reload / kamctl rpc geoip2.reload ``` Kamcmd command: ``` kamcmd geoip2.reload ``` -- 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/2029

2 3

git:master:2f78b97e: geoip2: add reload RCP command fuctionality (related to GH #2029)
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 2f78b97eaf3d4232a623be0d2eb2da575c93f13b URL: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T06:36:23Z geoip2: add reload RCP command fuctionality (related to GH #2029) --- Modified: src/modules/geoip2/doc/geoip2.xml Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5… Patch: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5…

1 0

git:master:3440a433: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 3440a43377ee14fd68de90c940a763b845e98be1 URL: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:16:10+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b… Patch: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b…

1 0

git:master:d1342772: userblocklist: add a note about deactivated MI cmds to docs
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: d1342772cdcd882b0c26db111b608e37b748314d URL: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T06:02:57Z userblocklist: add a note about deactivated MI cmds to docs --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… Patch: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… --- diff --git a/src/modules/userblocklist/doc/userblocklist_admin.xml b/src/modules/userblocklist/doc/userblocklist_admin.xml index a5f136d8f4..8e562f63e1 100644 --- a/src/modules/userblocklist/doc/userblocklist_admin.xml +++ b/src/modules/userblocklist/doc/userblocklist_admin.xml @@ -405,24 +405,7 @@ if (!check_allowlist("globalblocklist")) { <section> <title>MI Commands</title> - <section> - <title> - <function moreinfo="none">reload_blocklist</function> - </title> - <para> - Reload the internal global blocklist cache. This is necessary after - the database tables for the global blocklist have been changed. - </para> - <example> - <title><function>reload_blocklist</function> usage</title> - <programlisting format="linespecific"> - ... - &ctltool; fifo reload_blocklist - ... - </programlisting> - </example> - </section> - + The following MI commands are currently disabled, they need to migrated to the RPC infrastructure. <section> <title> <function moreinfo="none">dump_blocklist</function>

1 0

git:master:79859614: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 79859614cb584ec1f3d3bbdd885b7f4979e61da5 URL: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:01:18+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4… Patch: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4…

1 0

git:master:dd12c792: userblocklist: small spelling improvement in docs
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: dd12c792b42c223bf93bb58ff0103efb454ab88b URL: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z userblocklist: small spelling improvement in docs --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… Patch: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… --- diff --git a/src/modules/userblocklist/doc/userblocklist_admin.xml b/src/modules/userblocklist/doc/userblocklist_admin.xml index f991e0efa2..a5f136d8f4 100644 --- a/src/modules/userblocklist/doc/userblocklist_admin.xml +++ b/src/modules/userblocklist/doc/userblocklist_admin.xml @@ -33,7 +33,7 @@ The module exports four functions, <function>check_blocklist</function>, <function>check_allowlist</function>, <function>check_user_blocklist</function> and <function>check_user_allowlist</function> - for usage in the configuration file. Furthermore it provides a MI function to + for usage in the configuration file. Furthermore it provides a RPC function to reload the global blocklist cache. </para> <para>

1 0

git:master:7f03faa0: geoip2: logging library version at startup
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 7f03faa01ee4d832f5079b9344fc895ff425ac6c URL: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: logging library version at startup --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Patch: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 1ac03f06d6..17d910399b 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,6 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { + LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:b467ce54: geoip2: also log database path
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: b467ce544afa709c28e39d8734b2e9ba6a43b79c URL: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: also log database path --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Patch: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 17d910399b..f24a853c3a 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,7 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { - LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); + LM_INFO("using GeoIP database path %s, library version %s\n", geoip2_path, MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:1bde8e0e: core: function to get local socket by index
by Daniel-Constantin Mierla 12 Apr '22

12 Apr '22

Module: kamailio Branch: master Commit: 1bde8e0e6193f0ed63452b3b8d31bfc78121dfb6 URL: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-12T08:38:07+02:00 core: function to get local socket by index --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Patch: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 5622e2634d..c9dd89118d 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -912,6 +912,40 @@ socket_info_t* ksr_get_socket_by_advertise(str *sockstr) return NULL; } +socket_info_t* ksr_get_socket_by_index(int idx) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + if (idx<0) { + idx += _ksr_sockets_no; + if (idx < 0) { + LM_DBG("negative overall index\n"); + return NULL; + } + } + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(idx==0) { + return si; + } + idx--; + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 3c8deeb244..cbc630b9b8 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -106,6 +106,7 @@ struct socket_info* find_si(struct ip_addr* ip, unsigned short port, socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); socket_info_t* ksr_get_socket_by_advertise(str *sockstr); +socket_info_t* ksr_get_socket_by_index(int idx); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:2c3cc027: corex: corex: $lsock() variable can match by index
by Daniel-Constantin Mierla 12 Apr '22

12 Apr '22

Module: kamailio Branch: master Commit: 2c3cc027b05317ec61c706180cb9cfea555cbc11 URL: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-12T08:38:07+02:00 corex: corex: $lsock() variable can match by index --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… Patch: https://github.com/kamailio/kamailio/commit/2c3cc027b05317ec61c706180cb9cfe… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 74fcff6e79..9f404d32aa 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -218,6 +218,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'a': si = ksr_get_socket_by_advertise(&lexpr.val); break; + case 'i': + si = ksr_get_socket_by_index(lexpr.valno); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

1 0

git:master:aa8ec3bf: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: aa8ec3bf19328741b0565d306438a9b396f39eef URL: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T16:01:26+02:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README --- Diff: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… Patch: https://github.com/kamailio/kamailio/commit/aa8ec3bf19328741b0565d306438a9b… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index c0badc4115..25c448901d 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -143,7 +143,8 @@ Chapter 1. Admin Guide 2. Dependencies - The module does not depend on any other module. + The following modules must be loaded before this module: + * sl - stateless reply. 3. Parameters

1 0

[kamailio/kamailio] Typos docs (PR #3078)
by Bastian Triller 11 Apr '22

11 Apr '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 - [ ] 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:  - [x] PR should be backported to stable branches - [x] 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/3078 -- Commit Summary -- * core: Fix typos, reference to SER * auth: Fix missing dependency in docs -- File Changes -- M src/core/str.h (2) M src/core/ut.c (14) M src/core/ut.h (8) M src/modules/auth/doc/auth.xml (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3078.patch https://github.com/kamailio/kamailio/pull/3078.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3078 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3078(a)github.com>

2 3

git:master:dd15436e: auth: Fix missing dependency in docs
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: dd15436e8697f70df6ef9d188da36f70e7116a74 URL: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 auth: Fix missing dependency in docs --- Modified: src/modules/auth/doc/auth.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… Patch: https://github.com/kamailio/kamailio/commit/dd15436e8697f70df6ef9d188da36f7… --- diff --git a/src/modules/auth/doc/auth.xml b/src/modules/auth/doc/auth.xml index 6f20e8c71d..137a5a5f56 100644 --- a/src/modules/auth/doc/auth.xml +++ b/src/modules/auth/doc/auth.xml @@ -66,7 +66,14 @@ <section id="auth.dep"> <title>Dependencies</title> <para> - The module does not depend on any other module. + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>sl</emphasis> - stateless reply. + </para> + </listitem> + </itemizedlist> </para> </section>

1 0

git:master:841681e6: pua_dialoginfo: Fix typo
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 841681e68a8fd913bc6944eed4f4d00c05f92359 URL: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 pua_dialoginfo: Fix typo --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… Patch: https://github.com/kamailio/kamailio/commit/841681e68a8fd913bc6944eed4f4d00… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 0385ed90dd..7b27e666c5 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -643,7 +643,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } #ifdef PUA_DIALOGINFO_DEBUG - /* dialog callback testing (registered last to be executed frist) */ + /* dialog callback testing (registered last to be executed first) */ if (dlg_api.register_dlgcb(dlg, DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED

1 0

git:master:8bab7115: core: Fix typos, reference to SER
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 8bab711590ac8b4fd73efabbc7c22be3231e6214 URL: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T15:52:36+02:00 core: Fix typos, reference to SER --- Modified: src/core/str.h Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… Patch: https://github.com/kamailio/kamailio/commit/8bab711590ac8b4fd73efabbc7c22be… --- diff --git a/src/core/str.h b/src/core/str.h index d7977652d9..063a9e9398 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -143,7 +143,7 @@ typedef struct _str str; } while(0) /** - * str with value: not null and not emptu + * str with value: not null and not empty */ #define STR_WITHVAL(_sp) ((_sp) && ((_sp)->s) && ((_sp)->len)) diff --git a/src/core/ut.c b/src/core/ut.c index 8dde51aaff..a581f98e9f 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -97,7 +97,7 @@ int group2gid(int* gid, char* group) /* - * Replacement of timegm (does not exists on all platforms + * Replacement of timegm (does not exists on all platforms) * Taken from * http://lists.samba.org/archive/samba-technical/2002-November/025737.html */ @@ -232,7 +232,7 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2) /** transform a relative pathname into an absolute one. * @param base - base file, used to extract the absolute path prefix. - * Might be NULL, in which case the path of the ser.cfg is + * Might be NULL, in which case the path of the kamailio.cfg is * used. * @param file - file path to be transformed. If it's already absolute * (starts with '/') is left alone. If not the result will @@ -301,7 +301,7 @@ char* get_abs_pathname(str* base, str* file) /** - * @brief search for occurence of needle in text + * @brief search for occurrence of needle in text * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -323,7 +323,7 @@ char *str_search(str *text, str *needle) } /** - * @brief search for occurence of needlez starting from vstart and before vend + * @brief search for occurrence of needlez starting from vstart and before vend * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -346,7 +346,7 @@ char *stre_search_strz(char *vstart, char *vend, char *needlez) } /** - * @brief case insensitive search for occurence of needle in text + * @brief case insensitive search for occurrence of needle in text * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -393,7 +393,7 @@ char *str_casesearch_strz(str *text, char *needlez) } /** - * @brief search for last occurence of needle in text (reverse search) + * @brief search for last occurrence of needle in text (reverse search) * @return pointer to start of needle in text or NULL if the needle * is not found */ @@ -415,7 +415,7 @@ char *str_rsearch(str *text, str *needle) } /** - * @brief case insensitive search for last occurence of needle in text (reverse search) + * @brief case insensitive search for last occurrence of needle in text (reverse search) * @return pointer to start of needle in text or NULL if the needle * is not found */ diff --git a/src/core/ut.h b/src/core/ut.h index 44bd0e75c7..7792a865ef 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -729,7 +729,7 @@ static inline int str2int(str* _s, unsigned int* _r) /* - * Convert an str to signed long + * Convert a str to signed long */ static inline int str2slong(str* _s, long* _r) { @@ -738,7 +738,7 @@ static inline int str2slong(str* _s, long* _r) /* - * Convert an str to signed integer + * Convert a str to signed integer */ static inline int str2sint(str* _s, int* _r) { @@ -747,7 +747,7 @@ static inline int str2sint(str* _s, int* _r) /* - * Convert an strz to integer + * Convert a strz to integer */ static inline int strz2int(char* _s, unsigned int* _r) { @@ -770,7 +770,7 @@ static inline int strz2int(char* _s, unsigned int* _r) } /* - * Convert an strz to signed integer + * Convert a strz to signed integer */ static inline int strz2sint(char* _s, int* _r) {

1 0

git:master:abd41396: modules: readme files regenerated - pv_headers ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: abd41396a937155a978ff024f309b082459a057e URL: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T15:16:16+02:00 modules: readme files regenerated - pv_headers ... [skip ci] --- Modified: src/modules/pv_headers/README --- Diff: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… Patch: https://github.com/kamailio/kamailio/commit/abd41396a937155a978ff024f309b08… --- diff --git a/src/modules/pv_headers/README b/src/modules/pv_headers/README index 828c7d1a13..e714d3f666 100644 --- a/src/modules/pv_headers/README +++ b/src/modules/pv_headers/README @@ -12,6 +12,11 @@ Victor Seva Sipwise GmbH <vseva(a)sipwise.com> +Fabricio Santolin da Silva + + Alcatel-Lucent Enterprise + <fabricio.santolin-da-silva(a)al-enterprise.com> + Copyright © 2018 Sipwise GmbH __________________________________________________________________ @@ -44,6 +49,8 @@ Victor Seva 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 5. Exported Variables @@ -86,6 +93,8 @@ Chapter 1. Admin Guide 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 5. Exported Variables @@ -240,8 +249,8 @@ modparam("pv_headers", "auto_msg", 1) 4.5. pvh_append_header(hname, hvalue) 4.6. pvh_modify_header(hname, hvalue, [idx]) 4.7. pvh_remove_header(hname, [idx]) - - \ + 4.8. pvh_value_exists(hname, hparameter) + 4.9. pvh_remove_header_param(hname, hparameter) 4.1. pvh_collect_headers() @@ -317,6 +326,32 @@ modparam("pv_headers", "auto_msg", 1) This function can be used from ANY_ROUTE but only after pvh_collect_headers() or with “auto_msg” parameter enabled. +4.8. pvh_value_exists(hname, hparameter) + + Checks if the parameter “hparameter” is present in the header “hname” + from XAVP. + + This function can be used from ANY_ROUTE but only after + pvh_collect_headers() have been called or with “auto_msg” parameter + enabled. + +4.9. pvh_remove_header_param(hname, hparameter) + + Removes an existing parameter “hparameter” in the header “hname” from + the XAVP. + + If there are multiple headers, only the one containing the parameter + will be modified. + + The parameter can be located in any position (begining, middle or end) + of the list of parameters. + + If the parameter is the only one present, the header will be removed. + + This function can be used from ANY_ROUTE but only after + pvh_collect_headers() have been called or with “auto_msg” parameter + enabled. + 5. Exported Variables * $x_hdr

1 0

[kamailio/kamailio] pv_headers: Add support to remove a specific value from a header (PR #3070)
by Tomohare 11 Apr '22

11 Apr '22

- To be used with headers containing values separated by commas - pvh_header_param_exists() check if the value is present to a given header - pvh_remove_header_param() remove the value from the given header or the entire header if no other value is present   #### 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Previously, to remove a parameter from a header it was needed to create a complex method on the configuration file for each header/parameter. This modification moves this complexity to the 'pv_headers' module. Two new functions: * pvh_header_param_exists * pvh_remove_header_param Both functions take as parameters the name of the header and the name of the parameter. It returns '-1' if the combination header/parameter: - is not found (pvh_header_param_exists) - couldn't be removed (pvh_remove_header_param). Examples (proxy configuration): if (pvh_header_param_exists("Supported", "100rel")) { // "100rel" is present on the "Supported" header } if (pvh_remove_header_param("Supported", "100rel")) { // "100rel" removed from header "Supported" } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3070 -- Commit Summary -- * pv_headers: Add support to remove a specific value from a header -- File Changes -- M src/modules/pv_headers/doc/functions.xml (35) M src/modules/pv_headers/doc/pv_headers.xml (6) M src/modules/pv_headers/pv_headers.c (61) M src/modules/pv_headers/pvh_func.c (87) M src/modules/pv_headers/pvh_func.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3070.patch https://github.com/kamailio/kamailio/pull/3070.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3070 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3070(a)github.com>

4 4

git:master:7a3f71e7: pv_headers: Add support to remove a specific value from a header
by Victor Seva 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 7a3f71e7ce6b63fe1c32853c30d785bc9c1f2236 URL: https://github.com/kamailio/kamailio/commit/7a3f71e7ce6b63fe1c32853c30d785b… Author: Fabricio Santolin da Silva <fabricio.santolin-da-silva(a)al-enterprise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-11T15:10:11+02:00 pv_headers: Add support to remove a specific value from a header - To be used with headers containing values separated by commas - pvh_header_param_exists() check if the value is present to a given header - pvh_remove_header_param() remove the value from the given header or the entire header if no other value is present --- Modified: src/modules/pv_headers/doc/functions.xml Modified: src/modules/pv_headers/doc/pv_headers.xml Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_func.h --- Diff: https://github.com/kamailio/kamailio/commit/7a3f71e7ce6b63fe1c32853c30d785b… Patch: https://github.com/kamailio/kamailio/commit/7a3f71e7ce6b63fe1c32853c30d785b…

1 0

git:master:322102e6: fix compilation warning for gcc 12.x (GH #3073)
by Henning Westerholt 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 322102e6a6b9e775aaa5d9f738e549ba8dddf2cd URL: https://github.com/kamailio/kamailio/commit/322102e6a6b9e775aaa5d9f738e549b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-11T07:40:09Z fix compilation warning for gcc 12.x (GH #3073) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/322102e6a6b9e775aaa5d9f738e549b… Patch: https://github.com/kamailio/kamailio/commit/322102e6a6b9e775aaa5d9f738e549b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d2d7c60814..d3ca839c0d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -283,7 +283,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) # sed with POSIX.1 regex doesn't support |, + or ? # (darwin, solaris ...) => this complicated expression MKDEP=$(CC) -MM -MG - #transform gcc version into 2.9x or 3.0 + #transform gcc version into some well-known versions, or 9 for newer versions CC_SHORTVER:=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ sed -e 's/[^0-9]*-$.*$/\1/'| \ sed -e 's/2\.9.*/2.9x/' \ @@ -310,7 +310,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/10\.[0-9]\..*/9.0+/' \ -e 's/10\.[0-9]$$/9.0+/' \ -e 's/11\.[0-9]\..*/9.0+/' \ - -e 's/11\.[0-9]$$/9.0+/') + -e 's/11\.[0-9]$$/9.0+/' \ + -e 's/12\.[0-9]\..*/9.0+/' \ + -e 's/12\.[0-9]$$/9.0+/') ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP

1 0

[kamailio/kamailio] Does Kamailio process each SIP message in a separate process? (Issue #3075)
by jinhua luo 11 Apr '22

11 Apr '22

I check the codes and it seems that in `udp_rcv_loop()`, each incoming message got processed in the same process, so may it get blocked by some module function? For example, when the script calls `rtpengine_manage()`, it opens a new socket, sends a message, and receives the reply in blocking way, then it blocks the whole `udp_rcv_loop()`. Is it the expected design goal? why not consider new process or threading? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3075 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3075(a)github.com>

2 2

git:master:4033b3be: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 4033b3be916eef91773fa8c3f04ee7e8f954b7f0 URL: https://github.com/kamailio/kamailio/commit/4033b3be916eef91773fa8c3f04ee7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-11T08:46:20+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/ipops/README --- Diff: https://github.com/kamailio/kamailio/commit/4033b3be916eef91773fa8c3f04ee7e… Patch: https://github.com/kamailio/kamailio/commit/4033b3be916eef91773fa8c3f04ee7e…

1 0

git:master:06aa21a9: ipops: docs for dns_set_local_ttl()
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 06aa21a975f76ce49a10925972ad8c239fc91216 URL: https://github.com/kamailio/kamailio/commit/06aa21a975f76ce49a10925972ad8c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:42:57+02:00 ipops: docs for dns_set_local_ttl() --- Modified: src/modules/ipops/doc/ipops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/06aa21a975f76ce49a10925972ad8c2… Patch: https://github.com/kamailio/kamailio/commit/06aa21a975f76ce49a10925972ad8c2… --- diff --git a/src/modules/ipops/doc/ipops_admin.xml b/src/modules/ipops/doc/ipops_admin.xml index a04a42ab16..9b7da7a974 100644 --- a/src/modules/ipops/doc/ipops_admin.xml +++ b/src/modules/ipops/doc/ipops_admin.xml @@ -1064,6 +1064,46 @@ if (naptr_query ("example.com", "res") > 0) { </section> + <section id="ipops.f.dns_set_local_ttl"> + <title> + <function moreinfo="none">dns_set_local_ttl(vttl)</function> + </title> + + <para> + Set local ttl for DNS query results. If vttl is 0, then the value of + the result and the core parameters are used. + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>vttl</emphasis> - TTL value in seconds. It can be static + integer or a variable holding an integer value. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>dns_set_local_ttl</function> usage + </title> + <programlisting format="linespecific"> +... + dns_set_local_ttl("7200"); + dns_query("test.com", "xyz") + dns_set_local_ttl("0"); +... + </programlisting> + </example> + + </section> + </section> - + </chapter>

1 0

git:master:6074d5ce: dispatcher: new ds_dns_ttl
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 6074d5cecf3f7f009d5a33678843926b57f34520 URL: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-09T21:27:21+02:00 dispatcher: new ds_dns_ttl - option to set ttl for dns queries done by dispatcher --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… Patch: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9d9b849183..d19098800a 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -112,6 +112,7 @@ extern int ds_attrs_none; extern param_t *ds_db_extra_attrs_list; extern int ds_load_mode; extern uint32_t ds_dns_mode; +extern int ds_dns_ttl; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -490,6 +491,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; } else if (ds_dns_mode & (DS_DNS_MODE_INIT|DS_DNS_MODE_TIMER)) { + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = dp->port; sproto = (char)dp->proto; @@ -509,6 +511,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) hn[puri.host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", puri.host.len, puri.host.s); @@ -3372,6 +3375,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, if(!(ds_dns_mode & DS_DNS_MODE_ALWAYS)) { ipa = &node->dlist[j].ip_address; } else { + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = node->dlist[j].port; sproto = (char)node->dlist[j].proto; @@ -3389,6 +3393,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, hn[node->dlist[j].host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_WARN("could not resolve %.*s (skipping)\n", node->dlist[j].host.len, node->dlist[j].host.s); @@ -3485,6 +3490,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) } tport = puri.port_no; tproto = puri.proto; + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = tport; sproto = (char)tproto; @@ -3502,6 +3508,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) hn[puri.host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s\n", puri.host.len, puri.host.s); return -1; @@ -3863,6 +3870,7 @@ void ds_dns_update_set(ds_set_t *node) } LM_DBG("resolving [%.*s] - mode: %d\n", node->dlist[j].host.len, node->dlist[j].host.s, ds_dns_mode); + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = node->dlist[j].port; sproto = (char)node->dlist[j].proto; @@ -3882,6 +3890,7 @@ void ds_dns_update_set(ds_set_t *node) hn[node->dlist[j].host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s\n", node->dlist[j].host.len, node->dlist[j].host.s); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8dea1f29f3..827d925ed8 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -122,6 +122,7 @@ int ds_attrs_none = 0; int ds_load_mode = 0; uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_interval = 600; +int ds_dns_ttl = 0; str ds_outbound_proxy = STR_NULL; @@ -300,6 +301,7 @@ static param_export_t params[]={ {"reload_delta", PARAM_INT, &ds_reload_delta }, {"ds_dns_mode", PARAM_INT, &ds_dns_mode}, {"ds_dns_interval", PARAM_INT, &ds_dns_interval}, + {"ds_dns_ttl", PARAM_INT, &ds_dns_ttl}, {0,0,0} }; @@ -338,6 +340,9 @@ static int mod_init(void) return -1; } } + if(ds_dns_ttl<0) { + ds_dns_ttl = 0; + } if(ds_ping_active_init() < 0) { return -1; }

1 0

git:master:1c67548e: dispatcher: docs for ds_dns_ttl
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 1c67548e9e3c78040fac933a6b59397f2ebb329e URL: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:22:16+02:00 dispatcher: docs for ds_dns_ttl --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… Patch: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 1e67256c88..a910b8480c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1162,6 +1162,28 @@ modparam("dispatcher", "ds_interval_mode", 1800) </example> </section> + <section id="dispatcher.p.ds_dns_ttl"> + <title><varname>ds_dns_ttl</varname> (int)</title> + <para> + The interval in seconds to set TTL for DNS results received for + queries dones inside this module. If 0, this TTL is not set, + result and core values are used. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_dns_ttl</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_interval_mode", 7200) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:ac376471: ipops: added function to set local ttl for dns queries
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: ac376471d95ab7a350d9d7cc124c06a157776dff URL: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:31:20+02:00 ipops: added function to set local ttl for dns queries --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… Patch: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 273f232fa7..49b9ceb653 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -46,6 +46,7 @@ #include "../../core/mod_fix.h" #include "../../core/pvar.h" #include "../../core/resolve.h" +#include "../../core/dns_cache.h" #include "../../core/lvalue.h" #include "../../core/kemi.h" #include "api.h" @@ -110,6 +111,7 @@ static int fixup_free_detailed_ip_type(void** param, int param_no); static int w_dns_query(sip_msg_t* msg, char* str1, char* str2); static int w_srv_query(sip_msg_t* msg, char* str1, char* str2); static int w_naptr_query(sip_msg_t* msg, char* str1, char* str2); +static int w_dns_set_local_ttl(sip_msg_t*, char*, char*); static int mod_init(void); static pv_export_t mod_pvs[] = { @@ -165,6 +167,8 @@ static cmd_export_t cmds[] = ANY_ROUTE }, { "naptr_query", (cmd_function)w_naptr_query, 2, fixup_spve_spve, 0, ANY_ROUTE }, + { "dns_set_local_ttl", (cmd_function)w_dns_set_local_ttl, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, { "bind_ipops", (cmd_function)bind_ipops, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0 } }; @@ -1358,6 +1362,30 @@ static int ki_naptr_query(sip_msg_t* msg, str* naptrname, str* pvid) return naptr_update_pv(naptrname, pvid); } +/** + * + */ +static int ki_dns_set_local_ttl(sip_msg_t* msg, int vttl) +{ + dns_set_local_ttl(vttl); + return 1; +} + +/** + * + */ +static int w_dns_set_local_ttl(sip_msg_t *msg, char *pttl, char *p2) +{ + int vttl = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)pttl, &vttl)<0) { + LM_ERR("cannot get the ttl value\n"); + return -1; + } + + return ki_dns_set_local_ttl(msg, vttl); +} + /** * */ @@ -1458,6 +1486,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("dns_set_local_ttl"), + SR_KEMIP_INT, ki_dns_set_local_ttl, + { 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 } } };

1 0

git:master:0846ddd9: core: dns cache - option to set local ttl to overwrite the global value
by Daniel-Constantin Mierla 11 Apr '22

11 Apr '22

Module: kamailio Branch: master Commit: 0846ddd9eb79eeb0f93535ad65c75670f026941b URL: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-09T15:36:32+02:00 core: dns cache - option to set local ttl to overwrite the global value --- Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… Patch: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 58247265eb..d6826f0707 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -88,12 +88,15 @@ struct t_dns_cache_stats* dns_cache_stats=0; #define LOCK_DNS_HASH() lock_get(dns_hash_lock) #define UNLOCK_DNS_HASH() lock_release(dns_hash_lock) +static int _dns_local_ttl = 0; + #define FIX_TTL(t) \ - (((t)<cfg_get(core, core_cfg, dns_cache_min_ttl))? \ - cfg_get(core, core_cfg, dns_cache_min_ttl): \ - (((t)>cfg_get(core, core_cfg, dns_cache_max_ttl))? \ - cfg_get(core, core_cfg, dns_cache_max_ttl): \ - (t))) + ((_dns_local_ttl>0)?_dns_local_ttl: \ + (((t)<cfg_get(core, core_cfg, dns_cache_min_ttl))? \ + cfg_get(core, core_cfg, dns_cache_min_ttl): \ + (((t)>cfg_get(core, core_cfg, dns_cache_max_ttl))? \ + cfg_get(core, core_cfg, dns_cache_max_ttl): \ + (t)))) struct dns_hash_head{ @@ -132,6 +135,10 @@ static const char* dns_str_errors[]={ }; +void dns_set_local_ttl(int ttl) +{ + _dns_local_ttl = ttl; +} /* param: err (negative error number) */ const char* dns_strerror(int err) diff --git a/src/core/dns_cache.h b/src/core/dns_cache.h index 0ec919f2d2..f8ae153a30 100644 --- a/src/core/dns_cache.h +++ b/src/core/dns_cache.h @@ -374,5 +374,6 @@ int dns_cache_delete_single_record(unsigned short type, str *value, int flags); +void dns_set_local_ttl(int ttl); #endif

1 0

git:master:d5e29886: core: enable updating received data via $rcv(buf)
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: d5e29886ccca6e4384859523e8b923761532c513 URL: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T19:15:26+02:00 core: enable updating received data via $rcv(buf) - on event_route[core:msg-received] --- Modified: src/core/ip_addr.h Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… Patch: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index c3f423123e..2f7770f81d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -203,6 +203,7 @@ typedef struct ksr_coninfo { typedef struct sr_net_info { str data; + unsigned int bufsize; receive_info_t* rcv; dest_info_t* dst; } sr_net_info_t; diff --git a/src/core/receive.c b/src/core/receive.c index b3e6aee8b8..5ed35a584c 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -161,7 +161,7 @@ sr_net_info_t *ksr_evrt_rcvnetinfo_get(void) /** * */ -int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) +int ksr_evrt_received(char *buf, unsigned int *len, receive_info_t *rcv_info) { sr_kemi_eng_t *keng = NULL; sr_net_info_t netinfo; @@ -192,7 +192,8 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) } memset(&netinfo, 0, sizeof(sr_net_info_t)); netinfo.data.s = buf; - netinfo.data.len = len; + netinfo.data.len = *len; + netinfo.bufsize = BUF_SIZE; netinfo.rcv = rcv_info; ksr_evrt_rcvnetinfo = &netinfo; @@ -212,6 +213,7 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) LM_DBG("dropping received message\n"); ret = -1; } + *len = netinfo.data.len; ksr_evrt_rcvnetinfo = NULL; return ret; @@ -312,7 +314,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) } if(ksr_evrt_received_mode!=0) { - if(ksr_evrt_received(buf, len, rcv_info)<0) { + if(ksr_evrt_received(buf, &len, rcv_info)<0) { LM_DBG("dropping the received message\n"); goto error00; }

1 0

git:master:ba28855a: pv: added set function for variable $rcv(buf)
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: ba28855a1745e0b084d230958bd3fbb5b0e23847 URL: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T19:17:35+02:00 pv: added set function for variable $rcv(buf) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_branch.c Modified: src/modules/pv/pv_branch.h --- Diff: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… Patch: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c34ce5dd31..cdd34ce5b9 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -91,7 +91,7 @@ static pv_export_t mod_pvs[] = { pv_parse_snd_name, 0, 0, 0 }, { {"sndfrom", (sizeof("sndfrom")-1)}, PVT_OTHER, pv_get_sndfrom, 0, pv_parse_snd_name, 0, 0, 0 }, - { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0, + { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, pv_set_rcv, pv_parse_rcv_name, 0, 0, 0 }, { {"xavp", sizeof("xavp")-1}, /* xavp */ PVT_XAVP, pv_get_xavp, pv_set_xavp, diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index ecce3156e7..83cc273f12 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -617,6 +617,60 @@ int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val) +{ + sr_net_info_t *neti = NULL; + str s; + + neti = ksr_evrt_rcvnetinfo_get(); + + if (neti==NULL || neti->rcv==NULL || neti->rcv->bind_address==NULL) { + LM_ERR("received info not set\n"); + return -1; + } + + if(param==NULL) { + LM_ERR("bad parameters\n"); + return -1; + } + switch(param->pvn.u.isname.name.n) + { + case 1: /* buf */ + if (neti->bufsize <= 0) { + LM_ERR("received data cannot be changed\n"); + return -1; + } + if(val==NULL || (val->flags&PV_VAL_NULL)) { + neti->data.s[0] = '\0'; + neti->data.len = 0; + break; + } + if(!(val->flags&PV_VAL_STR)) { + LM_ERR("str value required to set received data\n"); + return -1; + } + if(val->rs.len<=0) { + neti->data.s[0] = '\0'; + neti->data.len = 0; + break; + } + + if (unlikely(val->rs.len >= neti->bufsize - 1)) { + LM_ERR("new data is too long: %.*s\n", + val->rs.len, val->rs.s); + return -1; + } + memcpy(neti->data.s, val->rs.s, val->rs.len); + neti->data.s[val->rs.len] = '\0'; + neti->data.len = val->rs.len; + break; + default: + LM_DBG("set operation not supported for field %d\n", + param->pvn.u.isname.name.n); + } + return 0; +} + int pv_parse_rcv_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) diff --git a/src/modules/pv/pv_branch.h b/src/modules/pv/pv_branch.h index a83c98208b..5252db0d6b 100644 --- a/src/modules/pv/pv_branch.h +++ b/src/modules/pv/pv_branch.h @@ -42,6 +42,7 @@ int pv_parse_snd_name(pv_spec_p sp, str *in); int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val); int pv_parse_rcv_name(pv_spec_p sp, str *in); int pv_get_nh(struct sip_msg *msg, pv_param_t *param,

1 0

git:master:f10f3b51: dispatcher: track time of last dns timer update
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: f10f3b516ccab7f2bca8ff71c3fa34b915fc03f6 URL: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T16:17:02+02:00 dispatcher: track time of last dns timer update --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… Patch: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0f6a6b178f..9d9b849183 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3889,6 +3889,7 @@ void ds_dns_update_set(ds_set_t *node) } else { /* Store hostent in the dispatcher structure */ hostent2ip_addr(&node->dlist[j].ip_address, he, 0); + gettimeofday(&node->dlist[j].dnstime, NULL); } } } diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 3eaa9894dd..99c63eb7b9 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -29,6 +29,7 @@ #define _DISPATCH_H_ #include <stdio.h> +#include <sys/time.h> #include "../../core/pvar.h" #include "../../core/xavp.h" #include "../../core/parser/msg_parser.h" @@ -231,6 +232,7 @@ typedef struct _ds_dest { unsigned short int port; /*!< port of the URI */ unsigned short int proto; /*!< protocol of the URI */ int message_count; + struct timeval dnstime; struct _ds_dest *next; } ds_dest_t; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index ccf579fba8..8dea1f29f3 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1664,9 +1664,11 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, if(mode == DS_RPC_PRINT_FULL) { ipbuf[0] = '\0'; ip_addr2sbufz(&node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssdd", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, - "PROTOID", (int)node->dlist[j].proto) < 0) { + "PROTOID", (int)node->dlist[j].proto, + "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, + "DNSTIME_USEC", (unsigned long)node->dlist[j].dnstime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev