sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

by Julien Chavanton

Dear Kamailians, I just opened a merge request for a new module called RTP Media Server I understand that integrating an RTP/Media endpoint directly in Kamailio may seems strange at first. Let me share my thoughts ... By combining Kamailio, oRTP and mediastreamer2 this module is providing some very good foundation to support RTP endpoint and various media processing features. This seems like a great idea for various use cases like IoT, IVR or other specific needs. Kamailio is still handling everything related to SIP/SDP (the module is adding some SDP parsing, they could be integrated in the core if this seems fit). By doing integration with a library we can benefit from the scripting engine and probably KEMI. This does not means that everyone should run this module on a Kamailio sever acting as a load balancer, of course CPU intensive operations like resampling and encoding may be taking place on the server. oRTP is providing RTP endpoints compliant with (RFC 3550) MediaStreamer2, even if written in C is quite a high level library, because it is implementing a framework for audio processing using graphs of filters, filters can be to do various things. Similar to playing with lego blocks :) - Support for most free and some non free codecs can be added easily. - Work to bridge calls is already in progress in the module. - Mobile phone support ARM CPU and other embedded scenario should be supported Mediastream2 is creating one thread per call "msticker", this can work smoothly in Kamailio even if it is forking processes. Shared memory allocation is supported using wrapper around malloc/free used by the libraries. This project was started last year, I exposed the idea at KamailioWorld2017, the feedbacks I god where not all positives :) But we did speak about it again at ClueCon2018 and I was encouraged to complete the work and propose a MR. The module is not working and was tested with several softphones. I think it is time to submit it ... before considering adding more features or investing more time in it. Julien Example config using the features already implemented event_route[rms:start] { xnotice("[rms:start] play ...\n"); rms_play("/tmp/reference_8000.wav", "rms:after_play"); }; event_route[rms:after_play] { xnotice("[rms:after_play] play done...\n"); rms_hangup(); }; route { if (t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); if (is_method("INVITE") && !has_totag()) { if (!rms_answer()) { t_reply("503", "server error"); } } if (is_method("BYE")){ rms_media_stop(); } }

6 years

[kamailio/kamailio] acc: generating duplicates on missed / failed calls (#1673)

by Julien Chavanton

### Description I am looking at how to properly handle a problem with duplicate ACC This is when `TMCB_ON_FAILURE` and `TMCB_RESPONSE_OUT` are both called, they are not using the same version of the message. `TMCB_ON_FAILURE` is using the cloned version `TMCB_RESPONSE_OUT` is using the original version They are not sharing the message flags and 2 ACC events are generated. Since this is very sensitive, I want to make sure I can trace the real root cause. Not sure if this is a regression ... #### Reproduction Any failed call #### Debugging Data ``` 0(4603) NOTICE: acc [acc_logic.c:686]: tmcb_func(): acc callback called for t(0x7f768b6dac08) event type 2, reply code 404 reqmsg[0x7f768b6dc840] rplmsg[0x7f76d096dee8] 0(4603) ERROR: acc [acc_logic.c:697]: tmcb_func(): [TMCB_RESPONSE_IN][0x7f768b6dc840][0x7f76d096dee8] // reply route execution 0(4603) ERROR: <core> [core/sip_msg_clone.c:504]: sip_msg_shm_clone(): sip_msg_shm_clone[0x7f768b6dc840]>>[0x7f768b6de738] 0(4603) NOTICE: acc [acc_logic.c:686]: tmcb_func(): acc callback called for t(0x7f768b6dac08) event type 128, reply code 404 reqmsg[0x7f768b6de738] rplmsg[0x7f76d096dee8] 0(4603) ERROR: acc [acc_logic.c:694]: tmcb_func(): [TMCB_ON_FAILURE] run on_missed [0x7f768b6de738][0x7f76d096dee8] // working with the cloned message 0(4603) ERROR: <core> [core/flags.c:59]: isflagset(): isflagset[0x7f768b6de738] 0(4603) ERROR: acc_json [acc_json_mod.c:189]: acc_json_send_request(): missed call flag [7] for this transaction [on] // failure route execution, we are working with the cloned message 0(4603) NOTICE: <script>: [FAILURE] 0(4603) ERROR: <core> [core/flags.c:46]: setflag(): setflag[0x7f768b6de738] // failure 0(4603) NOTICE: acc [acc_logic.c:686]: tmcb_func(): acc callback called for t(0x7f768b6dac08) event type 512, reply code 404 reqmsg[0x7f768b6dc840] rplmsg[0x7f76d096dee8] 0(4603) ERROR: acc [acc_logic.c:689]: tmcb_func(): [TMCB_RESPONSE_OUT][0x7f768b6dc840][0x7f76d096dee8] // working with the original message 0(4603) ERROR: <core> [core/flags.c:59]: isflagset(): isflagset[0x7f768b6dc840] 0(4603) ERROR: acc_json [acc_json_mod.c:189]: acc_json_send_request(): missed call flag [7] for this transaction [on] ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1673

6 years

[kamailio/kamailio] acc: generating duplicates (#1674)

by Julien Chavanton

on missed / failed calls issue #1673 #### 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) - [x] Breaking change (not tested with all scenarios, review could confirm that this is not introducing regressions) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1673 #### Description problem with confusion when using flags (integer value vs bit position value) proposed solution is using the flags helpers functions `isflagset`, etc. where possible. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1674 -- Commit Summary -- * acc: generating duplicates -- File Changes -- M src/modules/acc/acc.c (8) M src/modules/acc/acc_logic.c (5) M src/modules/acc_diameter/acc_diameter_mod.c (4) M src/modules/acc_json/acc_json_mod.c (4) M src/modules/acc_radius/acc_radius_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1674.patch https://github.com/kamailio/kamailio/pull/1674.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1674

6 years

git:master:8cce4f24: acc_radius: fix generating duplicates for missed calls

by Henning Westerholt

Module: kamailio Branch: master Commit: 8cce4f243bc00f243671da7349edd3a11d5dc2ec URL: https://github.com/kamailio/kamailio/commit/8cce4f243bc00f243671da7349edd3a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc_radius: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8cce4f243bc00f243671da7349edd3a… Patch: https://github.com/kamailio/kamailio/commit/8cce4f243bc00f243671da7349edd3a… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index 54f5c15217..adbfe18b00 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -142,9 +142,9 @@ static int mod_init(void) memset(&_acc_radius_engine, 0, sizeof(acc_engine_t)); if(radius_flag != -1) - _acc_radius_engine.acc_flag = 1 << radius_flag; + _acc_radius_engine.acc_flag = radius_flag; if(radius_missed_flag != -1) - _acc_radius_engine.missed_flag = 1 << radius_missed_flag; + _acc_radius_engine.missed_flag = radius_missed_flag; _acc_radius_engine.acc_req = acc_radius_send_request; _acc_radius_engine.acc_init = acc_radius_init; memcpy(_acc_radius_engine.name, "radius", 6);

6 years

git:master:8d80f16f: acc_json: fix generating duplicates for missed calls

by Henning Westerholt

Module: kamailio Branch: master Commit: 8d80f16fc19036d64f917740417a65139b1dd7ae URL: https://github.com/kamailio/kamailio/commit/8d80f16fc19036d64f917740417a651… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc_json: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8d80f16fc19036d64f917740417a651… Patch: https://github.com/kamailio/kamailio/commit/8d80f16fc19036d64f917740417a651… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index d1549c7b86..908d7d0eb9 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -129,9 +129,9 @@ static int mod_init(void) memset(&_acc_json_engine, 0, sizeof(acc_engine_t)); if(acc_flag != -1) - _acc_json_engine.acc_flag = 1 << acc_flag; + _acc_json_engine.acc_flag = acc_flag; if(acc_missed_flag != -1) - _acc_json_engine.missed_flag = 1 << acc_missed_flag; + _acc_json_engine.missed_flag = acc_missed_flag; _acc_json_engine.acc_req = acc_json_send_request; _acc_json_engine.acc_init = acc_json_init; memcpy(_acc_json_engine.name, "json", 4);

6 years

git:master:3a471af7: acc_diameter: fix generating duplicates for missed calls

by Henning Westerholt

Module: kamailio Branch: master Commit: 3a471af738c6b8f7e717b7f2f4c6f9c579a2d9c8 URL: https://github.com/kamailio/kamailio/commit/3a471af738c6b8f7e717b7f2f4c6f9c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc_diameter: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc_diameter/acc_diameter_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3a471af738c6b8f7e717b7f2f4c6f9c… Patch: https://github.com/kamailio/kamailio/commit/3a471af738c6b8f7e717b7f2f4c6f9c… --- diff --git a/src/modules/acc_diameter/acc_diameter_mod.c b/src/modules/acc_diameter/acc_diameter_mod.c index 02ac75dc98..3a35fe7e93 100644 --- a/src/modules/acc_diameter/acc_diameter_mod.c +++ b/src/modules/acc_diameter/acc_diameter_mod.c @@ -143,9 +143,9 @@ static int mod_init( void ) memset(&_acc_diameter_engine, 0, sizeof(acc_engine_t)); if(diameter_flag != -1) - _acc_diameter_engine.acc_flag = 1<<diameter_flag; + _acc_diameter_engine.acc_flag = diameter_flag; if(diameter_missed_flag != -1) - _acc_diameter_engine.missed_flag = 1<<diameter_missed_flag; + _acc_diameter_engine.missed_flag = diameter_missed_flag; _acc_diameter_engine.acc_req = acc_diameter_send_request; _acc_diameter_engine.acc_init = acc_diameter_init; memcpy(_acc_diameter_engine.name, "diameter", 8);

6 years

git:master:a7525829: acc: fix generating duplicates for missed calls

by Henning Westerholt

Module: kamailio Branch: master Commit: a7525829309427fbb9357e0104b9dba1016f6777 URL: https://github.com/kamailio/kamailio/commit/a7525829309427fbb9357e0104b9dba… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/a7525829309427fbb9357e0104b9dba… Patch: https://github.com/kamailio/kamailio/commit/a7525829309427fbb9357e0104b9dba… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 24d26304e5..9879e697ff 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -526,7 +526,7 @@ int is_eng_acc_on(sip_msg_t *msg) } while(e) { if(e->flags & 1) { - if(msg->flags & e->acc_flag) { + if(isflagset(msg, e->acc_flag) == 1) { return 1; } } @@ -549,7 +549,7 @@ int is_eng_mc_on(sip_msg_t *msg) } while(e) { if(e->flags & 1) { - if(msg->flags & e->missed_flag) { + if(isflagset(msg, e->missed_flag) == 1) { return 1; } } @@ -579,15 +579,15 @@ int acc_run_engines(struct sip_msg *msg, int type, int *reset) inf.leg_info = leg_info; while(e) { if(e->flags & 1) { - if((type==0) && (msg->flags&(e->acc_flag))) { + if((type==0) && isflagset(msg, e->acc_flag) == 1) { LM_DBG("acc event for engine: %s\n", e->name); e->acc_req(msg, &inf); - if(reset) *reset |= e->acc_flag; + if(reset) *reset |= 1 << e->acc_flag; } - if((type==1) && (msg->flags&(e->missed_flag))) { + if((type==1) && isflagset(msg, e->missed_flag) == 1) { LM_DBG("missed event for engine: %s\n", e->name); e->acc_req(msg, &inf); - if(reset) *reset |= e->missed_flag; + if(reset) *reset |= 1 << e->missed_flag; } } e = e->next; diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index e0443ce906..cc66bc67df 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -55,7 +55,6 @@ struct acc_enviroment acc_env; #define is_acc_flag_set(_rq,_flag) (((_flag) != -1) && (isflagset((_rq), (_flag)) == 1)) -#define reset_acc_flag(_rq,_flag) (resetflag((_rq), (_flag))) #define is_failed_acc_on(_rq) is_acc_flag_set(_rq,failed_transaction_flag) @@ -465,7 +464,6 @@ static inline void acc_onreply_in(struct cell *t, struct sip_msg *req, } - /* initiate a report if we previously enabled MC accounting for this t */ static inline void on_missed(struct cell *t, struct sip_msg *req, struct sip_msg *reply, int code) @@ -501,11 +499,10 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, * forwarding attempt fails; we do not wish to * report on every attempt; so we clear the flags; */ - if (is_log_mc_on(req)) { env_set_text( ACC_MISSED, ACC_MISSED_LEN); acc_log_request( req ); - flags_to_reset |= log_missed_flag; + flags_to_reset |= 1 << log_missed_flag; } if (is_db_mc_on(req)) { if(acc_db_set_table_name(req, db_table_mc_data, &db_table_mc)<0) { @@ -513,7 +510,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, return; } acc_db_request( req ); - flags_to_reset |= db_missed_flag; + flags_to_reset |= 1 << db_missed_flag; } /* run extra acc engines */ @@ -523,7 +520,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, * These can't be reset in the blocks above, because * it would skip accounting if the flags are identical */ - reset_acc_flag( req, flags_to_reset ); + resetflags(req, flags_to_reset); if (new_uri_bk.len>=0) { req->new_uri = new_uri_bk;

6 years

git:master:253d35c8: core: add helper function for flag reset

by Henning Westerholt

Module: kamailio Branch: master Commit: 253d35c84bc1886c9eae774a731452f5d2f521cd URL: https://github.com/kamailio/kamailio/commit/253d35c84bc1886c9eae774a731452f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 core: add helper function for flag reset - add helper function for flag reset (needed for bugfix in #GH1674) - patch from: Julien Chavanton jchavanton at gmail dot com --- Modified: src/core/flags.c Modified: src/core/flags.h --- Diff: https://github.com/kamailio/kamailio/commit/253d35c84bc1886c9eae774a731452f… Patch: https://github.com/kamailio/kamailio/commit/253d35c84bc1886c9eae774a731452f… --- diff --git a/src/core/flags.c b/src/core/flags.c index 5b603706e3..c20f45f67f 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -52,6 +52,11 @@ int resetflag( struct sip_msg* msg, flag_t flag ) { return 1; } +int resetflags( struct sip_msg* msg, flag_t flags ) { + msg->flags &= ~ flags; + return 1; +} + int isflagset( struct sip_msg* msg, flag_t flag ) { return (msg->flags & (1<<flag)) ? 1 : -1; } diff --git a/src/core/flags.h b/src/core/flags.h index e1186dbf79..9f521c8e5f 100644 --- a/src/core/flags.h +++ b/src/core/flags.h @@ -44,6 +44,7 @@ struct sip_msg; int setflag( struct sip_msg* msg, flag_t flag ); int resetflag( struct sip_msg* msg, flag_t flag ); +int resetflags( struct sip_msg* msg, flag_t flags ); int isflagset( struct sip_msg* msg, flag_t flag );

6 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018