sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
283 discussions

[kamailio/kamailio] Compilation warning with gcc-12 (Issue #3073)

by Anthony Messina

When building for Fedora 36 with gcc-12.0.1: ``` Makefile.defs:1683: You are using an old and unsupported gcc version (12.0.1), compile at your own risk! ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3073 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3073(a)github.com>

2 years

git:master:3bdd15c8: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3bdd15c8dd60d445fc9f86b7579ddd2e1a862bc4 URL: https://github.com/kamailio/kamailio/commit/3bdd15c8dd60d445fc9f86b7579ddd2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-14T16:01:13+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/3bdd15c8dd60d445fc9f86b7579ddd2… Patch: https://github.com/kamailio/kamailio/commit/3bdd15c8dd60d445fc9f86b7579ddd2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index b3bc69a9fd..be898f0d7f 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -62,6 +62,7 @@ Muhammad Shahzad Shafi 4.22. via_use_xavp_fields(flags) 4.23. is_faked_msg() 4.24. is_socket_name(sockname) + 4.25. forward_reply() 5. RPC Commands @@ -114,8 +115,9 @@ Muhammad Shahzad Shafi 1.28. via_use_xavp_fields usage 1.29. is_faked_msg usage 1.30. is_socket_name usage - 1.31. event_route[network:msg] use cases - 1.32. Sample PERL code for do_compress and do_uncompress + 1.31. forward_reply usage + 1.32. event_route[network:msg] use cases + 1.33. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -162,6 +164,7 @@ Chapter 1. Admin Guide 4.22. via_use_xavp_fields(flags) 4.23. is_faked_msg() 4.24. is_socket_name(sockname) + 4.25. forward_reply() 5. RPC Commands @@ -351,6 +354,7 @@ modparam("corex", "nio_msg_avp", "$avp(msg)") 4.22. via_use_xavp_fields(flags) 4.23. is_faked_msg() 4.24. is_socket_name(sockname) + 4.25. forward_reply() 4.1. append_branch([ uri, [ q ] ]) @@ -744,6 +748,19 @@ event_route[dispatcher:dst-down] { } ... +4.25. forward_reply() + + Forward received reply on demand. + + This function can be used in CORE_ONREPLY_ROUTE. + + Example 1.31. forward_reply usage +... +route[reply] { + forward_reply(); +} +... + 5. RPC Commands 5.1. corex.debug @@ -907,7 +924,7 @@ event_route[dispatcher:dst-down] { Next is a basic usage example where encoding and decoding is done using PERL. - Example 1.31. event_route[network:msg] use cases + Example 1.32. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -938,7 +955,7 @@ event_route[network:msg] { } ... - Example 1.32. Sample PERL code for do_compress and do_uncompress + Example 1.33. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

2 years

git:master:b08bfd02: siprepo: added rmode parameter for push and pull functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b08bfd0226f244bb44299ce8177efbd6f5bf0c11 URL: https://github.com/kamailio/kamailio/commit/b08bfd0226f244bb44299ce8177efbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:28:47+02:00 siprepo: added rmode parameter for push and pull functions --- 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/b08bfd0226f244bb44299ce8177efbd… Patch: https://github.com/kamailio/kamailio/commit/b08bfd0226f244bb44299ce8177efbd…

2 years

git:master:eeb04173: siprepo: parse msg for pull operation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eeb0417340a120da5f3267aef5e08600dad3107b URL: https://github.com/kamailio/kamailio/commit/eeb0417340a120da5f3267aef5e0860… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:20:54+02:00 siprepo: parse msg for pull operation --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h --- Diff: https://github.com/kamailio/kamailio/commit/eeb0417340a120da5f3267aef5e0860… Patch: https://github.com/kamailio/kamailio/commit/eeb0417340a120da5f3267aef5e0860… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 55deed3b75..ef81b7694c 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -35,6 +35,8 @@ #include "../../core/trim.h" #include "../../core/ut.h" #include "../../core/receive.h" +#include "../../core/globals.h" +#include "../../core/dset.h" #include "../../core/route.h" #include "../../core/kemi.h" @@ -193,6 +195,9 @@ int siprepo_msg_set(sip_msg_t *msg, str *msgid) it->mtype = msg->first_line.type; it->itime = time(NULL); + it->msgno = msg->id; + it->pid = msg->pid; + it->mflags = msg->flags; _siprepo_table[slotid].plist->prev = it; it->next = _siprepo_table[slotid].plist; @@ -308,6 +313,7 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) int rtno; sr_kemi_eng_t *keng = NULL; str evname = str_init("siprepo:msg"); + char lbuf[BUF_SIZE]; it = siprepo_msg_find(msg, callid, msgid, 1); if(it==NULL) { @@ -316,10 +322,35 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) lock_release(&_siprepo_table[slotid].lock); return 1; } - memset(&lmsg, 0, sizeof(sip_msg_t)); slotid = it->hid % _siprepo_table_size; + memset(&lmsg, 0, sizeof(sip_msg_t)); + lmsg.buf = lbuf; + memcpy(lmsg.buf, it->dbuf.s, it->dbuf.len); + lmsg.len = it->dbuf.len; + lmsg.rcv = it->rcv; + lmsg.id = it->msgno; + lmsg.pid = it->pid; + lmsg.set_global_address = default_global_address; + lmsg.set_global_port = default_global_port; + + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { + LM_ERR("failed to parse msg id [%.*s]\n", msgid->len, msgid->s); + lock_release(&_siprepo_table[slotid].lock); + return 1; + } + if(unlikely(parse_headers(&lmsg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) + < 0)) { + LOG(cfg_get(core, core_cfg, sip_parser_log), + "parsing relevant headers failed\n"); + } + /* set log prefix */ + log_prefix_set(&lmsg); + + /* ... clear branches from previous message */ + clear_branches(); if(it->mtype==SIP_REQUEST) { + ruri_mark_new(); rtype = REQUEST_ROUTE; } else { rtype = CORE_ONREPLY_ROUTE; @@ -340,7 +371,10 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname) } set_route_type(rtbk); ksr_msg_env_reset(); - + LM_DBG("cleaning up\n"); + free_sip_msg(&lmsg); + /* reset log prefix */ + log_prefix_set(NULL); return 0; } diff --git a/src/modules/siprepo/siprepo_data.h b/src/modules/siprepo/siprepo_data.h index ed568fa90a..ba519a558a 100644 --- a/src/modules/siprepo/siprepo_data.h +++ b/src/modules/siprepo/siprepo_data.h @@ -38,7 +38,9 @@ typedef struct siprepo_msg { str vbranch; str dbuf; unsigned int cseqmetid; + int msgno; int pid; + flag_t mflags; receive_info_t rcv; time_t itime; struct siprepo_msg *next;

2 years

git:master:ba66bc87: corex: docs for forward_reply() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba66bc87ac05403f494d2820ef53a40b321881b0 URL: https://github.com/kamailio/kamailio/commit/ba66bc87ac05403f494d2820ef53a40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:14:42+02:00 corex: docs for forward_reply() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba66bc87ac05403f494d2820ef53a40… Patch: https://github.com/kamailio/kamailio/commit/ba66bc87ac05403f494d2820ef53a40… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index da9d8ea101..2675a559ac 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -904,6 +904,27 @@ event_route[dispatcher:dst-down] { xinfo("matched local socket name\n"); } ... +</programlisting> + </example> + </section> + <section id="corex.f.forward_reply"> + <title> + <function moreinfo="none">forward_reply()</function> + </title> + <para> + Forward received reply on demand. + </para> + <para> + This function can be used in CORE_ONREPLY_ROUTE. + </para> + <example> + <title><function>forward_reply</function> usage</title> + <programlisting format="linespecific"> +... +route[reply] { + forward_reply(); +} +... </programlisting> </example> </section>

2 years

git:master:a23ede72: corex: added forward_reply() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a23ede7247b52ddc53dc0186810923dc1ae8c51c URL: https://github.com/kamailio/kamailio/commit/a23ede7247b52ddc53dc0186810923d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-14T12:11:37+02:00 corex: added forward_reply() function - forward received reply on demand --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a23ede7247b52ddc53dc0186810923d… Patch: https://github.com/kamailio/kamailio/commit/a23ede7247b52ddc53dc0186810923d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 765bedf5f1..3c6b6a59f4 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -34,6 +34,7 @@ #include "../../core/str_list.h" #include "../../core/events.h" #include "../../core/onsend.h" +#include "../../core/forward.h" #include "../../core/dns_cache.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -47,6 +48,7 @@ MODULE_VERSION static int nio_intercept = 0; +static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2); static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send_udp(sip_msg_t *msg, char *su, char *sq); static int w_send_tcp(sip_msg_t *msg, char *su, char *sq); @@ -105,6 +107,8 @@ static tr_export_t mod_trans[] = { }; static cmd_export_t cmds[]={ + {"forward_reply", (cmd_function)w_forward_reply, 0, 0, + 0, CORE_ONREPLY_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 1, fixup_spve_null, @@ -249,6 +253,7 @@ static int child_init(int rank) return 0; } + /** * destroy module function */ @@ -256,6 +261,15 @@ static void mod_destroy(void) { } +/** + * forward reply based on via + */ +static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2) +{ + forward_reply(msg); + return 1; +} + /** * config wrapper for append branch */

2 years

The recursive lock of tm module is not safe?

by 王斌

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 years

git:master:190e172f: siprepo: timer routing to clean up stored items

by Daniel-Constantin Mierla

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); +} + /** * */

2 years

git:master:4e86a159: siprepo: new module to store sip message content in a hash table

by Daniel-Constantin Mierla

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…

2 years

Roadmap to the next major release - v5.6.0

by Daniel-Constantin Mierla

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

2 years

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022