sr-dev July 2020

sr-dev@lists.kamailio.org

26 participants
390 discussions

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

02 Jul '20

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

1 0

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

02 Jul '20

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

1 0

Need Support about Kamailio Server
by thanh nguyen 02 Jul '20

02 Jul '20

Dear Kamailio Server’s Developers I’m an user who trying to discovery supported features of Kamailio server (for a client application that connect to server). Thank you all for made a beautiful thing like Kamailio. Could you guys please help to clear my some questions as below: - If I make a mobile application (something like Zoiper application), does Kamailio server support if I want to develop group chat feature in my application. If so please share the message request flow that I have to send to server and format of message request. - Could you guys please share some document that describes detail about format for each SIP request message (INVITE, REGISTRATION, OPTION, MESSAGE…) Thank you in advance for your supported. BRs Thanh Nguyen

1 0

git:5.3:de37b44a: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: de37b44a39334b845c1ff5f35c7c8f80a0119550 URL: https://github.com/kamailio/kamailio/commit/de37b44a39334b845c1ff5f35c7c8f8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-02T11:16:44+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/de37b44a39334b845c1ff5f35c7c8f8… Patch: https://github.com/kamailio/kamailio/commit/de37b44a39334b845c1ff5f35c7c8f8… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index 04d00ebb05..5c9fa52558 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -560,7 +560,7 @@ modparam("ims_charging", "origin_realm", "kamailio-ims.org") Destination host to be used in Diameter messages to charging-server. - Default value is "hss.ims.smilecoms.com". + Default value is "". Example 1.15. destination_hostparameter usage ...

1 0

git:5.3:475e3d93: ims_charging: add missing change for ccr.c (related to previous commit f5e44252c39c7695cb)
by Henning Westerholt 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 475e3d93329a782758e50e52de4ef49f72ef8a6c URL: https://github.com/kamailio/kamailio/commit/475e3d93329a782758e50e52de4ef49… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-07-02T09:12:05Z ims_charging: add missing change for ccr.c (related to previous commit f5e44252c39c7695cb) (cherry picked from commit 4cb61cc35a695e2636007f6518a63ed8e508b67f) --- Modified: src/modules/ims_charging/ccr.c --- Diff: https://github.com/kamailio/kamailio/commit/475e3d93329a782758e50e52de4ef49… Patch: https://github.com/kamailio/kamailio/commit/475e3d93329a782758e50e52de4ef49… --- diff --git a/src/modules/ims_charging/ccr.c b/src/modules/ims_charging/ccr.c index 0c1d069b14..20422e662e 100644 --- a/src/modules/ims_charging/ccr.c +++ b/src/modules/ims_charging/ccr.c @@ -215,7 +215,11 @@ AAAMessage * Ro_write_CCR_avps(AAAMessage * ccr, Ro_CCR_t* x) { if (x->origin_realm.s && x->origin_realm.len > 0) { if (!cdp_avp->base.add_Origin_Realm(&(ccr->avpList), x->origin_realm, 0)) goto error; } - + + if (x->destination_host.s && x->destination_host.len > 0) { + if (!cdp_avp->base.add_Destination_Host(&(ccr->avpList), x->destination_host, 0)) goto error; + } + if (x->destination_realm.s && x->destination_realm.len > 0) { if (!ro_add_destination_realm_avp(ccr, x->destination_realm)) goto error; }

1 0

git:5.3:38df9e58: ims_charging: bugfix for destination_host parameter, implementation was incomplete
by Henning Westerholt 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 38df9e58a81b24ec898107e23513ae1401345bfd URL: https://github.com/kamailio/kamailio/commit/38df9e58a81b24ec898107e23513ae1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-07-02T09:11:56Z ims_charging: bugfix for destination_host parameter, implementation was incomplete (cherry picked from commit f5e44252c39c7695cb66893035a0581a65a72f91) --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/Ro_data.h Modified: src/modules/ims_charging/config.h Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/38df9e58a81b24ec898107e23513ae1… Patch: https://github.com/kamailio/kamailio/commit/38df9e58a81b24ec898107e23513ae1… --- diff --git a/src/modules/ims_charging/Ro_data.c b/src/modules/ims_charging/Ro_data.c index 69e0f1408b..f3ce0bead8 100644 --- a/src/modules/ims_charging/Ro_data.c +++ b/src/modules/ims_charging/Ro_data.c @@ -185,6 +185,9 @@ Ro_CCR_t * new_Ro_CCR(int32_t acc_record_type, str * user_name, ims_information_ if (cfg.origin_realm.s && cfg.origin_realm.len >0) str_dup(x->origin_realm, cfg.origin_realm, pkg); + + if (cfg.destination_host.s && cfg.destination_host.len > 0) + str_dup(x->destination_host, cfg.destination_host, pkg); if (cfg.destination_realm.s && cfg.destination_realm.len > 0) str_dup(x->destination_realm, cfg.destination_realm, pkg); @@ -281,6 +284,7 @@ void Ro_free_CCR(Ro_CCR_t *x) { str_free(x->origin_host, pkg); str_free(x->origin_realm, pkg); + str_free(x->destination_host, pkg); str_free(x->destination_realm, pkg); str_free_ptr(x->user_name, pkg); diff --git a/src/modules/ims_charging/Ro_data.h b/src/modules/ims_charging/Ro_data.h index 5ac3efab05..5a47b58fb7 100644 --- a/src/modules/ims_charging/Ro_data.h +++ b/src/modules/ims_charging/Ro_data.h @@ -340,6 +340,7 @@ typedef struct { typedef struct { str origin_host; str origin_realm; + str destination_host; str destination_realm; int32_t acct_record_type; diff --git a/src/modules/ims_charging/config.h b/src/modules/ims_charging/config.h index 8ceabd4428..1ac03f24ca 100644 --- a/src/modules/ims_charging/config.h +++ b/src/modules/ims_charging/config.h @@ -4,6 +4,7 @@ typedef struct { str origin_host; str origin_realm; + str destination_host; str destination_realm; str * service_context_id; } client_ro_cfg; diff --git a/src/modules/ims_charging/doc/ims_charging_admin.xml b/src/modules/ims_charging/doc/ims_charging_admin.xml index 92bf0e000b..c14937e06f 100644 --- a/src/modules/ims_charging/doc/ims_charging_admin.xml +++ b/src/modules/ims_charging/doc/ims_charging_admin.xml @@ -530,7 +530,7 @@ modparam("ims_charging", "origin_realm", "kamailio-ims.org") <para>Destination host to be used in Diameter messages to charging-server.</para> - <para><emphasis>Default value is "hss.ims.smilecoms.com".</emphasis></para> + <para><emphasis>Default value is "".</emphasis></para> <example> <title><varname>destination_host</varname>parameter usage</title> diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index 150a525884..efb933c3d3 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -28,7 +28,6 @@ MODULE_VERSION struct dlg_binds* dlgb_p; /* parameters */ -char* ro_destination_host_s = "hss.ims.smilecoms.com"; char* ro_service_context_id_root_s = "32260(a)3gpp.org"; char* ro_service_context_id_ext_s = "ext"; char* ro_service_context_id_mnc_s = "01"; @@ -60,6 +59,7 @@ int ro_db_mode = DB_MODE_NONE; char *domain = "location"; client_ro_cfg cfg = { str_init(""), + str_init(""), str_init(""), str_init(""), 0 @@ -122,7 +122,7 @@ static param_export_t params[] = { { "origin_host", PARAM_STR, &cfg.origin_host }, { "origin_realm", PARAM_STR, &cfg.origin_realm }, { "destination_realm", PARAM_STR, &cfg.destination_realm }, - { "destination_host", PARAM_STRING, &ro_destination_host_s }, /* Unused parameter? */ + { "destination_host", PARAM_STR, &cfg.destination_host }, { "service_context_id_root",PARAM_STRING, &ro_service_context_id_root_s }, { "service_context_id_ext", PARAM_STRING, &ro_service_context_id_ext_s }, { "service_context_id_mnc", PARAM_STRING, &ro_service_context_id_mnc_s },

1 0

git:master:4cb61cc3: ims_charging: add missing change for ccr.c (related to previous commit f5e44252c39c7695cb)
by Henning Westerholt 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: 4cb61cc35a695e2636007f6518a63ed8e508b67f URL: https://github.com/kamailio/kamailio/commit/4cb61cc35a695e2636007f6518a63ed… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-07-02T09:09:59Z ims_charging: add missing change for ccr.c (related to previous commit f5e44252c39c7695cb) --- Modified: src/modules/ims_charging/ccr.c --- Diff: https://github.com/kamailio/kamailio/commit/4cb61cc35a695e2636007f6518a63ed… Patch: https://github.com/kamailio/kamailio/commit/4cb61cc35a695e2636007f6518a63ed… --- diff --git a/src/modules/ims_charging/ccr.c b/src/modules/ims_charging/ccr.c index 144f08c0fd..6f85ebbfc8 100644 --- a/src/modules/ims_charging/ccr.c +++ b/src/modules/ims_charging/ccr.c @@ -234,7 +234,11 @@ AAAMessage * Ro_write_CCR_avps(AAAMessage * ccr, Ro_CCR_t* x) { if (x->origin_realm.s && x->origin_realm.len > 0) { if (!cdp_avp->base.add_Origin_Realm(&(ccr->avpList), x->origin_realm, 0)) goto error; } - + + if (x->destination_host.s && x->destination_host.len > 0) { + if (!cdp_avp->base.add_Destination_Host(&(ccr->avpList), x->destination_host, 0)) goto error; + } + if (x->destination_realm.s && x->destination_realm.len > 0) { if (!ro_add_destination_realm_avp(ccr, x->destination_realm)) goto error; }

1 0

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

02 Jul '20

Module: kamailio Branch: master Commit: 63064361c9d42602bb5f0e1d6d9a1f888c5cb9b8 URL: https://github.com/kamailio/kamailio/commit/63064361c9d42602bb5f0e1d6d9a1f8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-02T11:01:18+02:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/63064361c9d42602bb5f0e1d6d9a1f8… Patch: https://github.com/kamailio/kamailio/commit/63064361c9d42602bb5f0e1d6d9a1f8… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index 3311e14c9a..8d5ed585d7 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -564,7 +564,7 @@ modparam("ims_charging", "origin_realm", "kamailio-ims.org") Destination host to be used in Diameter messages to charging-server. - Default value is "hss.ims.smilecoms.com". + Default value is "". Example 1.15. destination_hostparameter usage ...

1 0

git:master:f5e44252: ims_charging: bugfix for destination_host parameter, implementation was incomplete
by Henning Westerholt 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: f5e44252c39c7695cb66893035a0581a65a72f91 URL: https://github.com/kamailio/kamailio/commit/f5e44252c39c7695cb66893035a0581… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-07-02T08:55:08Z ims_charging: bugfix for destination_host parameter, implementation was incomplete --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/Ro_data.h Modified: src/modules/ims_charging/config.h Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f5e44252c39c7695cb66893035a0581… Patch: https://github.com/kamailio/kamailio/commit/f5e44252c39c7695cb66893035a0581… --- diff --git a/src/modules/ims_charging/Ro_data.c b/src/modules/ims_charging/Ro_data.c index dde768c31f..6da134f85d 100644 --- a/src/modules/ims_charging/Ro_data.c +++ b/src/modules/ims_charging/Ro_data.c @@ -194,6 +194,9 @@ Ro_CCR_t * new_Ro_CCR(int32_t acc_record_type, str * user_name, ims_information_ if (cfg.origin_realm.s && cfg.origin_realm.len >0) str_dup(x->origin_realm, cfg.origin_realm, pkg); + + if (cfg.destination_host.s && cfg.destination_host.len > 0) + str_dup(x->destination_host, cfg.destination_host, pkg); if (cfg.destination_realm.s && cfg.destination_realm.len > 0) str_dup(x->destination_realm, cfg.destination_realm, pkg); @@ -293,6 +296,7 @@ void Ro_free_CCR(Ro_CCR_t *x) { str_free(x->origin_host, pkg); str_free(x->origin_realm, pkg); + str_free(x->destination_host, pkg); str_free(x->destination_realm, pkg); str_free_ptr(x->user_name, pkg); diff --git a/src/modules/ims_charging/Ro_data.h b/src/modules/ims_charging/Ro_data.h index 4f1bff7e20..6ad045c191 100644 --- a/src/modules/ims_charging/Ro_data.h +++ b/src/modules/ims_charging/Ro_data.h @@ -341,6 +341,7 @@ typedef struct { typedef struct { str origin_host; str origin_realm; + str destination_host; str destination_realm; int32_t acct_record_type; diff --git a/src/modules/ims_charging/config.h b/src/modules/ims_charging/config.h index 8ceabd4428..1ac03f24ca 100644 --- a/src/modules/ims_charging/config.h +++ b/src/modules/ims_charging/config.h @@ -4,6 +4,7 @@ typedef struct { str origin_host; str origin_realm; + str destination_host; str destination_realm; str * service_context_id; } client_ro_cfg; diff --git a/src/modules/ims_charging/doc/ims_charging_admin.xml b/src/modules/ims_charging/doc/ims_charging_admin.xml index 4c68b6e29c..775a9016db 100644 --- a/src/modules/ims_charging/doc/ims_charging_admin.xml +++ b/src/modules/ims_charging/doc/ims_charging_admin.xml @@ -530,7 +530,7 @@ modparam("ims_charging", "origin_realm", "kamailio-ims.org") <para>Destination host to be used in Diameter messages to charging-server.</para> - <para><emphasis>Default value is "hss.ims.smilecoms.com".</emphasis></para> + <para><emphasis>Default value is "".</emphasis></para> <example> <title><varname>destination_host</varname>parameter usage</title> diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index a9a2dd0fb8..c9844dc784 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -28,7 +28,6 @@ MODULE_VERSION struct dlg_binds* dlgb_p; /* parameters */ -char* ro_destination_host_s = "hss.ims.smilecoms.com"; char* ro_service_context_id_root_s = "32260(a)3gpp.org"; char* ro_service_context_id_ext_s = "ext"; char* ro_service_context_id_mnc_s = "01"; @@ -60,6 +59,7 @@ int ro_db_mode = DB_MODE_NONE; char *domain = "location"; client_ro_cfg cfg = { str_init(""), + str_init(""), str_init(""), str_init(""), 0 @@ -124,7 +124,7 @@ static param_export_t params[] = { { "origin_host", PARAM_STR, &cfg.origin_host }, { "origin_realm", PARAM_STR, &cfg.origin_realm }, { "destination_realm", PARAM_STR, &cfg.destination_realm }, - { "destination_host", PARAM_STRING, &ro_destination_host_s }, /* Unused parameter? */ + { "destination_host", PARAM_STR, &cfg.destination_host }, { "service_context_id_root",PARAM_STRING, &ro_service_context_id_root_s }, { "service_context_id_ext", PARAM_STRING, &ro_service_context_id_ext_s }, { "service_context_id_mnc", PARAM_STRING, &ro_service_context_id_mnc_s },

1 0

[kamailio/kamailio] db_cluster module initialization problem - linked perhaps to change in srdb1 lib (#2385)
by Andrew Pogrebennyk 02 Jul '20

02 Jul '20

Hi, using kamailio 5.3, I have added two connections to the cluster: ``` modparam("db_cluster", "connection", DB_URL_REDIS_READ) modparam("db_cluster", "connection", DB_URL_REDIS_WRITE) modparam("ims_charging", "db_url", "cluster://cluster1") ``` it fails to start, here with additional debug prints ``` 2020-06-30T20:51:10.003728531Z 0(128) DEBUG: db_cluster [dbcl_api.c:267]: db_cluster_init(): initializing with cluster [cluster://k1] len 46 2020-06-30T20:51:10.003751277Z 0(128) DEBUG: db_cluster [dbcl_api.c:277]: db_cluster_init(): call dbcl_get_cluster with trimmed name of cluster [k1] len 36 2020-06-30T20:51:10.003772897Z 0(128) DEBUG: db_cluster [dbcl_data.c:67]: dbcl_get_cluster(): inside dbcl_get_cluster looking up new cluster [k1] len 36 2020-06-30T20:51:10.003801798Z 0(128) DEBUG: db_cluster [dbcl_data.c:75]: dbcl_get_cluster(): checking new 2749854490 cluster with name [k1] len 36 2020-06-30T20:51:10.003825383Z 0(128) DEBUG: db_cluster [dbcl_data.c:76]: dbcl_get_cluster(): checking 26214 cluster with name [k1] len 2 2020-06-30T20:51:10.003844796Z 0(128) ERROR: db_cluster [dbcl_api.c:281]: db_cluster_init(): cluster not found [cluster://k1] ``` so i see different hash id and the length mismatch, where it seems that db_cluster_init already gets wrong dburl strict structure from DB API, because the _dburl.s is pointing to the db_url but the length is calculated from the 2nd connection URL so 36 = strlen ("c2=>mysql://scscf:heslo@mysql/scscf2") I couldn't get it work also with only 1 connection. I could only tell there is something wrong with the way db_do_init2 / new_db_id from srdb1 interacts with db_cluster_init and then I found this commit [https://github.com/kamailio/kamailio/commit/5457bcbc51012e93775c3aaefa32c73… What I am getting at is: is it possible that commit in srdb1 with id 5457bcbc51012e93775c3aaefa32c73f956aa279 broke the db_cluster module in 2014? -- 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/2385

2 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2020