- sr-dev - kamailio.org

git:master:0cf5148d: pkg/kamailio/deb: set 5.7.0~pre0 [skip ci]
by Victor Seva 17 Apr '23

17 Apr '23

Module: kamailio Branch: master Commit: 0cf5148d31b8e9f088ea9d8ed047553eb6cd590c URL: https://github.com/kamailio/kamailio/commit/0cf5148d31b8e9f088ea9d8ed047553… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-17T09:09:57+02:00 pkg/kamailio/deb: set 5.7.0~pre0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/0cf5148d31b8e9f088ea9d8ed047553… Patch: https://github.com/kamailio/kamailio/commit/0cf5148d31b8e9f088ea9d8ed047553…

1 0

git:master:cc0ef8e5: math: docs for math_sqrt()
by Daniel-Constantin Mierla 17 Apr '23

17 Apr '23

Module: kamailio Branch: master Commit: cc0ef8e5bcdb6fd325572cbffb3ddcf6aaa32435 URL: https://github.com/kamailio/kamailio/commit/cc0ef8e5bcdb6fd325572cbffb3ddcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-17T09:09:09+02:00 math: docs for math_sqrt() --- Modified: src/modules/math/doc/math_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cc0ef8e5bcdb6fd325572cbffb3ddcf… Patch: https://github.com/kamailio/kamailio/commit/cc0ef8e5bcdb6fd325572cbffb3ddcf… --- diff --git a/src/modules/math/doc/math_admin.xml b/src/modules/math/doc/math_admin.xml index fe70654d319..03faf998495 100644 --- a/src/modules/math/doc/math_admin.xml +++ b/src/modules/math/doc/math_admin.xml @@ -143,6 +143,28 @@ $var(x) = 100; math_log10("$var(x)", "$var(res)"); ... +</programlisting> + </example> + </section> + <section id="math.f.sqrt"> + <title> + <function moreinfo="none">math_sqrt(x, res)</function> + </title> + <para> + The function computes the square root of x and stores the result + in res. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>math_sqrt</function> usage</title> + <programlisting format="linespecific"> +... + math_sqrt("16", "$var(res)"); + $var(x) = 16; + math_sqrt("$var(x)", "$var(res)"); +... </programlisting> </example> </section>

1 0

Development for v5.7.x is frozen
by Daniel-Constantin Mierla 15 Apr '23

15 Apr '23

Hello, the formal notification that the development for the next major version 5.7.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.7 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.7. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added for 5.7. Once the branch 5.7 is created, new features can be pushed again to master branch as usual. From that moment, the v5.7.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.7 is going to be built at: * https://www.kamailio.org/wikidocs/features/new-in-5.7.x/ Upgrade guidelines will be collected at: * https://www.kamailio.org/wikidocs/install/upgrade/5.6.x-to-5.7.0/ Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.6.x to 5.7.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:adb5249d: Makefile.defs: version set to 5.7.0-dev4
by Daniel-Constantin Mierla 15 Apr '23

15 Apr '23

Module: kamailio Branch: master Commit: adb5249d10e6f37c80bdae69f61678ea0994617f URL: https://github.com/kamailio/kamailio/commit/adb5249d10e6f37c80bdae69f61678e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-15T08:29:29+02:00 Makefile.defs: version set to 5.7.0-dev4 - mark the end of development for 5.7.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/adb5249d10e6f37c80bdae69f61678e… Patch: https://github.com/kamailio/kamailio/commit/adb5249d10e6f37c80bdae69f61678e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 869cf3d2520..81f7b9ce65e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:c4c7b50b: Makefile.defs: version set to 5.7.0-pre0
by Daniel-Constantin Mierla 15 Apr '23

15 Apr '23

Module: kamailio Branch: master Commit: c4c7b50bb9f164d430af582c5844b0e0aacf2bb3 URL: https://github.com/kamailio/kamailio/commit/c4c7b50bb9f164d430af582c5844b0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-15T08:30:44+02:00 Makefile.defs: version set to 5.7.0-pre0 - testing phase for v5.7.x series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c4c7b50bb9f164d430af582c5844b0e… Patch: https://github.com/kamailio/kamailio/commit/c4c7b50bb9f164d430af582c5844b0e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 81f7b9ce65e..12cbd3d94b1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:388a12b4: math: added math_sqrt() function
by Daniel-Constantin Mierla 14 Apr '23

14 Apr '23

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 0

compiler warnings
by Juha Heinanen 14 Apr '23

14 Apr '23

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

2 2

git:master:bb3c781b: modules: readme files regenerated - math ... [skip ci]
by Kamailio Dev 14 Apr '23

14 Apr '23

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 0

git:master:0920992e: math: renamed math_log() to math_logN() to be more suggestive
by Daniel-Constantin Mierla 14 Apr '23

14 Apr '23

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 0

git:master:31c029ca: math: docs - proper names for exported functions
by Daniel-Constantin Mierla 14 Apr '23

14 Apr '23

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 0

git:master:17d8a040: math: additional logarithm functions
by Daniel-Constantin Mierla 14 Apr '23

14 Apr '23

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 0

git:master:ab67d110: Makefile.defs: do not set -O2 flag for darwin linker
by Daniel-Constantin Mierla 14 Apr '23

14 Apr '23

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 0

git:master:2cf7d05b: math: new module to collect math functions
by Daniel-Constantin Mierla 14 Apr '23

14 Apr '23

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 0

git:master:61018e47: jsonrpcs: define size for _jsonrpcs_stored_id buffer
by Daniel-Constantin Mierla 14 Apr '23

14 Apr '23

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 0

presence crash
by Juha Heinanen 13 Apr '23

13 Apr '23

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

2 1

git:master:57a22811: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 12 Apr '23

12 Apr '23

Module: kamailio Branch: master Commit: 57a22811bd91a1c86a59f2343522bbe7821b45fd URL: https://github.com/kamailio/kamailio/commit/57a22811bd91a1c86a59f2343522bbe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-04-12T11:46:50+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/57a22811bd91a1c86a59f2343522bbe… Patch: https://github.com/kamailio/kamailio/commit/57a22811bd91a1c86a59f2343522bbe… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 91ca0c7632..525824c78b 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1808,7 +1808,7 @@ if(dlg_get("abcdef", "123", "456")) Meaning of the parameters is as follows: * callid - SIP call-id. * ftag - SIP From tag. - * ttag - SIP To tag. + * ttag - SIP To tag. Use "" value to indicate early dialog. * name - key name of the $dlg_var. * dst - pv to store the value of $dlg_var(name).

1 0

git:master:87d11496: dialog: dlg_get_var() support early dialogs
by Victor Seva 12 Apr '23

12 Apr '23

Module: kamailio Branch: master Commit: 87d11496a15806481c9abf963c6dc13faa661b50 URL: https://github.com/kamailio/kamailio/commit/87d11496a15806481c9abf963c6dc13… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-12T10:56:24+02:00 dialog: dlg_get_var() support early dialogs to_tag can be empty --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/87d11496a15806481c9abf963c6dc13… Patch: https://github.com/kamailio/kamailio/commit/87d11496a15806481c9abf963c6dc13… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 06cd2c75c7..947c4038ed 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1790,7 +1790,7 @@ static str *ki_dlg_get_var_helper(sip_msg_t *msg, str *sc, str *sf, str *st, str LM_ERR("invalid From tag parameter\n"); return val; } - if(st==NULL || st->s==NULL || st->len == 0) { + if(st==NULL) { LM_ERR("invalid To tag parameter\n"); return val; } @@ -1860,11 +1860,6 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char LM_ERR("unable to get To Tag\n"); goto error; } - if(st.s==NULL || st.len == 0) - { - LM_ERR("invalid To tag parameter\n"); - goto error; - } if(fixup_get_svalue(msg, (gparam_p)key, &k)!=0) { LM_ERR("unable to get key name\n"); diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 17600081f5..6350e2df52 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2213,7 +2213,7 @@ if(dlg_get("abcdef", "123", "456")) </para> </listitem> <listitem> - <para><emphasis>ttag</emphasis> - SIP To tag. + <para><emphasis>ttag</emphasis> - SIP To tag. Use "" value to indicate early dialog. </para> </listitem> <listitem>

1 0

git:master:46455859: dispatcher: use PRIu64 to print uint64_t values
by Daniel-Constantin Mierla 10 Apr '23

10 Apr '23

