- sr-dev - kamailio.org

git:master:5fee7d81: core: tcp - debug message on no connect
by Daniel-Constantin Mierla 09 Dec '22

09 Dec '22

Module: kamailio Branch: master Commit: 5fee7d818f18afcab4d2e17231d2e4eab79b7b48 URL: https://github.com/kamailio/kamailio/commit/5fee7d818f18afcab4d2e17231d2e4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-09T10:29:37+01:00 core: tcp - debug message on no connect --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/5fee7d818f18afcab4d2e17231d2e4e… Patch: https://github.com/kamailio/kamailio/commit/5fee7d818f18afcab4d2e17231d2e4e… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2114e390f4..65b366b801 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2044,8 +2044,10 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, } /* check if connect() is disabled */ if (unlikely((dst->send_flags.f & SND_F_FORCE_CON_REUSE) || - cfg_get(tcp, tcp_cfg, no_connect))) + cfg_get(tcp, tcp_cfg, no_connect))) { + LM_DBG("no connect set and no active connection\n"); return -1; + } LM_DBG("no open tcp connection found, opening new one\n"); /* create tcp connection */ if (likely(from==0)){

1 0

Next online devel meeting - Thu, Dec 8, 2022, 15:00UTC
by Daniel-Constantin Mierla 08 Dec '22

08 Dec '22

Hello, to summarize what happened at the devel meeting in Dusseldorf a few weeks ago and plan the next steps for the project, we are planning an online development meeting on Thu, Dec 8, 2022, 15:00UTC. As usual, one of the targets is to sketch the roadmap to next major release so the developers and community members can syncronize and plan what should be done till Kamailio v5.7 (or 6.0) will be out as well as discuss about current state of the project, look for new ideas to improve collaboration within the community, a.s.o. The meeting will be done on a matrix chat room. More details are in the wiki page of the event, available at: * https://github.com/kamailio/kamailio-wiki/blob/main/docs/devel/irc-meetings… Feel free to add there topics that you want to be discussed. The proposed date is Thursday, December 08, 2022, at 15:00UTC (15:00 London/Dublin, 16:00 most of West Europe, 10:00 New York), but other dates can be proposed if they suit for more participants. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda _______________________________________________ Kamailio (SER) - Development Mailing List sr-dev(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

1 3

[kamailio/kamailio] Building Alpine APKs fail due to sunsetting of Python2 (Issue #3257)
by Ben Kaufman 08 Dec '22

08 Dec '22

### Description Issues building `PYTHON` module on Alpine Linux due to [sunsetting of Python2](https://www.python.org/doc/sunset-python-2/). The `python2` package (apk) has been removed from the current Alpine linux. The APKBUILD file in the current Kamailio branches includes build settings for installing the Python (python2) module. While I'm guessing it's possible to build python2 in the current Alpine container it was a conscious decision to no longer have a package for it. Given this, what is the opinion about not building this by default within the APKBUILD file? ### Troubleshooting Running `abuild -r` fails due to lack of python2 libraries. #### Reproduction Running `abuild -r` fails due to lack of python2 libraries. #### Debugging Data N/A #### Log Messages N/A #### SIP Traffic N/A ### Possible Solutions In `APKBUILD` remove references to `python2` and `python` (but not `python3`). I'll submit a pull request to do this. ### Additional Information Kamailio 5.7 * **Operating System**: Alpine Linux latest -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3257 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3257(a)github.com>

2 2

[kamailio/kamailio] APKBUILD: remove python2 references (PR #3258)
by Ben Kaufman 08 Dec '22

08 Dec '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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3257 #### Description Do not build python2 module with default APKBUILD file due to python2 being sunsetted within Alpine Linux (there is no python2 APK). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3258 -- Commit Summary -- * APKBUILD: remove python2 references -- File Changes -- M pkg/kamailio/alpine/APKBUILD (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3258.patch https://github.com/kamailio/kamailio/pull/3258.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3258 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3258(a)github.com>

3 6

git:master:fafcf5f9: APKBUILD: remove python2 references
by Henning Westerholt 08 Dec '22

08 Dec '22

Module: kamailio Branch: master Commit: fafcf5f9c711d0d1cb32f2f3ab71df374e28bc16 URL: https://github.com/kamailio/kamailio/commit/fafcf5f9c711d0d1cb32f2f3ab71df3… Author: Kaufman <bkaufman(a)nexvortex.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-12-08T09:24:52+01:00 APKBUILD: remove python2 references - Remove python2 references from APKBUILD reported by GH #3257 --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/fafcf5f9c711d0d1cb32f2f3ab71df3… Patch: https://github.com/kamailio/kamailio/commit/fafcf5f9c711d0d1cb32f2f3ab71df3… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 6bf221630da..19aabe6c251 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -26,7 +26,7 @@ license="GPL-2.0" depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev - lksctp-tools-dev perl-dev postgresql-dev python2-dev python3-dev + lksctp-tools-dev perl-dev postgresql-dev python3-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev @@ -162,9 +162,6 @@ _mod_list_lua="app_lua app_lua_sr" # - modules depending on perl library _mod_list_perl="app_perl db_perlvdb" -# - modules depending on python2 library -_mod_list_python="app_python" - # - modules depending on ruby library _mod_list_ruby="app_ruby" @@ -255,7 +252,7 @@ for _i in db postgres sqlite dbtext mysql \ ldap utils tls presence lua ims outbound debugger \ extras json websocket authephemeral mongodb\ uuid ev memcached redis geoip2 jansson sqlang sipdump \ - jsdt http_async kazoo rabbitmq sctp radius perl python \ + jsdt http_async kazoo rabbitmq sctp radius perl \ python3 ruby; do subpackages="$subpackages $pkgname-$_i" @@ -545,11 +542,6 @@ perl() { "$_mod_list_perl" } -python() { - _generic_pkg "Execute embedded Python2 scripts" \ - "$_mod_list_python" -} - ruby() { _generic_pkg "Ruby extensions for Kamailio" \ "$_mod_list_ruby"

1 0

git:master:10aafffc: misc/examples/kemi: small update to kamailio-basic-kemi-jsdt.js
by Daniel-Constantin Mierla 08 Dec '22

08 Dec '22

Module: kamailio Branch: master Commit: 10aafffc86e872de1ad83177529e3a417449b294 URL: https://github.com/kamailio/kamailio/commit/10aafffc86e872de1ad83177529e3a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-08T08:36:02+01:00 misc/examples/kemi: small update to kamailio-basic-kemi-jsdt.js --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/10aafffc86e872de1ad83177529e3a4… Patch: https://github.com/kamailio/kamailio/commit/10aafffc86e872de1ad83177529e3a4… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 9949739d94..ed1e523be5 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -34,11 +34,6 @@ function ksr_request_route() return; } - // handle requests within SIP dialogs - ksr_route_withindlg(); - - // -- only initial requests (no To tag) - // handle retransmissions if (!KSR.is_ACK()) { if (KSR.tmx.t_precheck_trans()>0) { @@ -48,6 +43,11 @@ function ksr_request_route() if (KSR.tm.t_check_trans()==0) { return; } } + // handle requests within SIP dialogs + ksr_route_withindlg(); + + // -- only initial requests (no To tag) + // authentication ksr_route_auth(); @@ -153,7 +153,7 @@ function ksr_route_reqinit() KSR.x.exit(); } - if (KSR.sanity.sanity_check(1511, 7)<0) { + if (KSR.sanity.sanity_check(17895, 7)<0) { KSR.err("Malformed SIP message from " + KSR.kx.get_srcip() + ":" + KSR.kx.get_srcport() + "\n"); KSR.x.exit();

1 0

git:master:8a54c457: misc/examples/kemi: updates to kamailio-basic-kemi-python3s.py
by Daniel-Constantin Mierla 08 Dec '22

08 Dec '22

Module: kamailio Branch: master Commit: 8a54c457bd1629ad4920caed4bcc5e10483df6dc URL: https://github.com/kamailio/kamailio/commit/8a54c457bd1629ad4920caed4bcc5e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-08T08:39:27+01:00 misc/examples/kemi: updates to kamailio-basic-kemi-python3s.py --- Modified: misc/examples/kemi/kamailio-basic-kemi-python3s.py --- Diff: https://github.com/kamailio/kamailio/commit/8a54c457bd1629ad4920caed4bcc5e1… Patch: https://github.com/kamailio/kamailio/commit/8a54c457bd1629ad4920caed4bcc5e1… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python3s.py b/misc/examples/kemi/kamailio-basic-kemi-python3s.py index 7c36262c4a..00715149db 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python3s.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python3s.py @@ -44,20 +44,21 @@ def ksr_request_route(): ksr_route_relay() return 1 + # handle retransmissions + if not KSR.is_ACK() : + if KSR.tmx.t_precheck_trans()>0 : + KSR.tm.t_check_trans() + return 1 + + if KSR.tm.t_check_trans()==0 : + return 1 + # handle requests within SIP dialogs if ksr_route_withindlg()==-255 : return 1 # -- only initial requests (no To tag) - # handle retransmissions - if KSR.tmx.t_precheck_trans()>0 : - KSR.tm.t_check_trans() - return 1 - - if KSR.tm.t_check_trans()==0 : - return 1 - # authentication if ksr_route_auth()==-255 : return 1 @@ -70,7 +71,7 @@ def ksr_request_route(): # account only INVITEs - if KSR.pv.get("$rm")=="INVITE" : + if KSR.is_INVITE() : KSR.setflag(FLT_ACC); # do accounting @@ -120,24 +121,30 @@ def ksr_route_relay(): # Per SIP request initial checks def ksr_route_reqinit(): - srcip = KSR.pv.get("$si") - if not KSR.is_myself(srcip) : - if not KSR.pv.is_null("$sht(ipban=>$si)") : + # no connect for sending replies + KSR.set_reply_no_connect() + # enforce symmetric signaling + # send back replies to the source address of request + KSR.force_rport() + + if not KSR.is_myself_srcip() : + srcip = KSR.kx.get_srcip() + if KSR.htable.sht_match_name("ipban", "eq", srcip) > 0 : # ip is already blocked - KSR.dbg("request from blocked IP - " + KSR.pv.get("$rm") - + " from " + KSR.pv.get("$fu") + " (IP:" - + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) + ")\n") + KSR.dbg("request from blocked IP - " + KSR.kx.get_method() + + " from " + KSR.kx.get_furi() + " (IP:" + + srcip + ":" + str(KSR.pv.get("$sp")) + ")\n") return -255 if KSR.pike.pike_check_req()<0 : - KSR.err("ALERT: pike blocking " + KSR.pv.get("$rm") - + " from " + KSR.pv.get("$fu") + " (IP:" - + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) + ")\n") - KSR.pv.seti("$sht(ipban=>$si)", 1) + KSR.err("ALERT: pike blocking " + KSR.kx.get_method() + + " from " + KSR.kx.get_furi() + " (IP:" + + srcip + ":" + str(KSR.pv.get("$sp")) + ")\n") + KSR.htable.sht_seti("ipban", srcip, 1) return -255 if KSR.corex.has_user_agent() > 0 : - ua = KSR.pv.gete("$ua") + ua = KSR.kx.gete_ua() if (ua.find("friendly")!=-1 or ua.find("scanner")!=-1 or ua.find("sipcli")!=-1 or ua.find("sipvicious")!=-1) : KSR.sl.sl_send_reply(200, "Processed")

1 0

git:master:b8991795: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: b89917952fd3476b81a0fb5f5536e3ebf559bc83 URL: https://github.com/kamailio/kamailio/commit/b89917952fd3476b81a0fb5f5536e3e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-12-07T14:31:27+01:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README --- Diff: https://github.com/kamailio/kamailio/commit/b89917952fd3476b81a0fb5f5536e3e… Patch: https://github.com/kamailio/kamailio/commit/b89917952fd3476b81a0fb5f5536e3e…

1 0

[kamailio/kamailio] imc module enhancements (PR #3291)
by Joey Golan 07 Dec '22

07 Dec '22

#### Pre-Submission Checklist    - [V] Commit message has the format required by CONTRIBUTING guide - [V] Commits are split per component (core, individual modules, libs, utils, ...) - [V] Each component has a single commit (if not, squash them into one commit) - [V] 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) - [V] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [V] PR should be backported to stable branches - [V] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I modified the imc module as follows: 1. propagate content-type header 2. add the option to modify member role 3. added support to db_mode. all changes are synch to db in case db_mode is set to 2. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3291 -- Commit Summary -- * imc: add support to modify member role * imc: call handle_modify * imc: db_mode support * Merge branch 'kamailio:master' into master * imc: destroy db only if db_mode is not 0 * Merge remote-tracking branch 'joeygo/master' * imc: propagate content-type header * Merge branch 'kamailio:master' into master -- File Changes -- M src/modules/imc/doc/imc.xml (7) M src/modules/imc/doc/imc_admin.xml (35) M src/modules/imc/imc.c (326) M src/modules/imc/imc.h (1) M src/modules/imc/imc_cmd.c (260) M src/modules/imc/imc_cmd.h (9) M src/modules/imc/imc_mng.c (405) M src/modules/imc/imc_mng.h (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3291.patch https://github.com/kamailio/kamailio/pull/3291.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3291 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3291(a)github.com>

2 2

git:master:c6c5a4e2: imc: destroy db only if db_mode is not 0
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: c6c5a4e2a1e963b7f7a044a51f4e9f8812a83bd5 URL: https://github.com/kamailio/kamailio/commit/c6c5a4e2a1e963b7f7a044a51f4e9f8… Author: Joey Golan <joeygo(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T14:21:57+01:00 imc: destroy db only if db_mode is not 0 --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/c6c5a4e2a1e963b7f7a044a51f4e9f8… Patch: https://github.com/kamailio/kamailio/commit/c6c5a4e2a1e963b7f7a044a51f4e9f8… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 14989e6757..e920873165 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -469,6 +469,9 @@ static void destroy(void) db_key_t rq_cols[4]; db_val_t rq_vals[4]; + if (db_mode == 0) + goto done; + if(imc_db==NULL) goto done;

1 0

git:master:3cab2dd0: imc: propagate content-type header
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 3cab2dd0d2802bf33d0e76cc81a3b40f70611cda URL: https://github.com/kamailio/kamailio/commit/3cab2dd0d2802bf33d0e76cc81a3b40… Author: Joey Golan <joeygo(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T14:21:57+01:00 imc: propagate content-type header --- Modified: src/modules/imc/imc.c Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/3cab2dd0d2802bf33d0e76cc81a3b40… Patch: https://github.com/kamailio/kamailio/commit/3cab2dd0d2802bf33d0e76cc81a3b40… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index e920873165..47216ba2cc 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -54,7 +54,7 @@ MODULE_VERSION /** header variables */ -str imc_hdrs = str_init("Content-Type: text/plain\r\nSupported: kamailio/imc\r\n"); +str imc_hdrs = str_init("Supported: kamailio/imc\r\n"); char hdr_buf[1024]; str all_hdrs; @@ -435,7 +435,7 @@ static int ki_imc_manager(struct sip_msg* msg) } goto done; - } + } if(imc_handle_message(msg, &body, &src, &dst)<0) { diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index adff66e24f..ea76e79816 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -91,29 +91,37 @@ static str *get_callid(struct sip_msg *msg) static str *build_headers(struct sip_msg *msg) { + static str ctname = STR_STATIC_INIT("Content-Type: "); static str name = STR_STATIC_INIT("In-Reply-To: "); + static str nl = STR_STATIC_INIT("\r\n"); static char buf[1024]; static str rv; str *callid; - if ((callid = get_callid(msg)) == NULL) - return &all_hdrs; - rv.s = buf; - rv.len = all_hdrs.len + name.len + callid->len; + rv.len = all_hdrs.len + ctname.len + msg->content_type->body.len; + + memcpy(buf, all_hdrs.s, all_hdrs.len); + memcpy(buf + all_hdrs.len, ctname.s, ctname.len); + memcpy(buf + all_hdrs.len + ctname.len, msg->content_type->body.s, msg->content_type->body.len); + + if ((callid = get_callid(msg)) == NULL) { + return &rv; + } + + rv.len += nl.len + name.len + callid->len; if (rv.len > sizeof(buf)) { LM_ERR("Header buffer too small for In-Reply-To header\n"); - return &all_hdrs; + return &rv; } - - memcpy(buf, all_hdrs.s, all_hdrs.len); - memcpy(buf + all_hdrs.len, name.s, name.len); - memcpy(buf + all_hdrs.len + name.len, callid->s, callid->len); + + memcpy(buf + all_hdrs.len + ctname.len + msg->content_type->body.len, nl.s, nl.len); + memcpy(buf + all_hdrs.len + ctname.len + msg->content_type->body.len + nl.len, name.s, name.len); + memcpy(buf + all_hdrs.len + ctname.len + msg->content_type->body.len + nl.len + name.len, callid->s, callid->len); return &rv; } - static str *format_uri(str uri) { static char buf[512];

1 0

git:master:344ef3df: imc: call handle_modify
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 344ef3dfec5cfc4865f01db845112617c7b5e096 URL: https://github.com/kamailio/kamailio/commit/344ef3dfec5cfc4865f01db84511261… Author: Joey Golan <joeygo(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T14:21:57+01:00 imc: call handle_modify --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/344ef3dfec5cfc4865f01db84511261… Patch: https://github.com/kamailio/kamailio/commit/344ef3dfec5cfc4865f01db84511261… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 9638b5b06f..f9f931d7b5 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -590,6 +590,14 @@ static int ki_imc_manager(struct sip_msg* msg) goto error; } break; + case IMC_CMDID_MODIFY: + if(imc_handle_modify(msg, &cmd, &src, &dst)<0) + { + LM_ERR("failed to handle 'modify'\n"); + ret = -120; + goto error; + } + break; case IMC_CMDID_HELP: if(imc_handle_help(msg, &cmd, &src, &dst)<0) {

1 0

git:master:b94e158e: imc: db_mode support
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: b94e158e0f7656b574f37a14bd88348fe6548233 URL: https://github.com/kamailio/kamailio/commit/b94e158e0f7656b574f37a14bd88348… Author: Joey Golan <joeygo(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T14:21:57+01:00 imc: db_mode support Support db_mode. if db_mode is 2, synch all operations to DB, otherwise use only memory. --- Modified: src/modules/imc/doc/imc_admin.xml Modified: src/modules/imc/imc.c Modified: src/modules/imc/imc.h Modified: src/modules/imc/imc_cmd.c Modified: src/modules/imc/imc_mng.c Modified: src/modules/imc/imc_mng.h --- Diff: https://github.com/kamailio/kamailio/commit/b94e158e0f7656b574f37a14bd88348… Patch: https://github.com/kamailio/kamailio/commit/b94e158e0f7656b574f37a14bd88348…

1 0

git:master:7d3d94b1: imc: add support to modify member role
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 7d3d94b19f5d93e0100f678b64d92de679c0403e URL: https://github.com/kamailio/kamailio/commit/7d3d94b19f5d93e0100f678b64d92de… Author: Joey Golan <joeygo(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T14:21:57+01:00 imc: add support to modify member role --- Modified: src/modules/imc/doc/imc.xml Modified: src/modules/imc/doc/imc_admin.xml Modified: src/modules/imc/imc_cmd.c Modified: src/modules/imc/imc_cmd.h Modified: src/modules/imc/imc_mng.c Modified: src/modules/imc/imc_mng.h --- Diff: https://github.com/kamailio/kamailio/commit/7d3d94b19f5d93e0100f678b64d92de… Patch: https://github.com/kamailio/kamailio/commit/7d3d94b19f5d93e0100f678b64d92de…

1 0

[kamailio/kamailio] tm: cleanup parsed body at the end t_continue_helper (PR #3294)
by Rick Barenthin 07 Dec '22

07 Dec '22

- if t_suspend and t_continue are used for replies and in the called route in t_continue the body of the sip message is parsed the pkg memory of the parsed body is leaked   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] 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/3294 -- Commit Summary -- * tm: cleanup parsed body at the end t_continue_helper -- File Changes -- M src/modules/tm/t_suspend.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3294.patch https://github.com/kamailio/kamailio/pull/3294.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3294 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3294(a)github.com>

2 2

git:master:f409a8c9: tm: cleanup parsed body at the end t_continue_helper
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: f409a8c9f6fde33eaf8b428887e219b56740b0a5 URL: https://github.com/kamailio/kamailio/commit/f409a8c9f6fde33eaf8b428887e219b… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T14:14:42+01:00 tm: cleanup parsed body at the end t_continue_helper - if t_suspend and t_continue are used for replies and in the called route in t_continue the body of the sip message is parsed the pkg memory of the parsed body is leaked --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/f409a8c9f6fde33eaf8b428887e219b… Patch: https://github.com/kamailio/kamailio/commit/f409a8c9f6fde33eaf8b428887e219b… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index f0255d6647..4e25c3c89b 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -554,6 +554,11 @@ static int t_continue_helper(unsigned int hash_index, unsigned int label, hdr = hdr->next; } } + + /* trigger free of body */ + if(brpl->body && brpl->body->free) { + brpl->body->free(&brpl->body); + } sip_msg_free(brpl); } }

1 0

git:master:7f9547ae: misc/examples/kemi: native config upated
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 7f9547ae2b5a5848f693544124f199f4082be22c URL: https://github.com/kamailio/kamailio/commit/7f9547ae2b5a5848f693544124f199f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T11:44:56+01:00 misc/examples/kemi: native config upated --- Modified: misc/examples/kemi/kamailio-basic-kemi-native.cfg --- Diff: https://github.com/kamailio/kamailio/commit/7f9547ae2b5a5848f693544124f199f… Patch: https://github.com/kamailio/kamailio/commit/7f9547ae2b5a5848f693544124f199f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-native.cfg b/misc/examples/kemi/kamailio-basic-kemi-native.cfg index c95517cc9e..984c45b877 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-native.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi-native.cfg @@ -20,18 +20,20 @@ request_route { exit; } + # handle retransmissions + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + } + # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) - # handle retransmissions - if(t_precheck_trans()) { - t_check_trans(); - exit; - } - t_check_trans(); - # authentication route(AUTH); @@ -86,8 +88,14 @@ route[RELAY] { # Per SIP request initial checks route[REQINIT] { + # no connect for sending replies + set_reply_no_connect(); + # enforce symmetric signaling + # - send back replies to the source address of request + force_rport(); + #!ifdef WITH_ANTIFLOOD - # flood dection from same IP and traffic ban for a while + # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { @@ -102,11 +110,12 @@ route[REQINIT] { exit; } } - if($ua =~ "friendly-scanner") { - sl_send_reply("200", "OK"); +#!endif + if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent|pplsip") { + # silent drop for scanners - uncomment next line if want to reply + # sl_send_reply("200", "OK"); exit; } -#!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); @@ -118,8 +127,8 @@ route[REQINIT] { exit; } - if(!sanity_check("1511", "7")) { - xlog("Malformed SIP message from $si:$sp\n"); + if(!sanity_check("17895", "7")) { + xlog("Malformed SIP request from $si:$sp\n"); exit; } }

1 0

Fosdem 2023 - CfP
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Hello, should anyone be interested to present or just go to FOSDEM 2023, note that it is going to take place in Brussels during February 4-5, 2023. With a increasing demand on topics to be covered, many more devrooms were accepted and Real Time Communication devroom has half a day available on the afternoon of February 5, 2023. The RTC Devroom call for presentations is open, more details at; - https://lists.fosdem.org/pipermail/fosdem/2022q4/003479.html Check also the other accepted devrooms, maybe one suits better for your work with open source nowadays and you can submit proposals to them: - https://fosdem.org/2023/news/2022-11-07-accepted-developer-rooms/ Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:0f3f0235: misc/examples/kemi: updated kamailio-basic-kemi-ruby.rb in sync with kemi samples
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 0f3f02353535034beaf84ea833cdd5bf30cd46a2 URL: https://github.com/kamailio/kamailio/commit/0f3f02353535034beaf84ea833cdd5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T10:11:12+01:00 misc/examples/kemi: updated kamailio-basic-kemi-ruby.rb in sync with kemi samples --- Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb --- Diff: https://github.com/kamailio/kamailio/commit/0f3f02353535034beaf84ea833cdd5b… Patch: https://github.com/kamailio/kamailio/commit/0f3f02353535034beaf84ea833cdd5b… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb index 37c6dddc34..30bb742332 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb +++ b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb @@ -28,8 +28,6 @@ def ksr_request_route() return end - ksr_route_withindlg() - # Retransmissions if !KSR.is_ACK() then if KSR::TMX.t_precheck_trans() > 0 then @@ -39,7 +37,12 @@ def ksr_request_route() return if KSR::TM.t_check_trans() == 0 end - # Auth + # Handle requests within SIP dialogs + ksr_route_withindlg() + + # -- only initial requests (no To tag) + + # Authentication ksr_route_auth() # Record routing for dialog forming requests (in case they are routed) @@ -56,35 +59,16 @@ def ksr_request_route() # Registrations ksr_route_registrar() - # USRLOC - ksr_route_location() - - return -end - -def ksr_route_reqinit() - if KSR::COREX.has_user_agent() > 0 then - ua = KSR::PV.gete("$ua"); - if ua.include? 'friendly' or ua.include? 'scanner' or ua.include? 'sipcli' or ua.include? 'sipvicious' then - KSR::SL.sl_send_reply(200, "OK"); - exit - end + if KSR::COREX.has_ruri_user() < 0 then + # request with no Username in RURI + KSR::SL.sl_send_reply(484,"Address Incomplete"); + return; end - if KSR::MAXFWD.process_maxfwd(10) < 0 then - KSR::SL.sl_send_reply(483,"Too Many Hops"); - exit - end - - if KSR.is_OPTIONS() and KSR.is_myself_ruri() and KSR::COREX.has_ruri_user() < 0 then - KSR::SL.sl_send_reply(200, "Keepalive"); - exit - end + # User location service + ksr_route_location() - if KSR::SANITY.sanity_check(1511, 7) < 0 then - KSR.err("Malformed SIP message from #{KSR::PV.get('$si')}:#{KSR::PV.get('$sp')}\n"); - exit - end + return end def ksr_route_relay() @@ -111,6 +95,56 @@ def ksr_route_relay() exit end +def ksr_route_reqinit() + # no connect for sending replies + KSR.set_reply_no_connect(); + # enforce symmetric signaling + # send back replies to the source address of request + KSR.force_rport(); + + if !KSR.is_myself_srcip() then + srcip = KSR::KX.get_srcip(); + if KSR::HTABLE.sht_match_name("ipban", "eq", srcip) > 0 then + # ip is already blocked + KSR.dbg("request from blocked IP - " + KSR::KX.get_method() + + " from " + KSR::KX.get_furi() + " (IP:" + + srcip + ":" + KSR::KX.get_srcport() + ")\n"); + exit; + end + if KSR::PIKE.pike_check_req() < 0 then + KSR.err("ALERT: pike blocking " + KSR.kx.get_method() + + " from " + KSR::KX.get_furi() + " (IP:" + + srcip + ":" + KSR.kx.get_srcport() + ")\n"); + KSR::HTABLE.sht_seti("ipban", srcip, 1); + exit; + end + end + + if KSR::COREX.has_user_agent() > 0 then + ua = KSR::PV.gete("$ua"); + if ua.include? 'friendly' or ua.include? 'scanner' or + ua.include? 'sipcli' or ua.include? 'sipvicious' then + KSR::SL.sl_send_reply(200, "OK"); + exit + end + end + + if KSR::MAXFWD.process_maxfwd(10) < 0 then + KSR::SL.sl_send_reply(483,"Too Many Hops"); + exit + end + + if KSR.is_OPTIONS() and KSR.is_myself_ruri() and KSR::COREX.has_ruri_user() < 0 then + KSR::SL.sl_send_reply(200, "Keepalive"); + exit + end + + if KSR::SANITY.sanity_check(17895, 7) < 0 then + KSR.err("Malformed SIP message from #{KSR::PV.get('$si')}:#{KSR::PV.get('$sp')}\n"); + exit + end +end + def ksr_route_withindlg() return if KSR::SIPUTILS.has_totag() < 0

1 0

git:master:29c9d3af: misc/examples/kemi: fixed line break in kamailio-basic-kemi-ruby.rb
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 29c9d3af78656f4dba8e9517ab07d2f403327b08 URL: https://github.com/kamailio/kamailio/commit/29c9d3af78656f4dba8e9517ab07d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T09:12:23+01:00 misc/examples/kemi: fixed line break in kamailio-basic-kemi-ruby.rb --- Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb --- Diff: https://github.com/kamailio/kamailio/commit/29c9d3af78656f4dba8e9517ab07d2f… Patch: https://github.com/kamailio/kamailio/commit/29c9d3af78656f4dba8e9517ab07d2f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb index 2a3a9eca41..37c6dddc34 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb +++ b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb @@ -65,8 +65,7 @@ def ksr_request_route() def ksr_route_reqinit() if KSR::COREX.has_user_agent() > 0 then ua = KSR::PV.gete("$ua"); - if ua.include? 'friendly' or ua.include? 'scanner' - or ua.include? 'sipcli' or ua.include? 'sipvicious' then + if ua.include? 'friendly' or ua.include? 'scanner' or ua.include? 'sipcli' or ua.include? 'sipvicious' then KSR::SL.sl_send_reply(200, "OK"); exit end

1 0

git:master:b1f9045f: app_python3: fetch tupple item to get parameters
by Daniel-Constantin Mierla 06 Dec '22

06 Dec '22

Module: kamailio Branch: master Commit: b1f9045fc4fa23ecd81689715ee469034755def8 URL: https://github.com/kamailio/kamailio/commit/b1f9045fc4fa23ecd81689715ee4690… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-06T13:16:51+01:00 app_python3: fetch tupple item to get parameters --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b1f9045fc4fa23ecd81689715ee4690… Patch: https://github.com/kamailio/kamailio/commit/b1f9045fc4fa23ecd81689715ee4690… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index def52db092..71bc849e11 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -278,7 +278,7 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_ERR("invalid number of parameters - idx: %d argc: %d\n", i, (int)alen); return sr_kemi_apy_return_false(); } - pobj = PyList_GetItem(args, i); + pobj = PyTuple_GetItem(args, i); if(pobj==NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen);

1 0

git:5.5:6816f807: pv_headers: fix t_resume scenario
by Victor Seva 06 Dec '22

06 Dec '22

Module: kamailio Branch: 5.5 Commit: 6816f8070c931adba83e93616e29fb7fb70d84f0 URL: https://github.com/kamailio/kamailio/commit/6816f8070c931adba83e93616e29fb7… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-12-06T12:07:22+01:00 pv_headers: fix t_resume scenario (cherry picked from commit af1d9c156e0a69c9e3f39a063f7dd97d1c0a7bf1) (cherry picked from commit 0b52ac67fe12fab9127f30711313470257d32eaa) --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/6816f8070c931adba83e93616e29fb7… Patch: https://github.com/kamailio/kamailio/commit/6816f8070c931adba83e93616e29fb7… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 6dfac3d18be..daf223c15c2 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -65,6 +65,7 @@ static void mod_destroy(void); static int mod_init(void); static void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params); +static int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_branch_cb( struct sip_msg *msg, unsigned int flags, void *cb); @@ -315,6 +316,12 @@ int mod_init(void) LM_ERR("cannot register PRE_SCRIPT_CB ONREPLY_CB callbacks\n"); return -1; } + if(register_script_cb( + handle_msg_failed_cb, PRE_SCRIPT_CB | FAILURE_CB, 0) + < 0) { + LM_ERR("cannot register PRE_SCRIPT_CB FAILURE_CB callbacks\n"); + return -1; + } } pvh_str_hash_init(&skip_headers, &skip_headers_param, "skip_headers"); @@ -392,6 +399,29 @@ static inline char *tm_type_to_string(int type) return "UNKNOWN"; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) { struct sip_msg *msg = NULL; @@ -421,11 +451,25 @@ void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) return; } +int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb) +{ + print_cb_flags(flags); + + if(pvh_parse_msg(msg) != 0) + return 1; + + _branch = 0; + LM_DBG("msg:%p set branch:%d\n", msg, _branch); + return 1; +} + static int msg_cbs = TMCB_REQUEST_FWDED | TMCB_RESPONSE_FWDED | TMCB_ON_BRANCH_FAILURE; int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + print_cb_flags(flags); + if(pvh_parse_msg(msg) != 0) return 1; @@ -444,6 +488,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) { LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(flags & PRE_SCRIPT_CB) { pvh_get_branch_index(msg, &_branch); @@ -462,7 +507,11 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) if(pvh_parse_msg(msg) != 0) return 1; + if(msg == FAKED_REPLY) { + LM_DBG("FAKED_REPLY\n"); + } LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(tmb.t_check(msg, &_branch) == -1) { LM_ERR("failed find UAC branch\n");

1 0

git:5.6:0b52ac67: pv_headers: fix t_resume scenario
by Victor Seva 06 Dec '22

06 Dec '22

Module: kamailio Branch: 5.6 Commit: 0b52ac67fe12fab9127f30711313470257d32eaa URL: https://github.com/kamailio/kamailio/commit/0b52ac67fe12fab9127f30711313470… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-12-06T12:06:28+01:00 pv_headers: fix t_resume scenario (cherry picked from commit af1d9c156e0a69c9e3f39a063f7dd97d1c0a7bf1) --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/0b52ac67fe12fab9127f30711313470… Patch: https://github.com/kamailio/kamailio/commit/0b52ac67fe12fab9127f30711313470… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index e555e0265bb..3648335b9ef 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -65,6 +65,7 @@ static void mod_destroy(void); static int mod_init(void); static void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params); +static int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_branch_cb( struct sip_msg *msg, unsigned int flags, void *cb); @@ -385,6 +386,12 @@ int mod_init(void) LM_ERR("cannot register PRE_SCRIPT_CB ONREPLY_CB callbacks\n"); return -1; } + if(register_script_cb( + handle_msg_failed_cb, PRE_SCRIPT_CB | FAILURE_CB, 0) + < 0) { + LM_ERR("cannot register PRE_SCRIPT_CB FAILURE_CB callbacks\n"); + return -1; + } } pvh_str_hash_init(&skip_headers, &skip_headers_param, "skip_headers"); @@ -462,6 +469,29 @@ static inline char *tm_type_to_string(int type) return "UNKNOWN"; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) { struct sip_msg *msg = NULL; @@ -491,11 +521,25 @@ void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) return; } +int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb) +{ + print_cb_flags(flags); + + if(pvh_parse_msg(msg) != 0) + return 1; + + _branch = 0; + LM_DBG("msg:%p set branch:%d\n", msg, _branch); + return 1; +} + static int msg_cbs = TMCB_REQUEST_FWDED | TMCB_RESPONSE_FWDED | TMCB_ON_BRANCH_FAILURE; int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + print_cb_flags(flags); + if(pvh_parse_msg(msg) != 0) return 1; @@ -514,6 +558,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) { LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(flags & PRE_SCRIPT_CB) { pvh_get_branch_index(msg, &_branch); @@ -532,7 +577,11 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) if(pvh_parse_msg(msg) != 0) return 1; + if(msg == FAKED_REPLY) { + LM_DBG("FAKED_REPLY\n"); + } LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(tmb.t_check(msg, &_branch) == -1) { LM_ERR("failed find UAC branch\n");

1 0

git:master:af1d9c15: pv_headers: fix t_resume scenario
by Victor Seva 06 Dec '22

06 Dec '22

Module: kamailio Branch: master Commit: af1d9c156e0a69c9e3f39a063f7dd97d1c0a7bf1 URL: https://github.com/kamailio/kamailio/commit/af1d9c156e0a69c9e3f39a063f7dd97… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-12-06T12:02:13+01:00 pv_headers: fix t_resume scenario --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/af1d9c156e0a69c9e3f39a063f7dd97… Patch: https://github.com/kamailio/kamailio/commit/af1d9c156e0a69c9e3f39a063f7dd97… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index b900ae5be6..246339f8ef 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -65,6 +65,7 @@ static void mod_destroy(void); static int mod_init(void); static void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params); +static int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_branch_cb( struct sip_msg *msg, unsigned int flags, void *cb); @@ -385,6 +386,12 @@ int mod_init(void) LM_ERR("cannot register PRE_SCRIPT_CB ONREPLY_CB callbacks\n"); return -1; } + if(register_script_cb( + handle_msg_failed_cb, PRE_SCRIPT_CB | FAILURE_CB, 0) + < 0) { + LM_ERR("cannot register PRE_SCRIPT_CB FAILURE_CB callbacks\n"); + return -1; + } } pvh_str_hash_init(&skip_headers, &skip_headers_param, "skip_headers"); @@ -462,6 +469,29 @@ static inline char *tm_type_to_string(int type) return "UNKNOWN"; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) { struct sip_msg *msg = NULL; @@ -491,11 +521,25 @@ void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) return; } +int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb) +{ + print_cb_flags(flags); + + if(pvh_parse_msg(msg) != 0) + return 1; + + _branch = 0; + LM_DBG("msg:%p set branch:%d\n", msg, _branch); + return 1; +} + static int msg_cbs = TMCB_REQUEST_FWDED | TMCB_RESPONSE_FWDED | TMCB_ON_BRANCH_FAILURE; int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + print_cb_flags(flags); + if(pvh_parse_msg(msg) != 0) return 1; @@ -514,6 +558,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) { LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(flags & PRE_SCRIPT_CB) { pvh_get_branch_index(msg, &_branch); @@ -533,7 +578,11 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) if(pvh_parse_msg(msg) != 0) return 1; + if(msg == FAKED_REPLY) { + LM_DBG("FAKED_REPLY\n"); + } LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); t = tmb.t_find(msg, &_branch, &vref); if(t != NULL && t != T_UNDEFINED) {

1 0

git:master:3b9eee82: modules: readme files regenerated - app_python3s ... [skip ci]
by Kamailio Dev 06 Dec '22

06 Dec '22

Module: kamailio Branch: master Commit: 3b9eee82d604c14b60d5153e2a8bf356ddf99e0d URL: https://github.com/kamailio/kamailio/commit/3b9eee82d604c14b60d5153e2a8bf35… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-12-06T11:01:19+01:00 modules: readme files regenerated - app_python3s ... [skip ci] --- Modified: src/modules/app_python3s/README --- Diff: https://github.com/kamailio/kamailio/commit/3b9eee82d604c14b60d5153e2a8bf35… Patch: https://github.com/kamailio/kamailio/commit/3b9eee82d604c14b60d5153e2a8bf35… --- diff --git a/src/modules/app_python3s/README b/src/modules/app_python3s/README index bc012053a6..5b8d663797 100644 --- a/src/modules/app_python3s/README +++ b/src/modules/app_python3s/README @@ -27,6 +27,7 @@ Daniel-Constantin Mierla 3.1. load (string) 3.2. script_init (string) + 3.3. script_child_init (string) 4. Functions @@ -43,7 +44,8 @@ Daniel-Constantin Mierla 1.1. Set load parameter 1.2. Set script_init parameter - 1.3. app_python3s_exec usage + 1.3. Set script_child_init parameter + 1.4. app_python3s_exec usage Chapter 1. Admin Guide @@ -59,6 +61,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. script_init (string) + 3.3. script_child_init (string) 4. Functions @@ -114,6 +117,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. script_init (string) + 3.3. script_child_init (string) 3.1. load (string) @@ -143,6 +147,22 @@ def ksr_script_init(): return 1 ... +3.3. script_child_init (string) + + The name of the Python function to be executed when Kamailio forks + child processes at startup and when the script is reloaded. + + Default value is “” (not set). + + Example 1.3. Set script_child_init parameter +... +modparam("app_python3s", "script_child_init", "ksr_script_child_init") +... +def ksr_script_child_init(): + KSR.info("child init python script\n") + return 1 +... + 4. Functions 4.1. app_python3s_exec(method [, param]) @@ -155,7 +175,7 @@ def ksr_script_init(): Both parameters can contain pseudo-variables. - Example 1.3. app_python3s_exec usage + Example 1.4. app_python3s_exec usage ... app_python3s_exec("my_python_function"); app_python3s_exec("my_python_function", "my_params");

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev