June 2020 - sr-dev - kamailio.org

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

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 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);

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://github.com/kamailio/kamailio/commit/696e5981bdb791f4662076a42687a20… Patch: https://github.com/kamailio/kamailio/commit/696e5981bdb791f4662076a42687a20… --- 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

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 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);

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… Patch: https://github.com/kamailio/kamailio/commit/7cae3e5e0df27bf3481cbf0680bf869… --- 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

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/ims_charging/dialog.c Modified: src/modules/ims_charging/diameter_ro.c Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/ade490584600be4715ea7a6fd93ba9f… Patch: https://github.com/kamailio/kamailio/commit/ade490584600be4715ea7a6fd93ba9f…

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/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;

1 0

git:5.3:5284b907: ims_charging: fix missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.3 Commit: 5284b907357aa0dab0aa8eb655eeac81a7af60e9 URL: https://github.com/kamailio/kamailio/commit/5284b907357aa0dab0aa8eb655eeac8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:04Z ims_charging: fix missing line-breaks for log messages (cherry picked from commit 508786fcdbbc120215b3e7dd90d92ab40c3b1e4e) --- Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/diameter_ro.c Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/5284b907357aa0dab0aa8eb655eeac8… Patch: https://github.com/kamailio/kamailio/commit/5284b907357aa0dab0aa8eb655eeac8…

1 0

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

10 Jun '20

Module: kamailio Branch: 5.3 Commit: ccf7347e9f756b36e5baa65d93dab520098d3993 URL: https://github.com/kamailio/kamailio/commit/ccf7347e9f756b36e5baa65d93dab52… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:04Z cdp: add missing line-breaks for log messages (cherry picked from commit 32a0d8073eb1b7f01190d305d318b43268811be8) --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/ccf7347e9f756b36e5baa65d93dab52… Patch: https://github.com/kamailio/kamailio/commit/ccf7347e9f756b36e5baa65d93dab52… --- 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;

1 0

git:master:508786fc: ims_charging: fix missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 508786fcdbbc120215b3e7dd90d92ab40c3b1e4e URL: https://github.com/kamailio/kamailio/commit/508786fcdbbc120215b3e7dd90d92ab… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:51:27Z ims_charging: fix missing line-breaks for log messages --- Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/diameter_ro.c Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/508786fcdbbc120215b3e7dd90d92ab… Patch: https://github.com/kamailio/kamailio/commit/508786fcdbbc120215b3e7dd90d92ab…

1 0

git:master:32a0d807: cdp: add missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 32a0d8073eb1b7f01190d305d318b43268811be8 URL: https://github.com/kamailio/kamailio/commit/32a0d8073eb1b7f01190d305d318b43… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:51:27Z cdp: add missing line-breaks for log messages --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/32a0d8073eb1b7f01190d305d318b43… Patch: https://github.com/kamailio/kamailio/commit/32a0d8073eb1b7f01190d305d318b43… --- 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;

1 0

git:master:97593d20: sipdump: make month in the file name from 1 to 12
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: 97593d20875d26c38511f564fd7071bf79baa56b URL: https://github.com/kamailio/kamailio/commit/97593d20875d26c38511f564fd7071b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T20:02:21+02:00 sipdump: make month in the file name from 1 to 12 - tm_mon is from 0-11 --- Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/97593d20875d26c38511f564fd7071b… Patch: https://github.com/kamailio/kamailio/commit/97593d20875d26c38511f564fd7071b… --- diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 29face97c4..6730d4f602 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -202,7 +202,7 @@ static int sipdump_rotate_file(void) n = snprintf(_sipdump_fpath+_sipdump_fpath_prefix.len, SIPDUMP_FPATH_SIZE-_sipdump_fpath_prefix.len, "%d-%02d-%02d--%02d-%02d-%02d.data", - 1900+ti.tm_year, ti.tm_mon, ti.tm_mday, + 1900+ti.tm_year, ti.tm_mon+1, ti.tm_mday, ti.tm_hour, ti.tm_min, ti.tm_sec); LM_DBG("writing to file: %s (%d)\n", _sipdump_fpath, n); _sipdump_file = fopen( _sipdump_fpath, "w" );

1 0

missing SAR messages
by Georgi Rosenov Stefanov 09 Jun '20

09 Jun '20

I expect to 2000 of xlog("L_ERR", "GEORGI pcscf_save_pending"); on each try no matter how many registrations/sec I do

1 0

git:5.3:249d558c: pkg/docker: updated alpine docker packaging submodule
by Sergey Safarov 09 Jun '20

09 Jun '20

Module: kamailio Branch: 5.3 Commit: 249d558c0e3ae0c0e24d508d2e7a9c2853078a8f URL: https://github.com/kamailio/kamailio/commit/249d558c0e3ae0c0e24d508d2e7a9c2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-09T14:02:50+03:00 pkg/docker: updated alpine docker packaging submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/249d558c0e3ae0c0e24d508d2e7a9c2… Patch: https://github.com/kamailio/kamailio/commit/249d558c0e3ae0c0e24d508d2e7a9c2… --- diff --git a/pkg/docker b/pkg/docker index a6955b1834..9fa73e31e6 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit a6955b1834dbd3180bbc1cc256ba8aac0269739b +Subproject commit 9fa73e31e6b636148c57a1270692eb8bb967ee77

1 0

[kamailio/kamailio] Intermittent failed assertion in app_python3 (#2335)
by Alex Balashov 09 Jun '20

09 Jun '20

Submitting this on behalf of Jacob Greene, who posted a day or two ago: https://lists.kamailio.org/pipermail/sr-users/2020-May/109315.html Version in production is Debian 9 and Kamailio 5.3.4 from Debian packages: ``` ii kamailio 5.3.4+bpo9 amd64 very fast, dynamic and configurable SIP server ii kamailio-postgres-modules:amd64 5.3.4+bpo9 amd64 PostgreSQL database connectivity module for the Kamailio SIP server ii kamailio-presence-modules:amd64 5.3.4+bpo9 amd64 SIP presence modules for Kamailio ii kamailio-python3-modules:amd64 5.3.4+bpo9 amd64 The app_python3 module for the Kamailio SIP server rc kamailio-xml-modules:amd64 5.2.6+stretch amd64 XML based extensions for Kamailio's Management Interface ``` Anyway, a Kamailio child process periodically exits -- about ten times a day -- with a `SIGABRT` set off by a failed assertion somewhere inside the `app_python3` bureaucracy: ``` (gdb) where #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 #1 0x00007f2c2f76042a in __GI_abort () at abort.c:89 #2 0x00007f2c2f757e67 in __assert_fail_base (fmt=<optimized out>, assertion=assertion@entry=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=file@entry=0x7f2c2892bd9c "apy_kemi.c", line=line@entry=1819, function=function@entry=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:92 #3 0x00007f2c2f757f12 in __GI___assert_fail (assertion=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=0x7f2c2892bd9c "apy_kemi.c", line=1819, function=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:101 #4 0x00007f2c2890bd57 in sr_apy_kemi_exec_func () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #5 0x00007f2c288d525c in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #6 0x00007f2c282ad259 in PyCFunction_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #7 0x00007f2c283de739 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #8 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #9 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #10 0x00007f2c283dcadf in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #11 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #12 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #13 0x00007f2c284a0153 in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #14 0x00007f2c28333558 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #15 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #16 0x00007f2c2845b95c in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #17 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #18 0x00007f2c2849eb77 in PyEval_CallObjectWithKeywords () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #19 0x00007f2c2891c136 in apy_exec () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #20 0x00007f2c288dfe94 in sr_kemi_config_engine_python () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #21 0x0000558ec29ba7b4 in sr_kemi_route () #22 0x0000558ec2ab7c03 in receive_msg () #23 0x0000558ec2997e4a in udp_rcv_loop () #24 0x0000558ec28de718 in main_loop () #25 0x0000558ec28e7a39 in main () ``` The fuller backtrace for the top few frames: ``` Thread 1 (Thread 0x7f2c3031db40 (LWP 26211)): #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 set = {__val = {0, 140720998929208, 139827752272384, 139827751795724, 140724530937856, 94071669029552, 94071669029653, 94071669029552, 94071669029552, 94071669029661, 94071669029852, 94071669029552, 94071669029852, 0, 0, 0}} pid = <optimized out> tid = <optimized out> #1 0x00007f2c2f76042a in __GI_abort () at abort.c:89 save_stage = 2 act = {__sigaction_handler = {sa_handler = 0x558ec469d990, sa_sigaction = 0x558ec469d990}, sa_mask = {__val = { 139827751803746, 140720998929248, 109, 139827755099200, 1819, 139827635998896, 139827635638836, 139827752272384, 139827751811289, 139827755115808, 139827751803256, 139827752815328, 139827752801040, 94071641717939, 139827763892224, 139827635994024}}, sa_flags = 1819, sa_restorer = 0x7f2c2892d0b0} sigs = {__val = {32, 0 <repeats 15 times>}} #2 0x00007f2c2f757e67 in __assert_fail_base (fmt=<optimized out>, assertion=assertion@entry=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=file@entry=0x7f2c2892bd9c "apy_kemi.c", line=line@entry=1819, function=function@entry=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:92 str = 0x558ec466a760 "" total = 4096 #3 0x00007f2c2f757f12 in __GI___assert_fail (assertion=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=0x7f2c2892bd9c "apy_kemi.c", line=1819, function=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:101 No locals. #4 0x00007f2c2890bd57 in sr_apy_kemi_exec_func () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #5 0x00007f2c288d525c in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #6 0x00007f2c282ad259 in PyCFunction_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #7 0x00007f2c283de739 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #8 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #9 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #10 0x00007f2c283dcadf in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #11 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #12 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #13 0x00007f2c284a0153 in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #14 0x00007f2c28333558 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #15 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #16 0x00007f2c2845b95c in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #17 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #18 0x00007f2c2849eb77 in PyEval_CallObjectWithKeywords () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #19 0x00007f2c2891c136 in apy_exec () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #20 0x00007f2c288dfe94 in sr_kemi_config_engine_python () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #21 0x0000558ec29ba7b4 in sr_kemi_route () No symbol table info available. #22 0x0000558ec2ab7c03 in receive_msg () No symbol table info available. #23 0x0000558ec2997e4a in udp_rcv_loop () No symbol table info available. #24 0x0000558ec28de718 in main_loop () No symbol table info available. #25 0x0000558ec28e7a39 in main () No symbol table info available. ``` For what it's worth, line 1819 in `apy_kemi.c` in the latest 5.3 `HEAD` (which I'm not sure this binary package reflects) is: ``` 1801 if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) 1802 && is_printable(cfg_get(core, core_cfg, latency_log))) { 1803 gettimeofday(&tve, &tz); 1804 tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 1805 + (tve.tv_usec - tvb.tv_usec); 1806 if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { 1807 pstate = PyThreadState_GET(); 1808 if (pstate != NULL && pstate->frame != NULL) { 1809 pframe = pstate->frame; 1810 } 1811 1812 LOG(cfg_get(core, core_cfg, latency_log), 1813 "alert - action KSR.%s%s%s(...)" 1814 " took too long [%u ms] (file:%s func:%s line:%d)\n", 1815 (ket->mname.len>0)?ket->mname.s:"", 1816 (ket->mname.len>0)?".":"", ket->fname.s, tdiff, 1817 (pframe)?PyBytes_AS_STRING(pframe->f_code->co_filename):"", 1818 (pframe)?PyBytes_AS_STRING(pframe->f_code->co_name):"", 1819 (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); 1820 } 1821 } 1822 1823 return ret; 1824 } 1825 ``` That's inside `sr_apy_kemi_exec_func()`. Some suspicion falls upon this Python function: ``` def set_send_socket(self): KSR.info('[socket] forced_socket is: {}'.format(KSR.pv.get('$fs'))) if KSR.pv.get('$fs'): KSR.info('[socket] socket already set') return elif not self.is_local(): KSR.info('[socket] set socket to 5065') KSR.corex.set_send_socket(MY_IP + ':5065') else: KSR.info('[socket] set socket to 5060') KSR.corex.set_send_socket(MY_IP + ':5060') KSR.info('[socket] socket set') ``` ... simply because the last message out of KEMI which appears prior to the crash is one of its log emissions ... ``` May 21 18:20:25 proxy1 /usr/sbin/kamailio[26210]: INFO: 1697311439-5060-88(a)BA.CFC.EH.IF - {NOTIFY}: <core> [core/kemi.c:104]: sr_kemi_core_info(): domain exists result: None May 21 18:20:25 proxy1 /usr/sbin/kamailio[26211]: INFO: 1361696919-5060-39(a)BA.CFC.EH.BFC - {NOTIFY}: <core> [core/kemi.c:104]: sr_kemi_core_info(): [socket] forced_socket is: None May 21 18:20:25 proxy1 /usr/sbin/kamailio[26213]: INFO: 813204231-5060-53(a)BA.BF.J.CBF - {NOTIFY}: <core> [core/receive.c:518]: receive_msg(): reply-route executed in: 260 usec May 21 18:20:25 proxy1 /usr/sbin/kamailio[26212]: INFO: 1941306664-5060-17(a)BA.CFC.EH.CAG - {NOTIFY}: <core> [core/receive.c:518]: receive_msg(): reply-route executed in: 412 usec May 21 18:20:25 proxy1 /usr/sbin/kamailio[26209]: ALERT: <core> [main.c:766]: handle_sigs(): child process 26210 exited by a signal 6 May 21 18:20:25 proxy1 /usr/sbin/kamailio[26209]: ALERT: <core> [main.c:769]: handle_sigs(): core was not generated May 21 18:20:25 proxy1 /usr/sbin/kamailio[26209]: INFO: <core> [main.c:792]: handle_sigs(): terminating due to SIGCHLD ``` However, it's hard to troubleshoot without debug symbols and due to the third-party binary libraries, of course. Furthermore, the problem is not possible to reproduce on demand, though its incidence does seem to correlate to higher call volumes. Would building from source to provide more flexibility be recommended at this stage? -- 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/2335

4 4

git:master:b02c2470: app_python: check if f_code field in frame is set before using in log message
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: b02c247023ea3ea0ef9753efdb04aff7d5d3bbb4 URL: https://github.com/kamailio/kamailio/commit/b02c247023ea3ea0ef9753efdb04aff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T10:53:22+02:00 app_python: check if f_code field in frame is set before using in log message --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b02c247023ea3ea0ef9753efdb04aff… Patch: https://github.com/kamailio/kamailio/commit/b02c247023ea3ea0ef9753efdb04aff… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 5320b02155..43a47d28ad 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1814,9 +1814,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u us] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, - (pframe)?PyString_AsString(pframe->f_code->co_filename):"", - (pframe)?PyString_AsString(pframe->f_code->co_name):"", - (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); + (pframe && pframe->f_code)?PyString_AsString(pframe->f_code->co_filename):"", + (pframe && pframe->f_code)?PyString_AsString(pframe->f_code->co_name):"", + (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); } }

1 0

git:master:e680dd6e: app_python3: use safer function PyBytes_AsString() instead of macro
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: e680dd6ed672e63012e960c68c0030e3f188654b URL: https://github.com/kamailio/kamailio/commit/e680dd6ed672e63012e960c68c0030e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T10:49:22+02:00 app_python3: use safer function PyBytes_AsString() instead of macro - check if f_code filed in frame is set before using in log message - GH #2335 --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e680dd6ed672e63012e960c68c0030e… Patch: https://github.com/kamailio/kamailio/commit/e680dd6ed672e63012e960c68c0030e… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 2c4d73eb72..7af949de6e 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1822,9 +1822,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, - (pframe)?PyBytes_AS_STRING(pframe->f_code->co_filename):"", - (pframe)?PyBytes_AS_STRING(pframe->f_code->co_name):"", - (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); + (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", + (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", + (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); } }

1 0

git:master:0607cd0b: kemix: function to get the body length
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: 0607cd0b42ff2c692e8a096a73df41017449bde5 URL: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T10:44:24+02:00 kemix: function to get the body length --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… Patch: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index fdedda04be..4bd6f839d1 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -739,6 +739,30 @@ static sr_kemi_xval_t* ki_kx_getw_body(sip_msg_t *msg) return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static int ki_kx_get_bodylen(sip_msg_t *msg) +{ + str s; + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + return 0; + } + + s.s = get_body(msg); + + if(s.s == NULL) { + return 0; + } + s.len = msg->buf + msg->len - s.s; + if(s.len <=0) { + return 0; + } + + return s.len; +} + /** * */ @@ -1116,6 +1140,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_bodylen"), + SR_KEMIP_INT, ki_kx_get_bodylen, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_timestamp"), SR_KEMIP_INT, ki_kx_get_timestamp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

Send large responses with tcp_send() results in full write queue
by Alex Hermann 09 Jun '20

09 Jun '20

Hi, I'm using tcp_send() to send responses to incoming RPC requests over TCP. This works fine when responses are small, but tends to fail on larger responses on somewhat slower links or clients (it fails whenever the links is not on the loopback interface, even on sub-ms RTT links). The error message thrown in the logs is: ERROR: <core> [core/tcp_main.c:618]: _wbufq_add(): (32007 bytes): write queue full or timeout (18042, total 18042, last write 0 s ago) I verified the error is due to a full buffer, not a timeout. I would like the tcp_send() not to fail on a full send buffer. Instead of failing, it should wait until there is enough space in the buffer again and send the data. Timeout should still be honoured though. >From the code this looks like a "feature", but I would classify this as a bug. The receiver is still receiving, the timeout is not hit but Kamailio just decides not to send any more data because its (by default small) buffer is full. If the buffer is full, it should wait until enough space becomes free again, not fail before the timeout triggers. The chunks of data that are sent via tcp_send() are always smaller than tcpconn_wq_max, so they should fit in an empty write buffer. I'd prefer not to increase tcpconn_wq_max as this will be a never ending story, the responses will keep growing over time. They're already in the 10's of MB at this time. Retrying tcp_send() is not an option. After the first failure, the connection is closed and there is no way for the server (Kamailio) to open a new connection to the RPC client. tcp_async is enabled, as that's needed/preferred for the SIP processing. Is there a way around the (full) write buffer for the caller of tcp_send()? -- Alex Hermann

3 3

git:5.3:ef221027: pdb: use memcpy() for PDB_BUFTOSHORT macro
by Daniel-Constantin Mierla 08 Jun '20

08 Jun '20

Module: kamailio Branch: 5.3 Commit: ef221027a448d77337225e376362b26b2618f050 URL: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-08T19:43:18+02:00 pdb: use memcpy() for PDB_BUFTOSHORT macro - related to GH #2345 (cherry picked from commit be57be33d0e48d412ddab9801ee4d6d906329d70) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… Patch: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 1ab15af2e7..5fb1204e52 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -190,7 +190,7 @@ static int pdb_msg_format_send(struct pdb_msg *msg, /* two chars to short-int without caring of memory alignment in char buffer */ -#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) +#define PDB_BUFTOSHORT(_sv, _b, _n) memcpy(&(_sv), (char*)(_b) + (_n), sizeof(short int)) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -347,7 +347,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, msg.bdy.payload, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } @@ -370,7 +370,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, buf, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; }

1 0

[kamailio/kamailio] PDB return wrong values (#2345)
by Earn330 08 Jun '20

08 Jun '20

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data ### Possible Solutions  ### Additional Information ``` version: kamailio 5.3.4 (x86_64/linux) a35a2f-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a35a2f -dirty compiled with gcc 4.9.2 ``` * **Operating System**: ``` Debian GNU/Linux 8 Linux voip-lab-proxy02 3.16.0-4-amd64 #1 SMP Debian 3.16.43-2+deb8u5 (2017-09-19) x86_64 GNU/Linux ``` -- 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/2345

3 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020