sr-dev

sr-dev@lists.kamailio.org

12 participants
45245 discussions

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

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

2 4

git:master:71bc5524: ims_charging: db_url param type set to PARAM_STR
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: master Commit: 71bc55240a144dbad9d9d8afc942b81237c806d2 URL: https://github.com/kamailio/kamailio/commit/71bc55240a144dbad9d9d8afc942b81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T10:44:03+02:00 ims_charging: db_url param type set to PARAM_STR - the variable pointer is str* not char* - GH #2385 --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: … [View More]

1 0

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

02 Jul '20

Module: kamailio Branch: 5.3 Commit: dffd3502fed5cf33055f67967ba538f2c68c2a59 URL: https://github.com/kamailio/kamailio/commit/dffd3502fed5cf33055f67967ba538f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-02T10:02:03+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/carrierroute/README Modified: src/modules/pua/README --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:5.3:f959dec0: usrloc: rpc scan flags, cflags and methods fields as unsigned int
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: f959dec0c073c2b2dae904ee3d844872de989a2d URL: https://github.com/kamailio/kamailio/commit/f959dec0c073c2b2dae904ee3d84487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:48:20+02:00 usrloc: rpc scan flags, cflags and methods fields as unsigned int (cherry picked from commit 2c622627ea145eddcf891ba9b89b756457074991) --- Modified: src/modules/usrloc/ul_rpc.c … [View More]

1 0

git:5.3:c33d634f: kamctl: set Path to '.' when parameter not set for 'ul add'
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: c33d634f400d5219dd1a820b209a123ef3e27020 URL: https://github.com/kamailio/kamailio/commit/c33d634f400d5219dd1a820b209a123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:48:11+02:00 kamctl: set Path to '.' when parameter not set for 'ul add' (cherry picked from commit 301525dfbbad2ffcec6738ef5eff952645ab9dfe) --- Modified: utils/kamctl/kamctl --- Diff: … [View More]

1 0

git:5.3:070efaa8: jsonrpcs: more debug messages in case field of scanning failure
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 070efaa8497773c3a903c26d7f5f31632ad99703 URL: https://github.com/kamailio/kamailio/commit/070efaa8497773c3a903c26d7f5f316… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:47:57+02:00 jsonrpcs: more debug messages in case field of scanning failure (cherry picked from commit 0a4fa9594d871a41c2ef6b811e2b342ed6ccfe09) --- Modified: src/modules/jsonrpcs/… [View More]jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/070efaa8497773c3a903c26d7f5f316… Patch: https://github.com/kamailio/kamailio/commit/070efaa8497773c3a903c26d7f5f316… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index d939be5d0f..9f7e5f68bb 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -586,8 +586,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) va_list ap; str stmp; - if(ctx->req_node==NULL) + if(ctx->req_node==NULL) { + LM_DBG("no request node\n"); return 0; + } orig_fmt=fmt; va_start(ap, fmt); @@ -632,10 +634,14 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) *char_ptr = int2str(SRJSON_GET_ULONG(ctx->req_node), &stmp.len); } else { + LM_ERR("field is not a number to auto-convert - type %d\n", + ctx->req_node->type); *char_ptr = NULL; goto error; } } else { + LM_ERR("field is not a string - type %d\n", + ctx->req_node->type); *char_ptr = NULL; goto error; } @@ -650,11 +656,15 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) str_ptr->s = int2str(SRJSON_GET_ULONG(ctx->req_node), &str_ptr->len); } else { + LM_ERR("field is not a number to auto-convert - type %d\n", + ctx->req_node->type); str_ptr->s = NULL; str_ptr->len = 0; goto error; } } else { + LM_ERR("field is not a string - type %d\n", + ctx->req_node->type); str_ptr->s = NULL; str_ptr->len = 0; goto error; @@ -676,8 +686,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) ctx->req_node = ctx->req_node->next; } /* error if there is still a scan char type and it is not optional */ - if(*fmt && *fmt!='*' && mandatory_param==1) + if(*fmt && *fmt!='*' && mandatory_param==1) { + LM_ERR("no more fields to scan\n"); goto error; + } va_end(ap); return (int)(fmt-orig_fmt)-modifiers; [View Less]

1 0

git:5.3:bc58790b: imc: let space for ending characters
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: bc58790b7d33e7d2f3818e22894604c90edb0a7b URL: https://github.com/kamailio/kamailio/commit/bc58790b7d33e7d2f3818e22894604c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:47:28+02:00 imc: let space for ending characters (cherry picked from commit 1d256290cf10414a2f1af1feda3c9a357eb8ac27) --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/… [View More]

1 0

git:5.3:35d977ae: carrierroute: docs - note about config file ownership
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: 35d977aed4c7137d34d4cf8216d503ac48f1e423 URL: https://github.com/kamailio/kamailio/commit/35d977aed4c7137d34d4cf8216d503a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:47:15+02:00 carrierroute: docs - note about config file ownership - GH #2369 (cherry picked from commit 214c762c46d5cd5892d2ddc06a25193a01164e8b) --- Modified: src/modules/carrierroute/doc/… [View More]

1 0

git:5.3:de92bd35: siputils: docs - added section ids for parameters
by Daniel-Constantin Mierla 02 Jul '20

02 Jul '20

Module: kamailio Branch: 5.3 Commit: de92bd3500c28be19e8e86cb48dad0e42061269a URL: https://github.com/kamailio/kamailio/commit/de92bd3500c28be19e8e86cb48dad0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-02T09:46:23+02:00 siputils: docs - added section ids for parameters (cherry picked from commit ec0b1d31f1d667abdcd7cce7fbfff110583e271c) --- Modified: src/modules/siputils/doc/siputils_admin.xml … [View More]--- Diff: https://github.com/kamailio/kamailio/commit/de92bd3500c28be19e8e86cb48dad0e… Patch: https://github.com/kamailio/kamailio/commit/de92bd3500c28be19e8e86cb48dad0e… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index a430f85cc9..d7ef042486 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -72,7 +72,7 @@ <section> <title>Parameters</title> - <section> + <section id="siputils.p.ring_timeout"> <title><varname>ring_timeout</varname> (int)</title> <para> Timeout value in seconds, define how long the call-id is stored in the internal list kept for replacing 183 messages with 180. @@ -92,7 +92,7 @@ modparam("siputils", "ring_timeout", 30) </programlisting> </example> </section> - <section> + <section id="siputils.p.options_accept"> <title><varname>options_accept</varname> (string)</title> <para> This parameter is the content of the Accept header field. @@ -115,7 +115,7 @@ modparam("siputils", "options_accept", "application/*") </programlisting> </example> </section> - <section> + <section id="siputils.p.options_accept_encoding"> <title><varname>options_accept_encoding</varname> (string)</title> <para> This parameter is the content of the Accept-Encoding header field. @@ -137,7 +137,7 @@ modparam("siputils", "options_accept_encoding", "gzip") </example> </section> - <section> + <section id="siputils.p.contact_flds_separator"> <title><varname>contact_flds_separator</varname> (string)</title> <para> First char of this parameter is used as separator for encoding/decoding @@ -170,7 +170,7 @@ modparam("siputils", "contact_flds_separator", "-") </section> - <section> + <section id="siputils.p.options_accept_language"> <title><varname>options_accept_language</varname> (string)</title> <para> This parameter is the content of the Accept-Language header field. @@ -193,7 +193,7 @@ modparam("siputils", "options_accept_language", "de") </programlisting> </example> </section> - <section> + <section id="siputils.p.options_support"> <title><varname>options_support</varname> (string)</title> <para> This parameter is the content of the Support header field, @@ -215,7 +215,7 @@ modparam("siputils", "options_support", "100rel") </programlisting> </example> </section> - <section> + <section id="siputils.p.rpid_prefix"> <title><varname>rpid_prefix</varname> (string)</title> <para> Prefix to be added to Remote-Party-ID header field just before @@ -231,7 +231,7 @@ modparam("auth", "rpid_prefix", "Whatever <") </programlisting> </example> </section> - <section> + <section id="siputils.p.rpid_suffix"> <title><varname>rpid_suffix</varname> (string)</title> <para> Suffix to be added to Remote-Party-ID header field after the URI @@ -248,7 +248,7 @@ modparam("auth", "rpid_suffix", "@1.2.3.4>") </programlisting> </example> </section> - <section> + <section id="siputils.p.rpid_avp"> <title><varname>rpid_avp</varname> (string)</title> <para> Full AVP specification for the AVP which [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev