sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

[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 … [View More]

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 … [View More]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> [View Less]

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 … [View More]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); [View Less]

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://… [View More]

1 0

git:5.2:32c110ce: cdp: better compatiblity with certain Diameter servers
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: 32c110cea12f3653b4d110d307e17df42bd79b6a URL: https://github.com/kamailio/kamailio/commit/32c110cea12f3653b4d110d307e17df… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:38:56Z 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 … [View More]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/32c110cea12f3653b4d110d307e17df… Patch: https://github.com/kamailio/kamailio/commit/32c110cea12f3653b4d110d307e17df… --- 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); [View Less]

1 0

git:5.2:696e5981: ims_charging: initialize ro_forced_peer variable
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: 696e5981bdb791f4662076a42687a2087d33b605 URL: https://github.com/kamailio/kamailio/commit/696e5981bdb791f4662076a42687a20… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:38:56Z ims_charging: initialize ro_forced_peer variable (cherry picked from commit 7cae3e5e0df27bf3481cbf0680bf86902359a97c) --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://… [View More]

1 0

git:master:1a462ed4: cdp: better compatiblity with certain Diameter servers
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 1a462ed4cffddd5f691b33adb859c286a0c074df URL: https://github.com/kamailio/kamailio/commit/1a462ed4cffddd5f691b33adb859c28… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:36:48Z 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 … [View More]this case that the server will support our proposed applications --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/1a462ed4cffddd5f691b33adb859c28… Patch: https://github.com/kamailio/kamailio/commit/1a462ed4cffddd5f691b33adb859c28… --- 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); [View Less]

1 0

git:master:7cae3e5e: ims_charging: initialize ro_forced_peer variable
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 7cae3e5e0df27bf3481cbf0680bf86902359a97c URL: https://github.com/kamailio/kamailio/commit/7cae3e5e0df27bf3481cbf0680bf869… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:31:13Z ims_charging: initialize ro_forced_peer variable --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7cae3e5e0df27bf3481cbf0680bf869… … [View More]

1 0

git:5.2:ade49058: ims_charging: fix missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: ade490584600be4715ea7a6fd93ba9fbcdce5be8 URL: https://github.com/kamailio/kamailio/commit/ade490584600be4715ea7a6fd93ba9f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:23Z ims_charging: fix missing line-breaks for log messages (cherry picked from commit 508786fcdbbc120215b3e7dd90d92ab40c3b1e4e) --- Modified: src/modules/ims_charging/ccr.c Modified: src/modules/… [View More]

1 0

git:5.2:25940655: cdp: add missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: 25940655eebdb3a3b50aee01f29b23701d71d538 URL: https://github.com/kamailio/kamailio/commit/25940655eebdb3a3b50aee01f29b237… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:23Z cdp: add missing line-breaks for log messages (cherry picked from commit 32a0d8073eb1b7f01190d305d318b43268811be8) --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/… [View More]peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/25940655eebdb3a3b50aee01f29b237… Patch: https://github.com/kamailio/kamailio/commit/25940655eebdb3a3b50aee01f29b237… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 4e9272980f..a0c5f26ad8 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -40,7 +40,7 @@ void update_gsu_response_timers(cdp_cc_acc_session_t* session, AAAMessage* msg) AAA_AVP *mscc_avp = mscc_avp_list.head; while (mscc_avp != NULL ) { - LM_DBG("MSCC AVP code is [%i] and data length is [%i]", mscc_avp->code, mscc_avp->data.len); + LM_DBG("MSCC AVP code is [%i] and data length is [%i]\n", mscc_avp->code, mscc_avp->data.len); switch (mscc_avp->code) { case AVP_Granted_Service_Unit: y = AAAUngroupAVPS(mscc_avp->data); diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 5d26605c70..ed49a3ad30 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -695,7 +695,7 @@ int count_Supported_Vendor_Id_AVPS(AAAMessage *msg) break; avp_vendor = AAAFindMatchingAVP(msg,avp_vendor->next,AVP_Supported_Vendor_Id,0,0); } - LM_DBG("Found %i Supported_Vendor AVPS", avp_vendor_cnt); + LM_DBG("Found %i Supported_Vendor AVPS\n", avp_vendor_cnt); return avp_vendor_cnt; } diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index c33554457a..5aed0a36f4 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -396,7 +396,7 @@ static int receive_fd(int pipe_fd, int* fd,peer **p) *fd = *tmp; }else{ if(!cmsg) - LM_ERR("receive_fd: no descriptor passed, empty control message"); + LM_ERR("receive_fd: no descriptor passed, empty control message\n"); else LM_ERR("receive_fd: no descriptor passed, cmsg=%p," "len=%d\n", cmsg, (unsigned)cmsg->cmsg_len); @@ -768,7 +768,7 @@ int receive_loop(peer *original_peer) } LM_DBG("select_recv(): Send pipe says [%p] %d\n",msg,cnt); if (sp->tcp_socket<0){ - LM_ERR("select_recv(): got a signal to send something, but the connection was not opened"); + LM_ERR("select_recv(): got a signal to send something, but the connection was not opened\n"); } else { while( (cnt=write(sp->tcp_socket,msg->buf.s,msg->buf.len))==-1 ) { if (errno==EINTR) @@ -883,7 +883,7 @@ int peer_connect(peer *p) /* try to set the local socket used to connect to the peer */ if (p->src_addr.s && p->src_addr.len > 0) { - LM_DBG("peer_connect(): connetting to peer via src addr=%.*s",p->src_addr.len, p->src_addr.s); + LM_DBG("peer_connect(): connecting to peer via src addr=%.*s\n",p->src_addr.len, p->src_addr.s); memset (&hints, 0, sizeof(hints)); hints.ai_flags = AI_NUMERICHOST; hints.ai_socktype = SOCK_STREAM; diff --git a/src/modules/cdp/worker.c b/src/modules/cdp/worker.c index 30d7a1b0fe..64ba70679f 100644 --- a/src/modules/cdp/worker.c +++ b/src/modules/cdp/worker.c @@ -258,11 +258,11 @@ int put_task(peer *p, AAAMessage *msg) { length_percentage = num_tasks/tasks->max*100; if(length_percentage > workerq_length_threshold_percentage) { LM_WARN("Queue length has exceeded length threshold percentage" - " [%i] and is length [%i]", length_percentage, num_tasks); + " [%i] and is length [%i]\n", length_percentage, num_tasks); } } //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Added task to task queue. Queue length [%i]", num_tasks); + //LM_ERR("Added task to task queue. Queue length [%i]\n", num_tasks); return 1; @@ -300,7 +300,7 @@ task_t take_task() { lock_release(tasks->lock); //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Taken task from task queue. Queue length [%i]", num_tasks); + //LM_ERR("Taken task from task queue. Queue length [%i]\n", num_tasks); return t; [View Less]

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020