Module: kamailio Branch: master Commit: 46455859652ad4fddd6271235298bd83f96e0556 URL: https://github.com/kamailio/kamailio/commit/46455859652ad4fddd6271235298bd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-10T08:32:10+02:00 dispatcher: use PRIu64 to print uint64_t values --- Modified: src/modules/dispatcher/ds_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/46455859652ad4fddd6271235298bd8… Patch: https://github.com/kamailio/kamailio/commit/46455859652ad4fddd6271235298bd8… --- diff --git a/src/modules/dispatcher/ds_ht.c b/src/modules/dispatcher/ds_ht.c index c5f239c075c..ab0cd10b20b 100644 --- a/src/modules/dispatcher/ds_ht.c +++ b/src/modules/dispatcher/ds_ht.c @@ -21,6 +21,7 @@ #include <stddef.h> #include <stdint.h> #include <regex.h> +#include <inttypes.h> #include "../../core/mem/shm_mem.h" #include "../../core/mem/mem.h" @@ -334,7 +335,7 @@ int ds_ht_dbg(ds_ht_t *dsht) while(it) { LM_ERR("\tcell: %.*s\n", it->callid.len, it->callid.s); LM_ERR("\tduid: %.*s\n", it->duid.len, it->duid.s); - LM_ERR("\thid: %u expire: %llu initexpire: %llu\n", it->cellid, + LM_ERR("\thid: %u expire: %" PRIu64 " initexpire: %" PRIu64 "\n", it->cellid, (uint64_t)it->expire, (uint64_t)it->initexpire); LM_ERR("\tdset:%d\n", it->dset); it = it->next;

1 0

git:master:d7c00bce: jsonrpcs: cast to long long int to print value without warning
by Daniel-Constantin Mierla 10 Apr '23

10 Apr '23

Module: kamailio Branch: master Commit: d7c00bce2b191b237254939a1b5029abc37a8004 URL: https://github.com/kamailio/kamailio/commit/d7c00bce2b191b237254939a1b5029a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-10T08:32:10+02:00 jsonrpcs: cast to long long int to print value without warning --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d7c00bce2b191b237254939a1b5029a… Patch: https://github.com/kamailio/kamailio/commit/d7c00bce2b191b237254939a1b5029a… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 5718abcf913..5ccaf0bac52 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -415,7 +415,8 @@ static int jsonrpc_send_mode(jsonrpc_ctx_t* ctx, int mode) srjson_AddNumberToObject(ctx->jrpl, ctx->jrpl->root, "id", nj->valuedouble); if(mode==1) { - snprintf(_jsonrpcs_stored_id, 62, "%lld", (int64_t)nj->valuedouble); + snprintf(_jsonrpcs_stored_id, 62, "%lld", + (long long int)nj->valuedouble); } } }

1 0

git:master:a0fac2aa: modules: readme files regenerated - benchmark ... [skip ci]
by Kamailio Dev 10 Apr '23

10 Apr '23

Module: kamailio Branch: master Commit: a0fac2aaa14a5d4a2054128095cf68d79304d3c2 URL: https://github.com/kamailio/kamailio/commit/a0fac2aaa14a5d4a2054128095cf68d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-04-10T08:16:28+02:00 modules: readme files regenerated - benchmark ... [skip ci] --- Modified: src/modules/benchmark/README Modified: src/modules/carrierroute/README Modified: src/modules/cdp/README Modified: src/modules/cnxcc/README Modified: src/modules/corex/README Modified: src/modules/cplc/README Modified: src/modules/enum/README Modified: src/modules/evapi/README Modified: src/modules/htable/README Modified: src/modules/http_async_client/README Modified: src/modules/http_client/README Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/a0fac2aaa14a5d4a2054128095cf68d… Patch: https://github.com/kamailio/kamailio/commit/a0fac2aaa14a5d4a2054128095cf68d…

1 0

[kamailio/kamailio] Typos (PR #3411)
by Дилян Палаузов 10 Apr '23

10 Apr '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3411 -- Commit Summary -- * benchmark: typo * carrierroute: typos * cdp: typos * cnxcc: typos * cplp: typos * ctl: typos * corex: typos * crypto: typo * enum: typos * evapi: typo * exec: typo * htable: typos * http_async_client: typos * http_client: typos -- File Changes -- M src/modules/benchmark/doc/benchmark_devel.xml (2) M src/modules/carrierroute/cr_fixup.c (4) M src/modules/carrierroute/cr_map.c (4) M src/modules/carrierroute/cr_map.h (4) M src/modules/carrierroute/cr_rule.h (2) M src/modules/carrierroute/doc/carrierroute_admin.xml (12) M src/modules/carrierroute/doc/carrierroute_db.xml (2) M src/modules/carrierroute/prime_hash.c (6) M src/modules/carrierroute/prime_hash.h (4) M src/modules/cdp/authstatemachine.c (8) M src/modules/cdp/configexample/ConfigExample.xml (2) M src/modules/cdp/diameter.h (2) M src/modules/cdp/diameter_avp.c (8) M src/modules/cdp/diameter_ims.h (2) M src/modules/cdp/diameter_ims_code_cmd.h (2) M src/modules/cdp/diameter_msg.c (4) M src/modules/cdp/diameter_peer.c (2) M src/modules/cdp/doc/cdp_admin.xml (2) M src/modules/cdp/doc/cdp_devel.xml (2) M src/modules/cdp/peerstatemachine.c (4) M src/modules/cdp/receiver.c (4) M src/modules/cdp/session.c (2) M src/modules/cdp/session.h (2) M src/modules/cnxcc/doc/cnxcc_admin.xml (2) M src/modules/cnxcc/example/kamailio-cnxcc.cfg (10) M src/modules/corex/corex_mod.c (2) M src/modules/corex/doc/corex_admin.xml (2) M src/modules/cplc/cpl_env.h (4) M src/modules/cplc/cpl_nonsig.c (12) M src/modules/cplc/cpl_proxy.h (4) M src/modules/cplc/cplc.c (2) M src/modules/cplc/doc/cplc_admin.xml (12) M src/modules/crypto/crypto_mod.c (2) M src/modules/ctl/binrpc.h (8) M src/modules/ctl/binrpc_run.c (10) M src/modules/ctl/ctl.cfg (2) M src/modules/ctl/fifo_server.c (6) M src/modules/ctl/io_listener.c (10) M src/modules/enum/doc/enum_admin.xml (2) M src/modules/enum/enum.c (2) M src/modules/evapi/doc/evapi_admin.xml (2) M src/modules/exec/kill.c (2) M src/modules/htable/doc/htable_admin.xml (8) M src/modules/htable/ht_db.c (2) M src/modules/http_async_client/doc/http_async_client_admin.xml (2) M src/modules/http_client/TODO.txt (6) M src/modules/http_client/doc/http_client_admin.xml (10) M src/modules/http_client/http_client.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3411.patch https://github.com/kamailio/kamailio/pull/3411.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3411 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3411(a)github.com>

2 1

git:master:f2fae3c0: http_client: typos
by Daniel-Constantin Mierla 10 Apr '23

10 Apr '23

Module: kamailio Branch: master Commit: f2fae3c00908cd63fc4cfb13535587f2ad564d3e URL: https://github.com/kamailio/kamailio/commit/f2fae3c00908cd63fc4cfb13535587f… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-10T08:05:56+02:00 http_client: typos --- Modified: src/modules/http_client/TODO.txt Modified: src/modules/http_client/doc/http_client_admin.xml Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/f2fae3c00908cd63fc4cfb13535587f… Patch: https://github.com/kamailio/kamailio/commit/f2fae3c00908cd63fc4cfb13535587f…

1 0

git:master:c1007b90: htable: typos
by Daniel-Constantin Mierla 10 Apr '23

10 Apr '23

Module: kamailio Branch: master Commit: c1007b900dd99deb8b3610e9c4da823f2cd2cd02 URL: https://github.com/kamailio/kamailio/commit/c1007b900dd99deb8b3610e9c4da823… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-10T08:05:56+02:00 htable: typos --- Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/c1007b900dd99deb8b3610e9c4da823… Patch: https://github.com/kamailio/kamailio/commit/c1007b900dd99deb8b3610e9c4da823… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 0493f422567..84f20e7b328 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -357,7 +357,7 @@ $ kamcmd htable.dump htable <listitem> <para> <emphasis>autoexpire</emphasis> -time in seconds to delete an item - from a hash table if no update was done to it. If is missing or set + from a hash table if no update was done to it. If it is missing or set to 0, the items won't expire. </para> </listitem> @@ -793,7 +793,7 @@ sht_print(); </title> <para> Delete the item with the name 'itname' from hash table 'htname'. - This API function equivaluent to '$sht(htname=>itname) = $null'. + This API function is equivalent to '$sht(htname=>itname) = $null'. </para> <para> This function can be used from ANY_ROUTE. @@ -1559,10 +1559,10 @@ kamcmd htable.seti test x[0] 123 </para> <programlisting format="linespecific"> ... -# set expire for $sht(test=>x) to 120 secs +# set expire for $sht(test=>x) to 120 secs kamctl rpc htable.setex test x 120 -# set expire for $sht(test=>10) to 120 secs +# set expire for $sht(test=>10) to 120 secs kamctl rpc htable.setex test s:10 120 ... </programlisting> diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 1f9dac458c6..db2a52ce8b1 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -648,7 +648,7 @@ int ht_db_save_table(ht_t *ht, str *dbtable) /** - * delete databse table + * delete database table */ int ht_db_delete_records(str *dbtable) {

1 0

git:master:7437d4d9: http_async_client: typos
by Daniel-Constantin Mierla 10 Apr '23

10 Apr '23

Module: kamailio Branch: master Commit: 7437d4d9977f50640efefbec4cc06056c4957b18 URL: https://github.com/kamailio/kamailio/commit/7437d4d9977f50640efefbec4cc0605… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-10T08:05:56+02:00 http_async_client: typos --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7437d4d9977f50640efefbec4cc0605… Patch: https://github.com/kamailio/kamailio/commit/7437d4d9977f50640efefbec4cc0605… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index f28ea0ce249..f514986725d 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -431,7 +431,7 @@ route[HTTP_REPLY] { </section> <section> <title>Pseudo Variables</title> - <para>The <literal>$http_req_id</literal> read-only variable can be used in REQUEST_ROUTE to retrive the unique identifier for a query after sending it or in the HTTP callback route to retrive the id of the query the reply belongs to. Useful mainly in non-transactional context.</para> + <para>The <literal>$http_req_id</literal> read-only variable can be used in REQUEST_ROUTE to retrieve the unique identifier for a query after sending it or in the HTTP callback route to retrieve the id of the query the reply belongs to. Useful mainly in non-transactional context.</para> <example> <title><literal>$http_req_id</literal> variable usage</title> <programlisting format="linespecific">

1 0

git:master:feb5d27f: enum: typos
by Daniel-Constantin Mierla 10 Apr '23

10 Apr '23

Module: kamailio Branch: master Commit: feb5d27f8a063b0c533d294be9e4726f75b96a0a URL: https://github.com/kamailio/kamailio/commit/feb5d27f8a063b0c533d294be9e4726… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-10T08:05:56+02:00 enum: typos --- Modified: src/modules/enum/doc/enum_admin.xml Modified: src/modules/enum/enum.c --- Diff: https://github.com/kamailio/kamailio/commit/feb5d27f8a063b0c533d294be9e4726… Patch: https://github.com/kamailio/kamailio/commit/feb5d27f8a063b0c533d294be9e4726… --- diff --git a/src/modules/enum/doc/enum_admin.xml b/src/modules/enum/doc/enum_admin.xml index 46e68f14f2c..34e848dd4c9 100644 --- a/src/modules/enum/doc/enum_admin.xml +++ b/src/modules/enum/doc/enum_admin.xml @@ -362,7 +362,7 @@ enum_pv_query("$avp(i:100)","e164.arpa.","+sip+voice:sip"); </title> <para> The function performs an enum query and rewrites the Request-URI with - the result of the query. This the Infrastructure-ENUM version of enum_query(). + the result of the query. This is the Infrastructure-ENUM version of enum_query(). The only difference to enum_query() is in the calculation of the FQDN where NAPTR records are looked for. </para> diff --git a/src/modules/enum/enum.c b/src/modules/enum/enum.c index 7d1d1553fb1..c292c195d9a 100644 --- a/src/modules/enum/enum.c +++ b/src/modules/enum/enum.c @@ -209,7 +209,7 @@ static inline int sip_match(struct naptr_rdata *naptr, str *service) && (strncasecmp(naptr->services + 4 + service->len, ":sip", 4) == 0); } else { /* handle compound NAPTRs and multiple services */ - str bakservice, baknaptr; /* we bakup the str */ + str bakservice, baknaptr; /* we backup the str */ int naptrlen, len; /* length of the extracted service */ /* RFC 3761, NAPTR service field must start with E2U+ */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev