sr-dev December 2022

sr-dev@lists.kamailio.org

11 participants
267 discussions

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: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: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: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: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: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: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: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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2022