sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:6f400a80: modules: readme files regenerated - carrierroute ... [skip ci]
by Kamailio Dev 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: 6f400a8074fe60916867596431ca26dff00435d1 URL: https://github.com/kamailio/kamailio/commit/6f400a8074fe60916867596431ca26d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-09-30T11:46:18+02:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/6f400a8074fe60916867596431ca26d… Patch: https://github.com/kamailio/kamailio/commit/6f400a8074fe60916867596431ca26d… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index ad924c1ca2..ba1d19d230 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -41,7 +41,7 @@ Lucian Balaceanu 4. Functions - 4.1. cr_user_carrier(user, domain, dstavp) + 4.1. cr_user_carrier(user, domain, dstvar) 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp) @@ -185,7 +185,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. cr_user_carrier(user, domain, dstavp) + 4.1. cr_user_carrier(user, domain, dstvar) 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp) @@ -473,7 +473,7 @@ modparam("carrierroute", "avoid_failed_destinations", 0) 4. Functions - 4.1. cr_user_carrier(user, domain, dstavp) + 4.1. cr_user_carrier(user, domain, dstvar) 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp) @@ -501,22 +501,23 @@ cr_user_rewrite_uri(uri, domain) cr_tree_rewrite_uri(tree, domain) -> cr_route(tree, domain, "$rU", "$rU", "call_id") -4.1. cr_user_carrier(user, domain, dstavp) +4.1. cr_user_carrier(user, domain, dstvar) - This function loads the carrier and stores it in an AVP. It cannot be - used in the config file mode, as it needs a mapping of the given user - to a certain carrier. The is derived from a database entry belonging to - the user parameter. This mapping must be available in the table that is - specified in the “subscriber_table” variable. This data is not cached - in memory, that means for every execution of this function a database - query will be done. + This function loads the carrier and stores it in a config variable. It + cannot be used in the config file mode, as it needs a mapping of the + given user to a certain carrier. The is derived from a database entry + belonging to the user parameter. This mapping must be available in the + table that is specified in the “subscriber_table” variable. This data + is not cached in memory, that means for every execution of this + function a database query will be done. Meaning of the parameters is as follows: * user - Name of the user for the carrier tree lookup. Additional to a string any pseudo-variable could be used as input. * domain - Name of the routing domain to be used. Additional to a string any pseudo-variable could be used as input. - * dstavp - Name of the AVP where to store the carrier id. + * dstvar - Name of the writaable variable (e.g., an AVP) where to + store the carrier id. 4.2. cr_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp)

1 0

git:master:1e3f1886: carrierroute: exported cr_user_carrier() to kemi
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: 1e3f1886cef43fcbf6cdd6f1cefb5b72e5151abc URL: https://github.com/kamailio/kamailio/commit/1e3f1886cef43fcbf6cdd6f1cefb5b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T11:35:53+02:00 carrierroute: exported cr_user_carrier() to kemi --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_func.c Modified: src/modules/carrierroute/cr_func.h --- Diff: https://github.com/kamailio/kamailio/commit/1e3f1886cef43fcbf6cdd6f1cefb5b7… Patch: https://github.com/kamailio/kamailio/commit/1e3f1886cef43fcbf6cdd6f1cefb5b7… --- diff --git a/src/modules/carrierroute/carrierroute.c b/src/modules/carrierroute/carrierroute.c index b1d6b986bd..68fa793971 100644 --- a/src/modules/carrierroute/carrierroute.c +++ b/src/modules/carrierroute/carrierroute.c @@ -39,6 +39,7 @@ #include "../../core/str.h" #include "../../core/mem/mem.h" #include "../../core/ut.h" /* for user2uid() */ +#include "../../core/kemi.h" #include "carrierroute.h" #include "cr_fixup.h" #include "cr_map.h" @@ -270,3 +271,28 @@ static void mod_destroy(void) { } destroy_route_data(); } + + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_carrierroute_exports[] = { + { str_init("carrierroute"), str_init("cr_user_carrier"), + SR_KEMIP_INT, ki_cr_load_user_carrier, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_carrierroute_exports); + return 0; +} diff --git a/src/modules/carrierroute/cr_func.c b/src/modules/carrierroute/cr_func.c index e4e7fc1c41..90875a8df0 100644 --- a/src/modules/carrierroute/cr_func.c +++ b/src/modules/carrierroute/cr_func.c @@ -722,6 +722,48 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, } +/** + * + */ +int ki_cr_load_user_carrier_helper(struct sip_msg *_msg, + str *user, str *domain, pv_spec_t *dvar) { + pv_value_t val = {0}; + + /* get carrier id */ + if ((val.ri = load_user_carrier(user, domain)) < 0) { + LM_ERR("error in load user carrier"); + return -1; + } else { + /* set var */ + val.flags = PV_VAL_INT|PV_TYPE_INT; + if(dvar->setf(_msg, &dvar->pvp, (int)EQ_T, &val)<0) { + LM_ERR("failed setting dst var\n"); + return -1; + } + } + return 1; +} + +/** + * + */ +int ki_cr_load_user_carrier(struct sip_msg *_msg, + str *user, str *domain, str *dstvar) { + pv_spec_t *dst; + + dst = pv_cache_get(dstvar); + if(dst==NULL) { + LM_ERR("failed to get pv spec for: %.*s\n", dstvar->len, dstvar->s); + return -1; + } + if(dst->setf==NULL) { + LM_ERR("target pv is not writable: %.*s\n", dstvar->len, dstvar->s); + return -1; + } + + return ki_cr_load_user_carrier_helper(_msg, user, domain, dst); +} + /** * Loads user carrier from subscriber table and stores it in an AVP. * @@ -735,8 +777,6 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, int cr_load_user_carrier(struct sip_msg * _msg, char *_user, char *_domain, char *_dstvar) { str user, domain; - pv_spec_t *dst; - pv_value_t val = {0}; if (fixup_get_svalue(_msg, (gparam_t*)_user, &user)<0) { LM_ERR("cannot print the user\n"); @@ -747,22 +787,10 @@ int cr_load_user_carrier(struct sip_msg * _msg, LM_ERR("cannot print the domain\n"); return -1; } - /* get carrier id */ - if ((val.ri = load_user_carrier(&user, &domain)) < 0) { - LM_ERR("error in load user carrier"); - return -1; - } else { - /* set var */ - dst = (pv_spec_t *)_dstvar; - val.flags = PV_VAL_INT|PV_TYPE_INT; - if(dst->setf(_msg, &dst->pvp, (int)EQ_T, &val)<0) { - LM_ERR("failed setting dst var\n"); - return -1; - } - } - return 1; -} + return ki_cr_load_user_carrier_helper(_msg, &user, &domain, + (pv_spec_t*)_dstvar); +} /** * rewrites the request URI of msg after determining the diff --git a/src/modules/carrierroute/cr_func.h b/src/modules/carrierroute/cr_func.h index 1fc7343611..b2e861ac76 100644 --- a/src/modules/carrierroute/cr_func.h +++ b/src/modules/carrierroute/cr_func.h @@ -49,6 +49,9 @@ int cr_load_user_carrier(struct sip_msg * _msg, char *_user, char *_domain, char *_dstavp); +int ki_cr_load_user_carrier(struct sip_msg *_msg, + str *user, str *domain, str *dstvar); + /** * rewrites the request URI of msg after determining the * new destination URI

1 0

git:master:e84c1947: carrierroute: updated cr_load_user_carrier() to support any output variable
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: e84c1947b3c9fa5dc07fbab0361758a9f87e9da2 URL: https://github.com/kamailio/kamailio/commit/e84c1947b3c9fa5dc07fbab0361758a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T11:16:48+02:00 carrierroute: updated cr_load_user_carrier() to support any output variable - third parameter can be any writable - added fixup-free function for it --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_fixup.c Modified: src/modules/carrierroute/cr_fixup.h Modified: src/modules/carrierroute/cr_func.c Modified: src/modules/carrierroute/cr_func.h --- Diff: https://github.com/kamailio/kamailio/commit/e84c1947b3c9fa5dc07fbab0361758a… Patch: https://github.com/kamailio/kamailio/commit/e84c1947b3c9fa5dc07fbab0361758a…

1 0

