sr-dev

sr-dev@lists.kamailio.org

20 participants
45161 discussions

Start a nNew thread

[kamailio/kamailio] [WIP] mqueue: add db (#2359)
by Julien Chavanton 02 Jul '20

02 Jul '20

4 18

git:master:dd52d1ce: Merge pull request #2359 from kamailio/jchavanton/mqueue_db_persistent
by GitHub 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: dd52d1ce91a1e6a4907161cc7d8294b4ba5d13aa URL: https://github.com/kamailio/kamailio/commit/dd52d1ce91a1e6a4907161cc7d8294b… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-02T10:03:56-07:00 Merge pull request #2359 from kamailio/jchavanton/mqueue_db_persistent mqueue: add support for db persistency --- Added: src/modules/mqueue/mqueue_db.c Added: src/modules/mqueue/mqueue_db.h Modified: src/modules/mqueue/Makefile Modified: src/modules/mqueue/doc/mqueue.xml Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dd52d1ce91a1e6a4907161cc7d8294b… Patch: https://github.com/kamailio/kamailio/commit/dd52d1ce91a1e6a4907161cc7d8294b…

1 0

git:master:c85da323: mqueue: add support for db persistency
by Julien Chavanton 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: c85da32333237359f9e8b9cfe6715437458c04a8 URL: https://github.com/kamailio/kamailio/commit/c85da32333237359f9e8b9cfe671543… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-06-30T09:01:54-07:00 mqueue: add support for db persistency --- Added: src/modules/mqueue/mqueue_db.c Added: src/modules/mqueue/mqueue_db.h Modified: src/modules/mqueue/Makefile Modified: src/modules/mqueue/doc/mqueue.xml Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c85da32333237359f9e8b9cfe671543… Patch: https://github.com/kamailio/kamailio/commit/c85da32333237359f9e8b9cfe671543…

1 0

git:5.3:0292a6ae: ims_charging: bugfix for tel URIs, need the same logic in stop as in start requests
by Henning Westerholt 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 0292a6ae61db930dfeab532a53bf964b16db0209 URL: https://github.com/kamailio/kamailio/commit/0292a6ae61db930dfeab532a53bf964… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-07-02T16:06:59Z ims_charging: bugfix for tel URIs, need the same logic in stop as in start requests (cherry picked from commit c3efb3b3331936a30f387e9f3c8c435d4d64f0bb) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/0292a6ae61db930dfeab532a53bf964… Patch: https://github.com/kamailio/kamailio/commit/0292a6ae61db930dfeab532a53bf964… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 700178a0ad..8f572010e6 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -865,6 +865,8 @@ void send_ccr_stop_with_param(struct ro_session *ro_session, unsigned int code, //getting subscription id type if (strncasecmp(subscr.id.s, "tel:", 4) == 0) { subscr.type = Subscription_Type_MSISDN; + subscr.id.s += 4; + subscr.id.len -= 4; } else { subscr.type = Subscription_Type_IMPU; //default is END_USER_SIP_URI }

1 0

git:master:c3efb3b3: ims_charging: bugfix for tel URIs, need the same logic in stop as in start requests
by Henning Westerholt 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: c3efb3b3331936a30f387e9f3c8c435d4d64f0bb URL: https://github.com/kamailio/kamailio/commit/c3efb3b3331936a30f387e9f3c8c435… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-07-02T16:05:51Z ims_charging: bugfix for tel URIs, need the same logic in stop as in start requests --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/c3efb3b3331936a30f387e9f3c8c435… Patch: https://github.com/kamailio/kamailio/commit/c3efb3b3331936a30f387e9f3c8c435… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 9cad62c302..960a8252ec 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -914,6 +914,8 @@ void send_ccr_stop_with_param(struct ro_session *ro_session, unsigned int code, //getting subscription id type if (strncasecmp(subscr.id.s, "tel:", 4) == 0) { subscr.type = Subscription_Type_MSISDN; + subscr.id.s += 4; + subscr.id.len -= 4; } else { subscr.type = Subscription_Type_IMPU; //default is END_USER_SIP_URI }

1 0

git:master:798c1c66: modules: readme files regenerated - cnxcc ... [skip ci]
by Kamailio Dev 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: 798c1c66a7ef34abaf79d49d184853a313aa3f02 URL: https://github.com/kamailio/kamailio/commit/798c1c66a7ef34abaf79d49d184853a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-02T16:46:17+02:00 modules: readme files regenerated - cnxcc ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/798c1c66a7ef34abaf79d49d184853a… Patch: https://github.com/kamailio/kamailio/commit/798c1c66a7ef34abaf79d49d184853a… --- diff --git a/src/modules/cnxcc/README b/src/modules/cnxcc/README index 425a473f16..f739b85fba 100644 --- a/src/modules/cnxcc/README +++ b/src/modules/cnxcc/README @@ -4,18 +4,9 @@ Carlos Ruiz Díaz ConexionGroup S.A. -Edited by - -Jose Luis Verdeguer - - Zoon Suite - <verdeguer(a)zoonsuite.com> - Copyright © 2013 Carlos Ruiz Díaz, carlos.ruizdiaz(a)gmail.com Copyright © 2014 Carlos Ruiz Díaz, carlos(a)latamvoices.com - - Copyright © 2018 Jose Luis Verdeguer __________________________________________________________________ Table of Contents @@ -218,7 +209,7 @@ modparam("cnxcc", "credit_check_period", 1) Return code: * 1 - successful * -1 - failed, error logged - * -2 - failed, credit value is less than initial pulse value + * -4 - call-id already present for this client Example 1.3. cnxcc_set_max_credit() ... @@ -250,6 +241,7 @@ cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", Return code: * 1 - successful * -1 - failed, error logged + * -4 - call-id already present for this client Example 1.4. cnxcc_set_max_time() ... @@ -303,6 +295,7 @@ if (!cnxcc_update_max_time("$var(client)", "$var(update_time)")) { in more than the limit you specified * -3 - failed, number of calls established is more than the limit you specified + * -4 - call-id already present for this client Example 1.6. cnxcc_set_max_channels() ... @@ -437,14 +430,21 @@ route[CNXCC] $var(i_pulse) = 30; $var(f_pulse) = 6; - if (!cnxcc_set_max_credit("$var(client)", + + cnxcc_set_max_credit("$var(client)", "$var(credit)", "$var(connect_cost)", "$var(cost_per_sec)", "$var(i_pulse)", - "$var(f_pulse)")) { - xlog("Error setting up credit control"); - } + "$var(f_pulse)"); + + switch ($?) { + case -1: + xerr("Error setting up credit control"); + sl_send_reply("503", "Internal Server Error"); + case -4: + xwarn("$ci already present for client $var(client)"); + }; } event_route[cnxcc:call-shutdown]

1 0

git:master:53a7eb76: pkg/kamailio/deb: version set 5.4.0~pre1 [skip ci]
by Victor Seva 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: 53a7eb76d215347e8e6515b93a3a041e68dfc984 URL: https://github.com/kamailio/kamailio/commit/53a7eb76d215347e8e6515b93a3a041… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-07-02T16:34:40+02:00 pkg/kamailio/deb: version set 5.4.0~pre1 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/53a7eb76d215347e8e6515b93a3a041… Patch: https://github.com/kamailio/kamailio/commit/53a7eb76d215347e8e6515b93a3a041…

1 0

[kamailio/kamailio] cnxcc: remove duplicated entries with a same CID value (#2383)
by Jose Luis Verdeguer 02 Jul '20

02 Jul '20

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When cnxcc receives a message wih a registered CID (for example in a re-INVITE) it saves as a new call and this is a problem: - cnxcc store 2 times the same call and it discounts credit for both - when the call is finished, cnxcc only remove one record and the other continues discounting credit. - when credit is finished (of an non active call), all active calls are killed An example: kamcmd> cnxcc.check_client test id:0,confirmed:no,local_consumed_amount:0.004800,global_consumed_amount:3.126200,local_max_amount:30.000000,global_max_amount:30.000000,call_id:41211f7e0a65b41c4ca7181b18db0f1e@185.47.15.56:5080,start_timestamp:0,inip:1,finp:1,connect:0.000000,cps:0.004800; id:1,confirmed:no,local_consumed_amount:0.004800,global_consumed_amount:3.126200,local_max_amount:30.000000,global_max_amount:30.000000,call_id:41211f7e0a65b41c4ca7181b18db0f1e@185.47.15.56:5080,start_timestamp:0,inip:1,finp:1,connect:0.000000,cps:0.004800; id:2,confirmed:no,local_consumed_amount:0.000200,global_consumed_amount:3.126200,local_max_amount:30.000000,global_max_amount:30.000000,call_id:5e911ab1452cf1a3165af5262b519977@185.47.15.56:5080,start_timestamp:0,inip:1,finp:1,connect:0.000000,cps:0.000200; id:3,confirmed:no,local_consumed_amount:0.000200,global_consumed_amount:3.126200,local_max_amount:30.000000,global_max_amount:30.000000,call_id:5e911ab1452cf1a3165af5262b519977@185.47.15.56:5080,start_timestamp:0,inip:1,finp:1,connect:0.000000,cps:0.000200; id:4,confirmed:no,local_consumed_amount:0.000800,global_consumed_amount:3.126200,local_max_amount:30.000000,global_max_amount:30.000000,call_id:0f44fbc63883e52d72c9f52f49253476@185.47.15.56:5080,start_timestamp:0,inip:1,finp:1,connect:0.000000,cps:0.000800; - id 0 and id 1 are the same call that has been inserted twice. - id 2 and id 3 are the same call that has been inserted twice. - id 4 is a finished call that has not been removed from the stack and continues discounting credit. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2383 -- Commit Summary -- * cnxcc: remove duplicated entries with a same CID value -- File Changes -- M src/modules/cnxcc/cnxcc_mod.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2383.patch https://github.com/kamailio/kamailio/pull/2383.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/2383

3 12

git:master:bc0264f4: cnxcc: update docs [skip ci]
by Victor Seva 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: bc0264f4802c266901a1eb7a296f80f1dbfcc828 URL: https://github.com/kamailio/kamailio/commit/bc0264f4802c266901a1eb7a296f80f… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-07-02T16:30:23+02:00 cnxcc: update docs [skip ci] * new error return values * delete return value from set_max_credit not in code --- Modified: src/modules/cnxcc/doc/cnxcc.xml Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bc0264f4802c266901a1eb7a296f80f… Patch: https://github.com/kamailio/kamailio/commit/bc0264f4802c266901a1eb7a296f80f… --- diff --git a/src/modules/cnxcc/doc/cnxcc.xml b/src/modules/cnxcc/doc/cnxcc.xml index 686583f471..3fc10feb8d 100644 --- a/src/modules/cnxcc/doc/cnxcc.xml +++ b/src/modules/cnxcc/doc/cnxcc.xml @@ -23,15 +23,6 @@ <email>carlos.ruizdiaz(a)gmail.com</email> </address> </author> - <editor> - <firstname>Jose Luis</firstname> - <surname>Verdeguer</surname> - <email>verdeguer(a)zoonsuite.com</email> - <affiliation><orgname>Zoon Suite</orgname></affiliation> - <address> - <email>verdeguer(a)zoonsuite.com</email> - </address> - </editor> </authorgroup> <copyright> <year>2013</year> @@ -41,10 +32,6 @@ <year>2014</year> <holder>Carlos Ruiz Díaz, carlos(a)latamvoices.com</holder> </copyright> - <copyright> - <year>2018</year> - <holder>Jose Luis Verdeguer</holder> - </copyright> </bookinfo> diff --git a/src/modules/cnxcc/doc/cnxcc_admin.xml b/src/modules/cnxcc/doc/cnxcc_admin.xml index 0c26cb0a58..322a227bfb 100644 --- a/src/modules/cnxcc/doc/cnxcc_admin.xml +++ b/src/modules/cnxcc/doc/cnxcc_admin.xml @@ -177,10 +177,9 @@ modparam("cnxcc", "credit_check_period", 1) <listitem> <para> - <emphasis>-2 - failed, credit value is less than initial pulse value</emphasis> + <emphasis>-4 - call-id already present for this client</emphasis> </para> </listitem> - </itemizedlist> </para> <example> @@ -234,6 +233,11 @@ cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", <emphasis>-1 - failed, error logged</emphasis> </para> </listitem> + <listitem> + <para> + <emphasis>-4 - call-id already present for this client</emphasis> + </para> + </listitem> </itemizedlist> </para> <example> @@ -345,6 +349,11 @@ if (!cnxcc_update_max_time("$var(client)", "$var(update_time)")) { </para> </listitem> + <listitem> + <para> + <emphasis>-4 - call-id already present for this client</emphasis> + </para> + </listitem> </itemizedlist> </para> <example> @@ -543,14 +552,21 @@ route[CNXCC] $var(i_pulse) = 30; $var(f_pulse) = 6; - if (!cnxcc_set_max_credit("$var(client)", + + cnxcc_set_max_credit("$var(client)", "$var(credit)", "$var(connect_cost)", "$var(cost_per_sec)", "$var(i_pulse)", - "$var(f_pulse)")) { - xlog("Error setting up credit control"); - } + "$var(f_pulse)"); + + switch ($?) { + case -1: + xerr("Error setting up credit control"); + sl_send_reply("503", "Internal Server Error"); + case -4: + xwarn("$ci already present for client $var(client)"); + }; } event_route[cnxcc:call-shutdown]

1 0

git:master:fb8cc72f: cnxcc: avoid duplicated call info
by Victor Seva 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: fb8cc72f1bd76bb2fd4d4e2e5fa2afc50eef59ad URL: https://github.com/kamailio/kamailio/commit/fb8cc72f1bd76bb2fd4d4e2e5fa2afc… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-07-02T16:30:22+02:00 cnxcc: avoid duplicated call info Don't store call if call-id is already registered for that client --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fb8cc72f1bd76bb2fd4d4e2e5fa2afc… Patch: https://github.com/kamailio/kamailio/commit/fb8cc72f1bd76bb2fd4d4e2e5fa2afc… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index c2b6c1f567..e84d63acff 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -1488,6 +1488,7 @@ static int ki_set_max_credit(sip_msg_t *msg, str *sclient, str *scredit, { credit_data_t *credit_data = NULL; call_t *call = NULL; + hash_tables_t *hts = NULL; double credit = 0, connect_cost = 0, cost_per_second = 0; @@ -1529,6 +1530,12 @@ static int ki_set_max_credit(sip_msg_t *msg, str *sclient, str *scredit, return -1; } + if(try_get_call_entry(&msg->callid->body, &call, &hts) == 0) { + LM_ERR("call-id[%.*s] already present\n", + msg->callid->body.len, msg->callid->body.s); + return -4; + } + LM_DBG("Setting up new call for client [%.*s], max-credit[%f], " "connect-cost[%f], cost-per-sec[%f], initial-pulse [%d], " "final-pulse [%d], call-id[%.*s]\n", @@ -1706,6 +1713,7 @@ static int ki_set_max_channels(sip_msg_t *msg, str *sclient, int max_chan) { credit_data_t *credit_data = NULL; call_t *call = NULL; + hash_tables_t *hts = NULL; if(parse_headers(msg, HDR_CALLID_F, 0) != 0) { LM_ERR("Error parsing Call-ID"); @@ -1736,6 +1744,12 @@ static int ki_set_max_channels(sip_msg_t *msg, str *sclient, int max_chan) return -1; } + if(try_get_call_entry(&msg->callid->body, &call, &hts) == 0) { + LM_ERR("call-id[%.*s] already present\n", + msg->callid->body.len, msg->callid->body.s); + return -4; + } + LM_DBG("Setting up new call for client [%.*s], max-chan[%d], " "call-id[%.*s]\n", sclient->len, sclient->s, max_chan, msg->callid->body.len, @@ -1792,6 +1806,7 @@ static int ki_set_max_time(sip_msg_t *msg, str *sclient, int max_secs) { credit_data_t *credit_data = NULL; call_t *call = NULL; + hash_tables_t *hts = NULL; if(parse_headers(msg, HDR_CALLID_F, 0) != 0) { LM_ERR("Error parsing Call-ID"); @@ -1823,6 +1838,12 @@ static int ki_set_max_time(sip_msg_t *msg, str *sclient, int max_secs) return -1; } + if(try_get_call_entry(&msg->callid->body, &call, &hts) == 0) { + LM_ERR("call-id[%.*s] already present\n", + msg->callid->body.len, msg->callid->body.s); + return -4; + } + LM_DBG("Setting up new call for client [%.*s], max-secs[%d], " "call-id[%.*s]\n", sclient->len, sclient->s, max_secs, msg->callid->body.len,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev