sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
260 discussions

git:master:388a12b4: math: added math_sqrt() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 388a12b455da982c590472741b1007ef42cc8b91 URL: https://github.com/kamailio/kamailio/commit/388a12b455da982c590472741b1007e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-14T22:55:50+02:00 math: added math_sqrt() function --- Modified: src/modules/math/math_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/388a12b455da982c590472741b1007e… Patch: https://github.com/kamailio/kamailio/commit/388a12b455da982c590472741b1007e… --- diff --git a/src/modules/math/math_mod.c b/src/modules/math/math_mod.c index ae73a7bbc42..2ac7a977893 100644 --- a/src/modules/math/math_mod.c +++ b/src/modules/math/math_mod.c @@ -39,6 +39,7 @@ static int w_math_pow(sip_msg_t *msg, char *v1, char *v2, char *r); static int w_math_logN(sip_msg_t *msg, char *v1, char *r); static int w_math_log2(sip_msg_t *msg, char *v1, char *r); static int w_math_log10(sip_msg_t *msg, char *v1, char *r); +static int w_math_sqrt(sip_msg_t *msg, char *v1, char *r); static int fixup_math_p2(void **param, int param_no); static int fixup_math_p3(void **param, int param_no); @@ -53,6 +54,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"math_log10", (cmd_function)w_math_log10, 2, fixup_math_p2, 0, ANY_ROUTE}, + {"math_sqrt", (cmd_function)w_math_sqrt, 2, fixup_math_p2, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -189,6 +192,34 @@ static int w_math_log10(sip_msg_t *msg, char *v1, char *r) return 1; } +/** + * + */ +static int w_math_sqrt(sip_msg_t *msg, char *v1, char *r) +{ + int vi1 = 0; + pv_spec_t *dst; + pv_value_t val = {0}; + + if(fixup_get_ivalue(msg, (gparam_t*)v1, &vi1)<0) { + LM_ERR("failed to get first parameter value\n"); + return -1; + } + + dst = (pv_spec_t *)r; + if(dst->setf==NULL) { + LM_ERR("target pv is not writable\n"); + return -1; + } + + val.ri = (long)sqrt((double)vi1); + val.flags = PV_TYPE_INT|PV_VAL_INT; + + dst->setf(msg, &dst->pvp, (int)EQ_T, &val); + + return 1; +} + /** * */

1 year, 1 month

compiler warnings

by Juha Heinanen

I'm getting a few compiler warnings when building latest master on Debian 11. -- Juha ------------------------------- CC (gcc) [M dispatcher.so] ds_ht.o In file included from ../../core/mem/shm.h:43, from ../../core/mem/shm_mem.h:32, from ds_ht.c:25: ds_ht.c: In function 'ds_ht_dbg': ../../core/mem/../dprint.h:321:24: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 12 has type 'long unsigned int' [-Wformat=] 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/mem/../dprint.h:345:4: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:351:4: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:354:4: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:392:31: note: in expansion of macro 'LOG' 392 | # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) | ^~~ ../../core/mem/../dprint.h:418:16: note: in expansion of macro 'ERR' 418 | #define LM_ERR ERR | ^~~ ds_ht.c:337:4: note: in expansion of macro 'LM_ERR' 337 | LM_ERR("\thid: %u expire: %llu initexpire: %llu\n", it->cellid, | ^~~~~~ ../../core/mem/../dprint.h:321:24: warning: format '%llu' expects argument of type 'long long unsigned int', but argument 13 has type 'long unsigned int' [-Wformat=] 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/mem/../dprint.h:345:4: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:351:4: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:354:4: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:392:31: note: in expansion of macro 'LOG' 392 | # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) | ^~~ ../../core/mem/../dprint.h:418:16: note: in expansion of macro 'ERR' 418 | #define LM_ERR ERR | ^~~ ds_ht.c:337:4: note: in expansion of macro 'LM_ERR' 337 | LM_ERR("\thid: %u expire: %llu initexpire: %llu\n", it->cellid, | ^~~~~~ ------------------------------- CC (gcc) [M jsonrpcs.so] jsonrpcs_mod.o jsonrpcs_mod.c: In function 'jsonrpc_send_mode': jsonrpcs_mod.c:418:44: warning: format '%lld' expects argument of type 'long long int', but argument 4 has type 'long int' [-Wformat=] 418 | snprintf(_jsonrpcs_stored_id, 62, "%lld", (int64_t)nj->valuedouble); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~~~~ | | | | | long int | long long int | %ld jsonrpcs_mod.c:428:42: warning: '%s' directive output may be truncated writing up to 63 bytes into a region of size 61 [-Wformat-truncation=] 428 | snprintf(_jsonrpcs_stored_id, 62, "\"%s\"", ctx->jsrid_val); | ^~ jsonrpcs_mod.c:428:5: note: 'snprintf' output between 3 and 66 bytes into a destination of size 62 428 | snprintf(_jsonrpcs_stored_id, 62, "\"%s\"", ctx->jsrid_val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ------------------------------- CC (gcc) [M local.so] functions.o In file included from ../../core/mem/pkg.h:32, from ../../core/mem/mem.h:41, from functions.c:26: functions.c: In function 'set_attr': ../../core/mem/../dprint.h:321:24: warning: format '%d' expects argument of type 'int', but argument 11 has type 'long int' [-Wformat=] 321 | fprintf(stderr, "%2d(%d) %s: %.*s%s%s%s" fmt, \ | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../core/mem/../dprint.h:345:4: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:351:4: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:354:4: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:392:31: note: in expansion of macro 'LOG' 392 | # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) | ^~~ ../../core/mem/../dprint.h:418:16: note: in expansion of macro 'ERR' 418 | #define LM_ERR ERR | ^~~ functions.c:69:6: note: in expansion of macro 'LM_ERR' 69 | LM_ERR("add_avp <%d> failed\n", name.n); | ^~~~~~

1 year, 1 month

git:master:bb3c781b: modules: readme files regenerated - math ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: bb3c781ba0021881957c7ce2e8afffb8d48f73a5 URL: https://github.com/kamailio/kamailio/commit/bb3c781ba0021881957c7ce2e8afffb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-04-14T12:01:12+02:00 modules: readme files regenerated - math ... [skip ci] --- Modified: src/modules/math/README --- Diff: https://github.com/kamailio/kamailio/commit/bb3c781ba0021881957c7ce2e8afffb… Patch: https://github.com/kamailio/kamailio/commit/bb3c781ba0021881957c7ce2e8afffb… --- diff --git a/src/modules/math/README b/src/modules/math/README index 814634f5a6..b0b2ae0f15 100644 --- a/src/modules/math/README +++ b/src/modules/math/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2023 asipto.com + Copyright �� 2023 asipto.com __________________________________________________________________ Table of Contents @@ -26,12 +26,16 @@ Daniel-Constantin Mierla 3. Functions 3.1. pow(base, power, res) - 3.2. log(x, res) + 3.2. math_logN(x, res) + 3.3. math_log2(x, res) + 3.4. math_log10(x, res) List of Examples - 1.1. pow usage - 1.2. log usage + 1.1. math_pow usage + 1.2. math_logN usage + 1.3. math_log2 usage + 1.4. math_log10 usage Chapter 1. Admin Guide @@ -46,7 +50,9 @@ Chapter 1. Admin Guide 3. Functions 3.1. pow(base, power, res) - 3.2. log(x, res) + 3.2. math_logN(x, res) + 3.3. math_log2(x, res) + 3.4. math_log10(x, res) 1. Overview @@ -74,33 +80,63 @@ Chapter 1. Admin Guide 3. Functions 3.1. pow(base, power, res) - 3.2. log(x, res) + 3.2. math_logN(x, res) + 3.3. math_log2(x, res) + 3.4. math_log10(x, res) -3.1. pow(base, power, res) +3.1. pow(base, power, res) The exponentiation function, computing the base raised to power, storing in res. This function can be used from ANY_ROUTE. - Example 1.1. pow usage + Example 1.1. math_pow usage ... - pow("2", "10", "$var(res)"); + math_pow("2", "10", "$var(res)"); $var(base) = 2; $var(power) = 10; - pow("$var(base)", "$var(power)", "$var(res)"); + math_pow("$var(base)", "$var(power)", "$var(res)"); ... -3.2. log(x, res) +3.2. math_logN(x, res) The function computes the natural logarithm of x and stores the result in res. This function can be used from ANY_ROUTE. - Example 1.2. log usage + Example 1.2. math_logN usage ... - log("10", "$var(res)"); + math_logN("10", "$var(res)"); $var(x) = 10; - pow("$var(x)", "$var(res)"); + math_logN("$var(x)", "$var(res)"); +... + +3.3. math_log2(x, res) + + The function computes the base-2 logarithm of x and stores the result + in res. + + This function can be used from ANY_ROUTE. + + Example 1.3. math_log2 usage +... + math_log2("16", "$var(res)"); + $var(x) = 16; + math_log2("$var(x)", "$var(res)"); +... + +3.4. math_log10(x, res) + + The function computes the base-10 logarithm of x and stores the result + in res. + + This function can be used from ANY_ROUTE. + + Example 1.4. math_log10 usage +... + math_log10("100", "$var(res)"); + $var(x) = 100; + math_log10("$var(x)", "$var(res)"); ...

1 year, 1 month

git:master:31c029ca: math: docs - proper names for exported functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 31c029ca47123de80f0f89e7526ddbb97af80768 URL: https://github.com/kamailio/kamailio/commit/31c029ca47123de80f0f89e7526ddbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-14T11:57:51+02:00 math: docs - proper names for exported functions --- Modified: src/modules/math/doc/math_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/31c029ca47123de80f0f89e7526ddbb… Patch: https://github.com/kamailio/kamailio/commit/31c029ca47123de80f0f89e7526ddbb… --- diff --git a/src/modules/math/doc/math_admin.xml b/src/modules/math/doc/math_admin.xml index 4e6a9a513ef..fe70654d319 100644 --- a/src/modules/math/doc/math_admin.xml +++ b/src/modules/math/doc/math_admin.xml @@ -69,20 +69,20 @@ This function can be used from ANY_ROUTE. </para> <example> - <title><function>pow</function> usage</title> + <title><function>math_pow</function> usage</title> <programlisting format="linespecific"> ... - pow("2", "10", "$var(res)"); + math_pow("2", "10", "$var(res)"); $var(base) = 2; $var(power) = 10; - pow("$var(base)", "$var(power)", "$var(res)"); + math_pow("$var(base)", "$var(power)", "$var(res)"); ... </programlisting> </example> </section> <section id="math.f.logN"> <title> - <function moreinfo="none">logN(x, res)</function> + <function moreinfo="none">math_logN(x, res)</function> </title> <para> The function computes the natural logarithm of x and stores the result @@ -92,19 +92,19 @@ This function can be used from ANY_ROUTE. </para> <example> - <title><function>logN</function> usage</title> + <title><function>math_logN</function> usage</title> <programlisting format="linespecific"> ... - logN("10", "$var(res)"); + math_logN("10", "$var(res)"); $var(x) = 10; - logN("$var(x)", "$var(res)"); + math_logN("$var(x)", "$var(res)"); ... </programlisting> </example> </section> <section id="math.f.log2"> <title> - <function moreinfo="none">log2(x, res)</function> + <function moreinfo="none">math_log2(x, res)</function> </title> <para> The function computes the base-2 logarithm of x and stores the result @@ -114,19 +114,19 @@ This function can be used from ANY_ROUTE. </para> <example> - <title><function>log2</function> usage</title> + <title><function>math_log2</function> usage</title> <programlisting format="linespecific"> ... - log2("16", "$var(res)"); + math_log2("16", "$var(res)"); $var(x) = 16; - log2("$var(x)", "$var(res)"); + math_log2("$var(x)", "$var(res)"); ... </programlisting> </example> </section> <section id="math.f.log10"> <title> - <function moreinfo="none">log10(x, res)</function> + <function moreinfo="none">math_log10(x, res)</function> </title> <para> The function computes the base-10 logarithm of x and stores the result @@ -136,12 +136,12 @@ This function can be used from ANY_ROUTE. </para> <example> - <title><function>log10</function> usage</title> + <title><function>math_log10</function> usage</title> <programlisting format="linespecific"> ... - log10("100", "$var(res)"); + math_log10("100", "$var(res)"); $var(x) = 100; - log10("$var(x)", "$var(res)"); + math_log10("$var(x)", "$var(res)"); ... </programlisting> </example>

1 year, 1 month

git:master:0920992e: math: renamed math_log() to math_logN() to be more suggestive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0920992eb2b60b1c98b187ddfd411dff8a8ba63a URL: https://github.com/kamailio/kamailio/commit/0920992eb2b60b1c98b187ddfd411df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-14T11:56:22+02:00 math: renamed math_log() to math_logN() to be more suggestive --- Modified: src/modules/math/doc/math_admin.xml Modified: src/modules/math/math_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0920992eb2b60b1c98b187ddfd411df… Patch: https://github.com/kamailio/kamailio/commit/0920992eb2b60b1c98b187ddfd411df… --- diff --git a/src/modules/math/doc/math_admin.xml b/src/modules/math/doc/math_admin.xml index e3695fefba..4e6a9a513e 100644 --- a/src/modules/math/doc/math_admin.xml +++ b/src/modules/math/doc/math_admin.xml @@ -80,9 +80,9 @@ </programlisting> </example> </section> - <section id="math.f.log"> + <section id="math.f.logN"> <title> - <function moreinfo="none">log(x, res)</function> + <function moreinfo="none">logN(x, res)</function> </title> <para> The function computes the natural logarithm of x and stores the result @@ -92,12 +92,12 @@ This function can be used from ANY_ROUTE. </para> <example> - <title><function>log</function> usage</title> + <title><function>logN</function> usage</title> <programlisting format="linespecific"> ... - log("10", "$var(res)"); + logN("10", "$var(res)"); $var(x) = 10; - log("$var(x)", "$var(res)"); + logN("$var(x)", "$var(res)"); ... </programlisting> </example> diff --git a/src/modules/math/math_mod.c b/src/modules/math/math_mod.c index 314bb23e9a..ae73a7bbc4 100644 --- a/src/modules/math/math_mod.c +++ b/src/modules/math/math_mod.c @@ -36,7 +36,7 @@ MODULE_VERSION static int w_math_pow(sip_msg_t *msg, char *v1, char *v2, char *r); -static int w_math_log(sip_msg_t *msg, char *v1, char *r); +static int w_math_logN(sip_msg_t *msg, char *v1, char *r); static int w_math_log2(sip_msg_t *msg, char *v1, char *r); static int w_math_log10(sip_msg_t *msg, char *v1, char *r); static int fixup_math_p2(void **param, int param_no); @@ -47,7 +47,7 @@ static int fixup_math_p3(void **param, int param_no); static cmd_export_t cmds[]={ {"math_pow", (cmd_function)w_math_pow, 3, fixup_math_p3, 0, ANY_ROUTE}, - {"math_log", (cmd_function)w_math_log, 2, fixup_math_p2, + {"math_logN", (cmd_function)w_math_logN, 2, fixup_math_p2, 0, ANY_ROUTE}, {"math_log2", (cmd_function)w_math_log2, 2, fixup_math_p2, 0, ANY_ROUTE}, @@ -108,7 +108,7 @@ static int w_math_pow(sip_msg_t *msg, char *v1, char *v2, char *r) /** * */ -static int w_math_log(sip_msg_t *msg, char *v1, char *r) +static int w_math_logN(sip_msg_t *msg, char *v1, char *r) { int vi1 = 0; pv_spec_t *dst;

1 year, 1 month

git:master:17d8a040: math: additional logarithm functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17d8a04033a19d6781f8f14c9ae610cd070c2a47 URL: https://github.com/kamailio/kamailio/commit/17d8a04033a19d6781f8f14c9ae610c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-14T11:53:02+02:00 math: additional logarithm functions --- Modified: src/modules/math/doc/math_admin.xml Modified: src/modules/math/math_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/17d8a04033a19d6781f8f14c9ae610c… Patch: https://github.com/kamailio/kamailio/commit/17d8a04033a19d6781f8f14c9ae610c… --- diff --git a/src/modules/math/doc/math_admin.xml b/src/modules/math/doc/math_admin.xml index e0051824c6f..e3695fefbaf 100644 --- a/src/modules/math/doc/math_admin.xml +++ b/src/modules/math/doc/math_admin.xml @@ -80,7 +80,7 @@ </programlisting> </example> </section> -<section id="math.f.log"> + <section id="math.f.log"> <title> <function moreinfo="none">log(x, res)</function> </title> @@ -97,7 +97,51 @@ ... log("10", "$var(res)"); $var(x) = 10; - pow("$var(x)", "$var(res)"); + log("$var(x)", "$var(res)"); +... +</programlisting> + </example> + </section> + <section id="math.f.log2"> + <title> + <function moreinfo="none">log2(x, res)</function> + </title> + <para> + The function computes the base-2 logarithm of x and stores the result + in res. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>log2</function> usage</title> + <programlisting format="linespecific"> +... + log2("16", "$var(res)"); + $var(x) = 16; + log2("$var(x)", "$var(res)"); +... +</programlisting> + </example> + </section> + <section id="math.f.log10"> + <title> + <function moreinfo="none">log10(x, res)</function> + </title> + <para> + The function computes the base-10 logarithm of x and stores the result + in res. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>log10</function> usage</title> + <programlisting format="linespecific"> +... + log10("100", "$var(res)"); + $var(x) = 100; + log10("$var(x)", "$var(res)"); ... </programlisting> </example> diff --git a/src/modules/math/math_mod.c b/src/modules/math/math_mod.c index 6f2b2f17ec4..314bb23e9a5 100644 --- a/src/modules/math/math_mod.c +++ b/src/modules/math/math_mod.c @@ -37,6 +37,8 @@ MODULE_VERSION static int w_math_pow(sip_msg_t *msg, char *v1, char *v2, char *r); static int w_math_log(sip_msg_t *msg, char *v1, char *r); +static int w_math_log2(sip_msg_t *msg, char *v1, char *r); +static int w_math_log10(sip_msg_t *msg, char *v1, char *r); static int fixup_math_p2(void **param, int param_no); static int fixup_math_p3(void **param, int param_no); @@ -47,6 +49,10 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"math_log", (cmd_function)w_math_log, 2, fixup_math_p2, 0, ANY_ROUTE}, + {"math_log2", (cmd_function)w_math_log2, 2, fixup_math_p2, + 0, ANY_ROUTE}, + {"math_log10", (cmd_function)w_math_log10, 2, fixup_math_p2, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -127,6 +133,62 @@ static int w_math_log(sip_msg_t *msg, char *v1, char *r) return 1; } +/** + * + */ +static int w_math_log2(sip_msg_t *msg, char *v1, char *r) +{ + int vi1 = 0; + pv_spec_t *dst; + pv_value_t val = {0}; + + if(fixup_get_ivalue(msg, (gparam_t*)v1, &vi1)<0) { + LM_ERR("failed to get first parameter value\n"); + return -1; + } + + dst = (pv_spec_t *)r; + if(dst->setf==NULL) { + LM_ERR("target pv is not writable\n"); + return -1; + } + + val.ri = (long)log2((double)vi1); + val.flags = PV_TYPE_INT|PV_VAL_INT; + + dst->setf(msg, &dst->pvp, (int)EQ_T, &val); + + return 1; +} + +/** + * + */ +static int w_math_log10(sip_msg_t *msg, char *v1, char *r) +{ + int vi1 = 0; + pv_spec_t *dst; + pv_value_t val = {0}; + + if(fixup_get_ivalue(msg, (gparam_t*)v1, &vi1)<0) { + LM_ERR("failed to get first parameter value\n"); + return -1; + } + + dst = (pv_spec_t *)r; + if(dst->setf==NULL) { + LM_ERR("target pv is not writable\n"); + return -1; + } + + val.ri = (long)log10((double)vi1); + val.flags = PV_TYPE_INT|PV_VAL_INT; + + dst->setf(msg, &dst->pvp, (int)EQ_T, &val); + + return 1; +} + /** * */

1 year, 1 month

git:master:2cf7d05b: math: new module to collect math functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2cf7d05beac75923998e2287c6856d49d4b6ccff URL: https://github.com/kamailio/kamailio/commit/2cf7d05beac75923998e2287c6856d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-14T11:43:40+02:00 math: new module to collect math functions --- Added: src/modules/math/Makefile Added: src/modules/math/README Added: src/modules/math/doc/Makefile Added: src/modules/math/doc/math.xml Added: src/modules/math/doc/math_admin.xml Added: src/modules/math/math_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cf7d05beac75923998e2287c6856d4… Patch: https://github.com/kamailio/kamailio/commit/2cf7d05beac75923998e2287c6856d4…

1 year, 1 month

git:master:ab67d110: Makefile.defs: do not set -O2 flag for darwin linker

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ab67d11064f71ad4d3661edaa533d30b023fad7a URL: https://github.com/kamailio/kamailio/commit/ab67d11064f71ad4d3661edaa533d30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-14T11:43:40+02:00 Makefile.defs: do not set -O2 flag for darwin linker --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ab67d11064f71ad4d3661edaa533d30… Patch: https://github.com/kamailio/kamailio/commit/ab67d11064f71ad4d3661edaa533d30… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 675f2cf5bb2..869cf3d2520 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1741,7 +1741,11 @@ endif # -andrei ifeq ($(CC_NAME), clang) +ifeq ($(OS), darwin) + LDFLAGS+=-Wl,-E $(PROFILE) +else LDFLAGS+=-Wl,-O2 -Wl,-E $(PROFILE) +endif MOD_LDFLAGS:=-shared $(LDFLAGS) LIB_LDFLAGS:=-shared $(LDFLAGS) LIB_SONAME=-Wl,-soname,

1 year, 1 month

git:master:61018e47: jsonrpcs: define size for _jsonrpcs_stored_id buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 61018e4774b0f6f7bda75aad7c74a56f9d14bb4a URL: https://github.com/kamailio/kamailio/commit/61018e4774b0f6f7bda75aad7c74a56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-14T11:35:03+02:00 jsonrpcs: define size for _jsonrpcs_stored_id buffer --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/61018e4774b0f6f7bda75aad7c74a56… Patch: https://github.com/kamailio/kamailio/commit/61018e4774b0f6f7bda75aad7c74a56… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 5ccaf0bac5..e369c62569 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -211,7 +211,8 @@ static jsonrpc_error_t _jsonrpc_error_table[] = { {0, { 0, 0 } } }; -static char _jsonrpcs_stored_id[64]; +#define JSONRPCS_STORED_ID_SIZE 72 +static char _jsonrpcs_stored_id[JSONRPCS_STORED_ID_SIZE]; char *jsonrpcs_stored_id_get(void) { @@ -409,13 +410,14 @@ static int jsonrpc_send_mode(jsonrpc_ctx_t* ctx, int mode) "id", 2, nj->valuestring, strlen(nj->valuestring)); if(mode==1) { - snprintf(_jsonrpcs_stored_id, 62, "\"%s\"", nj->valuestring); + snprintf(_jsonrpcs_stored_id, JSONRPCS_STORED_ID_SIZE-1, + "\"%s\"", nj->valuestring); } } else { srjson_AddNumberToObject(ctx->jrpl, ctx->jrpl->root, "id", nj->valuedouble); if(mode==1) { - snprintf(_jsonrpcs_stored_id, 62, "%lld", + snprintf(_jsonrpcs_stored_id, JSONRPCS_STORED_ID_SIZE-1, "%lld", (long long int)nj->valuedouble); } } @@ -426,13 +428,15 @@ static int jsonrpc_send_mode(jsonrpc_ctx_t* ctx, int mode) "id", 2, ctx->jsrid_val, strlen(ctx->jsrid_val)); if(mode==1) { - snprintf(_jsonrpcs_stored_id, 62, "\"%s\"", ctx->jsrid_val); + snprintf(_jsonrpcs_stored_id, JSONRPCS_STORED_ID_SIZE-1, + "\"%s\"", ctx->jsrid_val); } } else if(ctx->jsrid_type == 2) { srjson_AddNumberToObject(ctx->jrpl, ctx->jrpl->root, "id", (double)(*(long*)ctx->jsrid_val)); if(mode==1) { - snprintf(_jsonrpcs_stored_id, 62, "%ld", *((long*)ctx->jsrid_val)); + snprintf(_jsonrpcs_stored_id, JSONRPCS_STORED_ID_SIZE-1, + "%ld", *((long*)ctx->jsrid_val)); } } }

1 year, 1 month

presence crash

by Juha Heinanen

Latest K master crashes on Debian 11 when handling SUBSCRIBE message. (Earlier messages didn't go through when there was word subscribe in subject.) -- Juha -------------------------- (gdb) bt #0 0x00007f58c362cad0 in trim_leading (_s=0x7f58bceeb558) at ../../core/trim.h:59 #1 0x00007f58c362cbc0 in trim (_s=0x7f58bceeb558) at ../../core/trim.h:90 #2 0x00007f58c363f51c in print_callid (w=0x7f58bceed731 "", dialog=0x7f58c378c350, t=0x7f58bceeb4f0) at t_msgbuilder.c:1531 #3 0x00007f58c3640d78 in build_uac_req (method=0x7ffc2c640ae0, headers=0x7ffc2c640af0, body=0x0, dialog=0x7f58c378c350, branch=0, t=0x7f58bceeb4f0, len=0x7ffc2c64023c, dst=0x7ffc2c640380) at t_msgbuilder.c:1649 #4 0x00007f58c36b9e34 in t_uac_prepare (uac_r=0x7ffc2c640b40, dst_req=0x7ffc2c640498, dst_cell=0x7ffc2c6404a0) at uac.c:541 #5 0x00007f58c36bd786 in t_uac_with_ids (uac_r=0x7ffc2c640b40, ret_index=0x0, ret_label=0x0) at uac.c:757 #6 0x00007f58c36bd743 in t_uac (uac_r=0x7ffc2c640b40) at uac.c:739 #7 0x00007f58c36c00b9 in req_within (uac_r=0x7ffc2c640b40) at uac.c:986 #8 0x00007f58c2e633c7 in send_notify_request (subs=0x7ffc2c640ef0, watcher_subs=0x0, n_body=0x0, force_null_body=0) at notify.c:1727 #9 0x00007f58c2e64c61 in notify (subs=0x7ffc2c640ef0, watcher_subs=0x0, n_body=0x0, force_null_body=0, aux_body_processing=0x0) at notify.c:1818 #10 0x00007f58c2ef234c in update_subscription (msg=0x7f58c378a860, subs=0x7ffc2c640ef0, to_tag_gen=1, sent_reply=0x7ffc2c640e1c) at subscribe.c:685 #11 0x00007f58c2efa30b in handle_subscribe (msg=0x7f58c378a860, watcher_user=..., watcher_domain=...) at subscribe.c:1222 #12 0x00007f58c2ef596a in handle_subscribe0 (msg=0x7f58c378a860) at subscribe.c:999 #13 0x0000557db29781e3 in do_action (h=0x7ffc2c641b40, a=0x7f58c37b2c50, msg=0x7f58c378a860) at core/action.c:1081 #14 0x0000557db2986f7b in run_actions (h=0x7ffc2c641b40, a=0x7f58c37b2c50, msg=0x7f58c378a860) at core/action.c:1587 #15 0x0000557db29876e9 in run_actions_safe (h=0x7ffc2c6437e0, a=0x7f58c37b2c50, msg=0x7f58c378a860) at core/action.c:1651 #16 0x0000557db2b4a950 in rval_get_long (h=0x7ffc2c6437e0, msg=0x7f58c378a860, i=0x7ffc2c642058, rv=0x7f58c37b2f78, cache=0x0) at core/rvalue.c:955 --Type <RET> for more, q to quit, c to continue without paging-- #17 0x0000557db2b4ffbb in rval_expr_eval_long (h=0x7ffc2c6437e0, msg=0x7f58c378a860, res=0x7ffc2c642058, rve=0x7f58c37b2f70) at core/rvalue.c:1855 #18 0x0000557db2977c13 in do_action (h=0x7ffc2c6437e0, a=0x7f58c37b3be0, msg=0x7f58c378a860) at core/action.c:1057 #19 0x0000557db2986f7b in run_actions (h=0x7ffc2c6437e0, a=0x7f58c37b0f10, msg=0x7f58c378a860) at core/action.c:1587 #20 0x0000557db297814c in do_action (h=0x7ffc2c6437e0, a=0x7f58c37b40a0, msg=0x7f58c378a860) at core/action.c:1072 #21 0x0000557db2986f7b in run_actions (h=0x7ffc2c6437e0, a=0x7f58c37ab6f0, msg=0x7f58c378a860) at core/action.c:1587 #22 0x0000557db2974125 in do_action (h=0x7ffc2c6437e0, a=0x7f58c37ab390, msg=0x7f58c378a860) at core/action.c:705 #23 0x0000557db2986f7b in run_actions (h=0x7ffc2c6437e0, a=0x7f58c37ab1e0, msg=0x7f58c378a860) at core/action.c:1587 #24 0x0000557db29877f5 in run_top_route (a=0x7f58c37ab1e0, msg=0x7f58c378a860, c=0x0) at core/action.c:1672 #25 0x0000557db2afdb6a in receive_msg ( buf=0x7f58bcded648 "SUBSCRIBE sip:test@test.tutpro.com SIP/2.0\r\nRecord-Route: <sip:127.0.0.1:5070;transport=tcp;r2=on;lr>\r\nRecord-Route: <sip:192.168.188.215;transport=tcp;r2=on;lr>\r\nVia: SIP/2.0/TCP 127.0.0.1:5070;branc"..., len=749, rcv_info=0x7f58bcded2b8) at core/receive.c:515 #26 0x0000557db2c3ee6d in receive_tcp_msg ( tcpbuf=0x7f58bcded648 "SUBSCRIBE sip:test@test.tutpro.com SIP/2.0\r\nRecord-Route: <sip:127.0.0.1:5070;transport=tcp;r2=on;lr>\r\nRecord-Route: <sip:192.168.188.215;transport=tcp;r2=on;lr>\r\nVia: SIP/2.0/TCP 127.0.0.1:5070;branc"..., len=749, rcv_info=0x7f58bcded2b8, con=0x7f58bcded2a0) at core/tcp_read.c:1368 #27 0x0000557db2c419f2 in tcp_read_req (con=0x7f58bcded2a0, bytes_read=0x7ffc2c643e98, read_flags=0x7ffc2c643e9c) at core/tcp_read.c:1604 #28 0x0000557db2c44ef3 in handle_io (fm=0x7f58c37781f0, events=1, idx=-1) at core/tcp_read.c:1780 #29 0x0000557db2c30835 in io_wait_loop_epoll (h=0x557db2f102c0 <io_w>, t=2, repeat=0) at core/io_wait.h:1070 #30 0x0000557db2c47e98 in tcp_receive_loop (unix_sock=14) at core/tcp_read.c:1976 #31 0x0000557db2c24ab5 in tcp_init_children (woneinit=0x7ffc2c644288) at core/tcp_main.c:5239 --Type <RET> for more, q to quit, c to continue without paging-- #32 0x0000557db2963531 in main_loop () at main.c:1851 #33 0x0000557db296e0e7 in main (argc=17, argv=0x7ffc2c644978) at main.c:3086

1 year, 1 month

← Newer
1
...
18
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2023