git:master:c32ce4d7: carrierroute: docs updated for cr_user_carrier()
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: c32ce4d776d40fe2eccea9007fb842cd8c9c3af9 URL: https://github.com/kamailio/kamailio/commit/c32ce4d776d40fe2eccea9007fb842c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T11:21:29+02:00 carrierroute: docs updated for cr_user_carrier() --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c32ce4d776d40fe2eccea9007fb842c… Patch: https://github.com/kamailio/kamailio/commit/c32ce4d776d40fe2eccea9007fb842c… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 3b883d75155..341349495ec 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -412,10 +412,10 @@ cr_tree_rewrite_uri(tree, domain) <section> <title> - <function moreinfo="none">cr_user_carrier(user, domain, dstavp)</function> + <function moreinfo="none">cr_user_carrier(user, domain, dstvar)</function> </title> <para> - This function loads the carrier and stores it in an AVP. + This function loads the carrier and stores it in a config variable. It cannot be used in the config file mode, as it needs a mapping of the given user to a certain carrier. The is derived from a database entry belonging to the user parameter. This mapping must be available in the @@ -438,7 +438,8 @@ cr_tree_rewrite_uri(tree, domain) </para> </listitem> <listitem> - <para><emphasis>dstavp</emphasis> - Name of the AVP where to store the carrier id. + <para><emphasis>dstvar</emphasis> - Name of the writaable variable (e.g., an AVP) + where to store the carrier id. </para> </listitem> </itemizedlist>

1 0

git:master:d5ae9019: corex: added fixup free functions in module exports
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: d5ae9019dcdfe5b51ce87f6957902abbaa7fa071 URL: https://github.com/kamailio/kamailio/commit/d5ae9019dcdfe5b51ce87f6957902ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T10:52:25+02:00 corex: added fixup free functions in module exports --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5ae9019dcdfe5b51ce87f6957902ab… Patch: https://github.com/kamailio/kamailio/commit/d5ae9019dcdfe5b51ce87f6957902ab… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 3c6b6a59f41..7e61f1f93d7 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -112,59 +112,59 @@ static cmd_export_t cmds[]={ {"append_branch", (cmd_function)w_append_branch, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 2, fixup_spve_spve, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_data", (cmd_function)w_send_data, 2, fixup_spve_spve, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, {"sendx", (cmd_function)w_sendx, 3, fixup_spve_all, - 0, ANY_ROUTE }, + fixup_free_spve_all, ANY_ROUTE }, {"is_incoming", (cmd_function)nio_check_incoming, 0, 0, 0, ANY_ROUTE }, {"msg_iflag_set", (cmd_function)w_msg_iflag_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_reset", (cmd_function)w_msg_iflag_reset, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"file_read", (cmd_function)w_file_read, 2, fixup_file_op, 0, ANY_ROUTE }, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, - 0, ANY_ROUTE }, - {"setxflag", (cmd_function)w_setxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"resetxflag", (cmd_function)w_resetxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"isxflagset", (cmd_function)w_isxflagset, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, + {"setxflag", (cmd_function)w_setxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"resetxflag", (cmd_function)w_resetxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"isxflagset", (cmd_function)w_isxflagset, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, {"set_send_socket", (cmd_function)w_set_send_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_send_socket_name", (cmd_function)w_set_send_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket", (cmd_function)w_set_recv_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket_name", (cmd_function)w_set_recv_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_source_address", (cmd_function)w_set_source_address, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"via_add_srvid", (cmd_function)w_via_add_srvid, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE }, {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} };

1 0

OpenSSL and LibreSSL - food for thought
by Olle E. Johansson 30 Sep '22

30 Sep '22

Hi! A few years ago Daniel and I checked the possibility of supporting LibreSSL in addition to OpenSSL. I might not remember all the details, but I think it failed on LibreSSL not willing to support the memory allocation API we use in OpenSSL. There has been a lot of discussion about the OpenSSL project lately, their focus and lack of communication skills. AlpineLinux has tried moving away from OpenSSL but failed in the first attempt and now discuss making another attempt. It they do and we want to run Kamailio in Alpine - which is used in many container environments - we need to pay attention. https://gitlab.alpinelinux.org/alpine/tsc/-/issues/28 Some quotes: "Meanwhile, there are more problems: it turns out that OpenSSL 3.x will not have LTS releases of the same length as past branches of OpenSSL. In addition, there are governance problems, as outlined by Rich Salz in his email to the openssl-project mailing list: the OpenSSL developers appear to want to focus on developing new features rather than cleaning up the mess of regressions they have created with OpenSSL 3.” "However, it is the opinion of the Alpine license review community that the Apache 2.0 license is not compatible with GPLv2. It is also the opinion of the Alpine license review community that the OpenSSL 1.x license was alreadycompatible with both GPLv2 and GPLv3 due to the system library exception: it is generally not possible to install an Alpine system without having an OpenSSL implementation, so it clearly qualifies as a system library.” Kamailio has GPLv2 - if we parse the license the same way, we can’t support OpenSSL 3. We have many third-party libraries we use, like Curl, that also use OpenSSL. Curl may be a bad example, since the support of various TLS stacks is huge in Curl, but other libraries may have to make a decision here too. Do you have any feeling if other Open Source projects discuss this? Should we take another look at using LibreSSL? Personally I’m rather worried about all the discussions around the OpenSSL project. There has been meetings at IETF with this as a topic. It is a very important building block for a lot of what we work with. Cheers, /O

3 4

git:master:ff7913f5: core: snexpr - compile time options for formatting fload with full precission
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: ff7913f511f95a891fe870cb1fe88f586573af79 URL: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T09:17:36+02:00 core: snexpr - compile time options for formatting fload with full precission --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… Patch: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d6b9adac86..df409f8381 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -395,7 +395,11 @@ static int snexpr_format_num(char **out, float value) return -1; } if(value - (long)value != 0) { +#ifdef SNEXPR_FLOAT_FULLPREC + ret = snprintf(*out, 24, "%g", value); +#else ret = snprintf(*out, 24, "%.4g", value); +#endif } else { ret = snprintf(*out, 24, "%lld", (long long)value); }

1 0

Kamailio_IMS VMware image
by Khalil Toubia 29 Sep '22

29 Sep '22

Dear all I'm sending this email asking for Kamailio_IMS VMware image regards -- Khalil Toubia Telecom Consultant / Electronic Expert +961 70 226 442 Beirut - Lebanon

3 2

New feature: #defexp -preprocessor define with expression
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Hello, following the recent new feature of #!ifexp based on snexpr (https://www.kamailio.org/w/2022/09/ifexp-conditional-preprocessor-blocks/), another preprocessor directive was added which allows defining IDs with a value computed from the evaluation of an expression, respectively: #!defexp ID EXP The EXP can be any expression supported by snexpr, including the previously defined IDs. For example: #!define IPADDR 1.2.3.4 #!define PORT 5060 #!defexp SIPURI "sip:" + IPADDR + ":" + PORT The result is that SIPURI is defined to sip:1.2.3.4:5060. Another variant is available as #!defexps, which encloses the result of the expression in double quotes, making it suitable to be used further as string value: #!defexps SIPURI "sip:" + IPADDR + ":" + PORT The result is that SIPURI is defined to “sip:1.2.3.4:5060”. More details at: - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#defexp - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#defexps Testing would be appreciated, feedback can be addressed to sr-users mailing list! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Nov 7-10, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:d5df2e45: core: snexpr.h - custom function to format float value
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Module: kamailio Branch: master Commit: d5df2e45cf6ae3c8fc61f565c9291b26ff255ede URL: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-29T10:06:03+02:00 core: snexpr.h - custom function to format float value - use a precision of 4 decimals --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… Patch: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d1ade48525..d6b9adac86 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -387,6 +387,26 @@ static int to_int(float x) } +static int snexpr_format_num(char **out, float value) +{ + int ret = 0; + *out = (char*)malloc(24*sizeof(char)); + if(*out==NULL) { + return -1; + } + if(value - (long)value != 0) { + ret = snprintf(*out, 24, "%.4g", value); + } else { + ret = snprintf(*out, 24, "%lld", (long long)value); + } + if((ret < 0) || (ret >= 24)) { + free(*out); + *out = NULL; + return -2; + } + return 0; +} + static struct snexpr *snexpr_convert_num(float value, unsigned int ctype) { struct snexpr *e = (struct snexpr *)malloc(sizeof(struct snexpr)); @@ -398,7 +418,7 @@ static struct snexpr *snexpr_convert_num(float value, unsigned int ctype) if(ctype == SNE_OP_CONSTSTZ) { e->eflags |= SNEXPR_EXPALLOC | SNEXPR_VALALLOC; e->type = SNE_OP_CONSTSTZ; - asprintf(&e->param.stz.sval, "%g", value); + snexpr_format_num(&e->param.stz.sval, value); return e; }

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