sr-dev December 2022

sr-dev@lists.kamailio.org

11 participants
264 discussions

[kamailio/kamailio] imc module enhancements (PR #3291)

by Joey Golan

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

1 year, 5 months

git:master:3cab2dd0: imc: propagate content-type header

by Daniel-Constantin Mierla

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 year, 5 months

git:master:c6c5a4e2: imc: destroy db only if db_mode is not 0

by Daniel-Constantin Mierla

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 year, 5 months

git:master:b94e158e: imc: db_mode support

by Daniel-Constantin Mierla

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 year, 5 months

git:master:344ef3df: imc: call handle_modify

by Daniel-Constantin Mierla

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 year, 5 months

git:master:7d3d94b1: imc: add support to modify member role

by Daniel-Constantin Mierla

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 year, 5 months

[kamailio/kamailio] tm: cleanup parsed body at the end t_continue_helper (PR #3294)

by Rick Barenthin

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

1 year, 5 months

git:master:f409a8c9: tm: cleanup parsed body at the end t_continue_helper

by Daniel-Constantin Mierla

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 year, 5 months

git:master:7f9547ae: misc/examples/kemi: native config upated

by Daniel-Constantin Mierla

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 year, 5 months

Fosdem 2023 - CfP

by Daniel-Constantin Mierla

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 year, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2022