sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:4ca96224: modules: readme files regenerated - ims_charging ... [skip ci]
by Kamailio Dev 11 Jun '20

11 Jun '20

Module: kamailio Branch: master Commit: 4ca962240d90f751371475a02ff404c19c8027da URL: https://github.com/kamailio/kamailio/commit/4ca962240d90f751371475a02ff404c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-11T12:46:14+02:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/4ca962240d90f751371475a02ff404c… Patch: https://github.com/kamailio/kamailio/commit/4ca962240d90f751371475a02ff404c…

1 0

git:5.2:5a57dfd5: ims_charging: fix errors in docs, add missing parameters
by Henning Westerholt 11 Jun '20

11 Jun '20

Module: kamailio Branch: 5.2 Commit: 5a57dfd53cf1118609c947e1ef7a2bdd9a3597db URL: https://github.com/kamailio/kamailio/commit/5a57dfd53cf1118609c947e1ef7a2bd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-11T10:46:06Z ims_charging: fix errors in docs, add missing parameters (cherry picked from commit d4f3d0e705f38c61c842c5f6a367a9768e592965) --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a57dfd53cf1118609c947e1ef7a2bd… Patch: https://github.com/kamailio/kamailio/commit/5a57dfd53cf1118609c947e1ef7a2bd…

1 0

git:master:9de86263: ims_charging: add structured debug logging for key functions
by Henning Westerholt 11 Jun '20

11 Jun '20

Module: kamailio Branch: master Commit: 9de8626307076edf3a76ee2564c245d92c11a0ce URL: https://github.com/kamailio/kamailio/commit/9de8626307076edf3a76ee2564c245d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-11T10:45:33Z ims_charging: add structured debug logging for key functions --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/9de8626307076edf3a76ee2564c245d… Patch: https://github.com/kamailio/kamailio/commit/9de8626307076edf3a76ee2564c245d…

1 0

git:master:d4f3d0e7: ims_charging: fix errors in docs, add missing parameters
by Henning Westerholt 11 Jun '20

11 Jun '20

Module: kamailio Branch: master Commit: d4f3d0e705f38c61c842c5f6a367a9768e592965 URL: https://github.com/kamailio/kamailio/commit/d4f3d0e705f38c61c842c5f6a367a97… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-11T10:45:33Z ims_charging: fix errors in docs, add missing parameters --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4f3d0e705f38c61c842c5f6a367a97… Patch: https://github.com/kamailio/kamailio/commit/d4f3d0e705f38c61c842c5f6a367a97…

1 0

git:master:53f9992e: cdp: small (commented out) debugging helper
by Henning Westerholt 11 Jun '20

11 Jun '20

Module: kamailio Branch: master Commit: 53f9992e1a0b646744f9ddc626d002306ed4db60 URL: https://github.com/kamailio/kamailio/commit/53f9992e1a0b646744f9ddc626d0023… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-11T10:45:33Z cdp: small (commented out) debugging helper --- Modified: src/modules/cdp/diameter_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/53f9992e1a0b646744f9ddc626d0023… Patch: https://github.com/kamailio/kamailio/commit/53f9992e1a0b646744f9ddc626d0023… --- diff --git a/src/modules/cdp/diameter_msg.c b/src/modules/cdp/diameter_msg.c index 464a3504e1..605109ae41 100644 --- a/src/modules/cdp/diameter_msg.c +++ b/src/modules/cdp/diameter_msg.c @@ -76,6 +76,7 @@ AAAReturnCode AAABuildMsgBuffer( AAAMessage *msg ) /* count and add the avps */ for(avp=msg->avpList.head;avp;avp=avp->next) { msg->buf.len += AVP_HDR_SIZE(avp->flags)+ to_32x_len( avp->data.len ); + //LM_DBG("AVP code: %d, data %.*s\n", avp->code, avp->data.len, avp->data.s); } LM_DBG("AAABuildMsgBuffer(): len=%d\n",msg->buf.len);

1 0

git:master:289e3470: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 11 Jun '20

11 Jun '20

Module: kamailio Branch: master Commit: 289e347054c18da6548101703d971099094165d5 URL: https://github.com/kamailio/kamailio/commit/289e347054c18da6548101703d97109… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-11T10:46:32+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/289e347054c18da6548101703d97109… Patch: https://github.com/kamailio/kamailio/commit/289e347054c18da6548101703d97109…

1 0

[kamailio/kamailio] acc: new skip_cdr modparam to prevent cdr generation (#2351)
by Carlos Cruz Luengo 11 Jun '20

11 Jun '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally - [x] Related to issue #2348 #### Description This PR allows excluding certain calls from CDRs in Kamailio route logic: - adds a new modparam called _cdr_skip_ to **acc** module - dialogs ended with chosen dlg_var set (no matter the value) won't generate a CDR even though _cdr_enable_ modparam is set. - both database and log CDR will be prevented. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2351 -- Commit Summary -- * acc: new skip_cdr modparam to prevent cdr generation -- File Changes -- M src/modules/acc/acc_cdr.c (10) M src/modules/acc/acc_mod.c (2) M src/modules/acc/acc_mod.h (1) M src/modules/acc/doc/acc_admin.xml (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2351.patch https://github.com/kamailio/kamailio/pull/2351.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/2351

2 3

git:master:7bedc588: acc: new skip_cdr modparam to prevent cdr generation
by Henning Westerholt 11 Jun '20

11 Jun '20

Module: kamailio Branch: master Commit: 7bedc5885134bb340b75a263d822617831e4af99 URL: https://github.com/kamailio/kamailio/commit/7bedc5885134bb340b75a263d822617… Author: Carlos Cruz <carlos(a)cruzccl.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-11T10:42:12+02:00 acc: new skip_cdr modparam to prevent cdr generation This commit adds a new modparam called cdr_skip to acc module that allows excluding certain calls from CDRs in Kamailio route logic. Dialogs ended with chosen dlg_var set (no matter the value) won't generate a CDR (both database and log) even though cdr_enable modparam is set. --- Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/acc_mod.h Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7bedc5885134bb340b75a263d822617… Patch: https://github.com/kamailio/kamailio/commit/7bedc5885134bb340b75a263d822617… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index d59192156a..52c904a50f 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -392,6 +392,16 @@ static int write_cdr( struct dlg_cell* dialog, return -1; } + /* Skip cdr if cdr_skip dlg_var exists */ + if (cdr_skip.len > 0) { + str* nocdr_val = 0; + nocdr_val = dlgb.get_dlg_var( dialog, &cdr_skip); + if ( nocdr_val ){ + LM_DBG( "cdr_skip dlg_var set, skip cdr!"); + return 0; + } + } + ret = log_write_cdr(dialog, message); ret |= db_write_cdr(dialog, message); return ret; diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 0b04f3e82c..27feb847db 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -121,6 +121,7 @@ int cdr_start_on_confirmed = 0; int cdr_expired_dlg_enable = 0; static char* cdr_facility_str = 0; static char* cdr_log_extra_str = 0; +str cdr_skip = {NULL, 0}; str cdr_start_str = str_init("start_time"); str cdr_end_str = str_init("end_time"); @@ -206,6 +207,7 @@ static param_export_t params[] = { {"log_extra", PARAM_STRING, &log_extra_str }, /* cdr specific */ {"cdr_enable", INT_PARAM, &cdr_enable }, + {"cdr_skip", PARAM_STR, &cdr_skip }, {"cdr_log_enable", INT_PARAM, &cdr_log_enable }, {"cdr_start_on_confirmed", INT_PARAM, &cdr_start_on_confirmed }, {"cdr_facility", PARAM_STRING, &cdr_facility_str }, diff --git a/src/modules/acc/acc_mod.h b/src/modules/acc/acc_mod.h index a28721cdea..b25c9d4a17 100644 --- a/src/modules/acc/acc_mod.h +++ b/src/modules/acc/acc_mod.h @@ -53,6 +53,7 @@ extern int cdr_extra_nullable; extern int cdr_start_on_confirmed; extern int cdr_log_facility; extern int cdr_expired_dlg_enable; +extern str cdr_skip; extern int db_flag; extern int db_missed_flag; diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index f47a92a689..a990db04a4 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1034,6 +1034,23 @@ modparam("acc", "db_insert_mode", 1) ... modparam("acc", "cdr_enable", 1) ... +</programlisting> + </example> + </section> + <section id="acc.p.cdr_skip"> + <title><varname>cdr_skip</varname> (string)</title> + <para> + Skip cdr generation for dialogs with this dlg_var set. + </para> + <para> + Default value is NULL. + </para> + <example> + <title>cdr_skip example</title> + <programlisting format="linespecific"> +... +modparam("acc", "cdr_skip", "nocdr") +... </programlisting> </example> </section>

1 0

git:5.3:7453e919: cdp: better compatiblity with certain Diameter servers
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.3 Commit: 7453e9198ac3149e09cb04416f06e7303f32dd3c URL: https://github.com/kamailio/kamailio/commit/7453e9198ac3149e09cb04416f06e73… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:39:16Z cdp: better compatiblity with certain Diameter servers - better compatiblity with certain Diameter servers - some Diameter servers do not include Supported-Vendor-Id AVP in their reply - assume in this case that the server will support our proposed applications (cherry picked from commit 1a462ed4cffddd5f691b33adb859c286a0c074df) --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/7453e9198ac3149e09cb04416f06e73… Patch: https://github.com/kamailio/kamailio/commit/7453e9198ac3149e09cb04416f06e73… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index ed49a3ad30..b83654bf1d 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -678,7 +678,8 @@ void add_peer_application(peer *p, int id, int vendor, app_type type) p->applications[p->applications_cnt].id = id; p->applications[p->applications_cnt].vendor = vendor; p->applications[p->applications_cnt].type = type; - LM_DBG("Application %i of maximum %i\n", p->applications_cnt, p->applications_max); + LM_DBG("Application number %i with id %d and vendor %d added, maximum %i\n", + p->applications_cnt, id, vendor, p->applications_max); p->applications_cnt++; } @@ -715,6 +716,12 @@ void save_peer_applications(peer *p,AAAMessage *msg) supported_vendor_id_avp_cnt = count_Supported_Vendor_Id_AVPS(msg); + if (supported_vendor_id_avp_cnt == 0) { + LM_INFO("No Supported-Vendor-Id AVP found, assuming compability with %d vendor(s) from our CER msg\n", + config->supported_vendors_cnt); + supported_vendor_id_avp_cnt = 1; + } + for(avp=msg->avpList.head;avp;avp = avp->next) switch (avp->code){ @@ -728,6 +735,8 @@ void save_peer_applications(peer *p,AAAMessage *msg) total_cnt+=2;/* wasteful, but let's skip decoding */ break; } + LM_DBG("Total count of applications is %d\n", total_cnt); + p->applications_cnt = 0; p->applications = shm_malloc(sizeof(app_config)*total_cnt); p->applications_max = total_cnt; @@ -745,7 +754,6 @@ void save_peer_applications(peer *p,AAAMessage *msg) add_peer_application(p,id,0,DP_AUTHORIZATION); avp_vendor = AAAFindMatchingAVP(msg,0,AVP_Supported_Vendor_Id,0,0); while (avp_vendor) { - vendor = get_4bytes(avp_vendor->data.s); LM_DBG("Found Supported Vendor for Application %i: %i\n", DP_AUTHORIZATION, vendor); add_peer_application(p,id,vendor,DP_AUTHORIZATION);

1 0

git:5.3:38666940: ims_charging: initialize ro_forced_peer variable
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.3 Commit: 386669407ec3a04c00ca43ddcce256c61b86a867 URL: https://github.com/kamailio/kamailio/commit/386669407ec3a04c00ca43ddcce256c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:39:16Z ims_charging: initialize ro_forced_peer variable (cherry picked from commit 7cae3e5e0df27bf3481cbf0680bf86902359a97c) --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/386669407ec3a04c00ca43ddcce256c… Patch: https://github.com/kamailio/kamailio/commit/386669407ec3a04c00ca43ddcce256c… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index fd65f98683..150a525884 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -76,7 +76,7 @@ struct tm_binds tmb; /* Only used if we want to force the Ro peer usually this is configured at a stack level and the first request uses realm routing */ //char* rx_forced_peer_s = ""; -str ro_forced_peer; +str ro_forced_peer = str_init(""); int ro_auth_expiry = 7200; int cdp_event_latency = 1; /*flag: report slow processing of CDP callback events or not - default enabled */ int cdp_event_threshold = 500; /*time in ms above which we should report slow processing of CDP callback event - default 500ms*/

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