sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

git:master:2370c6dc: ims_charging: Added missing field in Ro-Session (introduced in previous commit)

by Carsten Bock

Module: kamailio Branch: master Commit: 2370c6dccec38be8576bd4234ecbbc5883972058 URL: https://github.com/kamailio/kamailio/commit/2370c6dccec38be8576bd4234ecbbc5… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2016-01-15T11:04:15+01:00 ims_charging: Added missing field in Ro-Session (introduced in previous commit) --- Modified: modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/2370c6dccec38be8576bd4234ecbbc5… Patch: https://github.com/kamailio/kamailio/commit/2370c6dccec38be8576bd4234ecbbc5… --- diff --git a/modules/ims_charging/ro_session_hash.h b/modules/ims_charging/ro_session_hash.h index fa92ed9..8fa622f 100644 --- a/modules/ims_charging/ro_session_hash.h +++ b/modules/ims_charging/ro_session_hash.h @@ -72,6 +72,7 @@ struct ro_session { int rating_group; int service_identifier; unsigned int is_final_allocation; + unsigned int billed; }; /*! entries in the main ro_session table */

8 years, 10 months

Presence notify - duplicate aux body processing?

by Charles Chance

Hi All, Whilst attempting to track down the source of an issue introduced at some point since 4.2.1, I came across the following and would appreciate a second opinion. In send_notify_request() function (/modules/presence/notify.c), the aux body processing function attached to the event is called: > /* call aux_body_processing if exists */ > if(subs->event->aux_body_processing) > { > aux_body = subs->event->aux_body_processing(subs, notify_body); > if(aux_body) { > free_notify_body(notify_body, subs->event); > notify_body = aux_body; > } > } However, by the time we reach this function, aux body processing will already have been completed (specifically in the publ_notify() or query_db_notify() functions of the same file). If I remove the duplicate function call, the issue goes away - but I'm reluctant to submit a pull request which reverts an earlier commit, unless I can understand the reason for the change in the first place. Especially since it was made a year ago. Is anyone able to explain what I'm missing? Cheers, Charles -- *** We're rebranding! Learn more here <http://www.sipcentric.com/2015/07/were-rebranding/> *** www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB.

8 years, 10 months

debugger moduel - get config line number

by smititelu

Hi, I'm trying to get the line number when a config function is called. Looking at the *fixup_dbg_pv_dump*(): " dbg_sip_msg_action = dbg_fixup_get_action(param, param_no); _dbg_sip_msg_cline = dbg_sip_msg_action->cline; " The above works as long as the config function is called with at least 1 parameter. When the config function is called with no parameters (param == NULL), this will segfault at the moment, due to invalid access at the second line. The question is, is there a straightforward way to get the config number of a config function with no parametersx? Else, I could just return a negative value meaning that the config line is unknown. Regards, Stefan

8 years, 10 months

git:master:6f46f87a: modules/ims_charging: add adjustments for rounding errors that creep in during interim charges

by jaybeepee

Module: kamailio Branch: master Commit: 6f46f87acf7b3772a2bc8902e6e73e0bdc293851 URL: https://github.com/kamailio/kamailio/commit/6f46f87acf7b3772a2bc8902e6e73e0… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-01-14T11:22:07+02:00 modules/ims_charging: add adjustments for rounding errors that creep in during interim charges - this is a result of Ro interface only supporting second-based resolution in diam. msgs. to OCS --- Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/6f46f87acf7b3772a2bc8902e6e73e0… Patch: https://github.com/kamailio/kamailio/commit/6f46f87acf7b3772a2bc8902e6e73e0… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 8864788..3dafc2b 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -755,9 +755,29 @@ void send_ccr_stop(struct ro_session *ro_session) { long used = 0; str user_name = {0, 0}; int ret = 0; + time_t stop_time; + time_t actual_time_micros; + int actual_time_seconds; + + stop_time = get_current_time_micro(); + + if (ro_session->start_time == 0) + actual_time_micros = 0; + else + actual_time_micros = stop_time - ro_session->start_time; + + actual_time_seconds = (actual_time_micros + (1000000 - 1)) / (float) 1000000; if (ro_session->event_type != pending) { - used = rint((get_current_time_micro() - ro_session->last_event_timestamp)/(float)1000000); + used = rint((stop_time - ro_session->last_event_timestamp) / (float) 1000000); + LM_DBG("Final used number of seconds for session is %ld\n", used); + } + + LM_DBG("Call started at %ld and ended at %ld and lasted %d seconds and so far we have billed for %ld seconds\n", ro_session->start_time, stop_time, + actual_time_seconds, ro_session->billed + used); + if (ro_session->billed + used < actual_time_seconds) { + LM_DBG("Making adjustment by adding %ld seconds\n", actual_time_seconds - (ro_session->billed + used)); + used += actual_time_seconds - (ro_session->billed + used); } counter_add(ims_charging_cnts_h.billed_secs, (int)used); diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index 40f3c42..efcc5cc 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -380,6 +380,7 @@ void resume_ro_session_ontimeout(struct interim_ccr *i_req) { void ro_session_ontimeout(struct ro_tl *tl) { time_t now, call_time; long used_secs; + int adjustment; LM_DBG("We have a fired timer [p=%p] and tl=[%i].\n", tl, tl->timeout); @@ -419,6 +420,12 @@ void ro_session_ontimeout(struct ro_tl *tl) { used_secs = rint((now - ro_session->last_event_timestamp) / (float) 1000000); call_time = rint((now - ro_session->start_time) / (float) 1000000); + if ((used_secs + ro_session->billed) < (call_time)) { + adjustment = call_time - (used_secs + ro_session->billed); + LM_DBG("Making adjustment for Ro interim timer by adding %d seconds\n", adjustment); + used_secs += adjustment; + } + counter_add(ims_charging_cnts_h.billed_secs, used_secs); if (ro_session->callid.s != NULL @@ -444,6 +451,7 @@ void ro_session_ontimeout(struct ro_tl *tl) { // Apply for more credit. // // The function call will return immediately and we will receive the reply asynchronously via a callback + ro_session->billed += used_secs; send_ccr_interim(ro_session, (unsigned int) used_secs, interim_request_credits); return; } else {

8 years, 10 months

git:master:caeda232: registrar: reg_xavp_cfg should not be reset when sock_flag is not set

by Ian Yu-Hsun Lin

Module: kamailio Branch: master Commit: caeda232d6e2d29a5da202c9db244b407c94ede2 URL: https://github.com/kamailio/kamailio/commit/caeda232d6e2d29a5da202c9db244b4… Author: Ian Yu-Hsun Lin <ianyuhsunlin(a)gmail.com> Committer: Ian Yu-Hsun Lin <ianyuhsunlin(a)gmail.com> Date: 2016-01-14T16:02:25+08:00 registrar: reg_xavp_cfg should not be reset when sock_flag is not set - since there are functions like `registered()` would use it - reported by Jayesh Nambiar (@jayesh1017) in the comment of GH#470 --- Modified: modules/registrar/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/caeda232d6e2d29a5da202c9db244b4… Patch: https://github.com/kamailio/kamailio/commit/caeda232d6e2d29a5da202c9db244b4… --- diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 0d7c5ac..f859db4 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -365,7 +365,6 @@ static int mod_init(void) } else if (reg_xavp_cfg.s) { if (reg_xavp_cfg.len == 0 || sock_flag == -1) { LM_WARN("empty reg_xavp_cfg or sock_flag no set -> resetting\n"); - reg_xavp_cfg.len = 0; sock_flag = -1; } } else if (sock_flag!=-1) {

8 years, 10 months

git:master:256d5f75: Merge pull request #475 from ianlin/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 256d5f754ddfa7c47086f18a6d15fb08ae6bff87 URL: https://github.com/kamailio/kamailio/commit/256d5f754ddfa7c47086f18a6d15fb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-14T09:29:06+01:00 Merge pull request #475 from ianlin/master registrar: reg_xavp_cfg should not be reset when sock_flag is not set --- Modified: modules/registrar/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/256d5f754ddfa7c47086f18a6d15fb0… Patch: https://github.com/kamailio/kamailio/commit/256d5f754ddfa7c47086f18a6d15fb0… --- diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 0d7c5ac..f859db4 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -365,7 +365,6 @@ static int mod_init(void) } else if (reg_xavp_cfg.s) { if (reg_xavp_cfg.len == 0 || sock_flag == -1) { LM_WARN("empty reg_xavp_cfg or sock_flag no set -> resetting\n"); - reg_xavp_cfg.len = 0; sock_flag = -1; } } else if (sock_flag!=-1) {

8 years, 10 months

[kamailio] registrar: reg_xavp_cfg should not be reset when sock_flag is not set (#475)

by Ian Yu-Hsun Lin

- since there are functions like `registered()` would use it - reported by Jayesh Nambiar (@jayesh1017) in the comment of GH#470 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/475 -- Commit Summary -- * registrar: reg_xavp_cfg should not be reset when sock_flag is not set -- File Changes -- M modules/registrar/reg_mod.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/475.patch https://github.com/kamailio/kamailio/pull/475.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/475

8 years, 10 months

[kamailio] registrar: do make use of reg_xavp_cfg (#470)

by Ian Yu-Hsun Lin

- prevent from resetting sock_flag to -1 when reg_xavp_cfg is set You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/470 -- Commit Summary -- * registrar: do make use of reg_xavp_cfg -- File Changes -- M modules/registrar/reg_mod.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/470.patch https://github.com/kamailio/kamailio/pull/470.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/470

8 years, 10 months

Re: [sr-dev] [kamailio] registrar: do make use of reg_xavp_cfg (c46a5f2)

by Jayesh Nambiar

after this commit one of my function to match the registered contact stopped working as expected. Here's the code snippet: ``` $xavp(reg=>match_callid) = $avp(callid); #---match existing record based on callid--- if(registered("location", "$tu", 1)) { xlog("L_INFO", "It is a Re-Register"); } ``` The above registered function returned true even when the callid of the new REGISTER request was different from the existing one. It seems like some side effect of the commit. When i went back to the commit earlier than this, it worked as before. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/c46a5f2792b8553ade871d98cfe892c…

8 years, 10 months

git:master:dce9cea1: modules/ims_registrar_scscf: prevent possible deadlock when generating reginfo NOTIFY requests

by jaybeepee

Module: kamailio Branch: master Commit: dce9cea1744c458afae1088935f4c2549689c454 URL: https://github.com/kamailio/kamailio/commit/dce9cea1744c458afae1088935f4c25… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-01-13T11:12:37+02:00 modules/ims_registrar_scscf: prevent possible deadlock when generating reginfo NOTIFY requests - moved the actual processing of the implicit impu set to create the XML to a separate processing - seperate process will therefore pick up events, build the XML and send the NOTIFY/s - TODO: make framework capable of multiple workers to process events --- Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/dce9cea1744c458afae1088935f4c25… Patch: https://github.com/kamailio/kamailio/commit/dce9cea1744c458afae1088935f4c25…

8 years, 10 months

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016