sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

[kamailio/kamailio] rtpengine: add flags processing on the daemon side (PR #3788)

by Donat Zenichev

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Introduce a versatile behavior of the rtpengine module in terms of ability to parse flags on rtpengine side, instead of module. Previous behavior is also kept (so backwards compatibility). General points: - rtpengine daemon supports rtpp flags processing from now on - module still provides in the bencode (when calling daemon): call-id, to/from tags, viabranch (so identification call data) - even though the module's interface is updated, a backwards compatibility is given, so no obligatory changes from kamailio script users required - each rtpengine module's function where it's reasonable to use rtpp flags as a parameter, now is able to get a third parameter `viabranch`, which is used to detect, which approach to use (older/newer): - without the viabranch - older one used - with the viabrnach - new one used, so rtpp flags parsing on rtpengine side The reason why the `via-branch` has been selected as a point of behavior differentiation is that currently it's only given via option flags list (raw string), meanwhile with a newer behavior option flags will not be parsed by the module. Since the module still has to provide all the basic identifiers, such as: call-id, From/To tags and via-branch, via-branch now is moved to a separate parameter, and gives to the module a clue a newer behavior is to be applied. The goal (for the future) is to deprecate processing of option flags on the module side and only parse them using rtpengine. This brings a list of benifits, such as: - no need to keep in sync rtpengine and module (for specific flags) - support of different rtpp flag string formats (raw), so that, for example, kamailio script users can use plain text or bencode dictionary like format, when providing flags from the kamailio script Current change is only applicable with rtpengine versions equal or later than mr12.3 Backwards compatibility provided, so users are not forced to change anything. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3788 -- Commit Summary -- * rtpengine: add flags processing on the daemon side * rtpengine: update documentation in regards of flags processing -- File Changes -- M src/modules/rtpengine/doc/rtpengine.xml (8) M src/modules/rtpengine/doc/rtpengine_admin.xml (45) M src/modules/rtpengine/rtpengine.c (847) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3788.patch https://github.com/kamailio/kamailio/pull/3788.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3788 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3788(a)github.com>

8 months, 1 week

git:master:c6fff3a5: rtpengine: update documentation in regards of flags processing

by Richard Fuchs

Module: kamailio Branch: master Commit: c6fff3a531740e648615a6e6223088693ecdccb9 URL: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:04:53-04:00 rtpengine: update documentation in regards of flags processing Due to a newer approach for parsing flags being added, update the documentation of module accordingly. --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886… Patch: https://github.com/kamailio/kamailio/commit/c6fff3a531740e648615a6e62230886…

8 months, 1 week

git:master:5cd02f56: rtpengine: add flags processing on the daemon side

by Richard Fuchs

Module: kamailio Branch: master Commit: 5cd02f5653e9b9f523a62a0dae78b801f962ce8e URL: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:04:53-04:00 rtpengine: add flags processing on the daemon side Introduce a versatile behavior of the rtpengine module in terms of ability to parse flags on rtpengine side, instead of module. Previous behavior is also kept. General points: - rtpengine daemon supports rtpp flags processing from now on - module still provides in the bencode (when calling daemon): call-id, to/from tags, viabranch (so identification call data) - even though the module's interface is updated, a backwards compatibility is given, so no obligatory changes from kamailio script users required - each rtpengine module's function which takes rtpp flags as a parameter, now is able to get a third parameter `viabranch`, which is used to detect, which approach to use (older/newer): - without the viabranch - older one used - with the viabrnach - new one used, so rtpp flags parsing on rtpengine side The goal (for the future) is to deprecate processing of option flags on the module side and only parse them using rtpengine. This brings a list of benifits, such as: - no need to keep in sync rtpengine and module (for specific flags) - support of different rtpp flag string formats (raw), so that, for example, kamailio script users can use plain text or bencode dictionary like format, when providing flags from the kamailio script --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80… Patch: https://github.com/kamailio/kamailio/commit/5cd02f5653e9b9f523a62a0dae78b80…

8 months, 1 week

[kamailio/kamailio] TLS crash in Kamailio 5.6.3 (5.7.4) on Debian 12 (Issue #3791)

by Evgeniy G

**Description** I have installed kamailio 5.6.3(from debian repo) on Debian 12. Try testing with openvas and some case, I saw kamailio crashes. > Mar 19 12:55:45 hostname kamailio[1789359]: CRITICAL: <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f0429907ea0), called from tls: tls_init.c: ser_free(323), first free tls: tls_init.c: ser_free(323) - ignoring > Mar 19 12:55:45 hostname kamailio[1789361]: CRITICAL: <core> [core/mem/q_malloc.c:123]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f0429907ee8 (address 0x7f0429907f20) beginning overwritten (80)! Memory allocator was called from tls: tls_init.c:323. Fragment marked by tls: tls_init.c:293. Exec from core/mem/q_malloc.c:511. > Mar 19 12:55:45 hostname kamailio[1789367]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 620 > Mar 19 12:55:45 hostname kamailio[1788962]: ALERT: <core> [main.c:774]: handle_sigs(): child process 1789361 exited by a signal 6. Next step, I added option --atexit=no to args - result same. Next step, I tried to build kamailio 5.7.4 from source and re-run testing, the result was the same - kamailio was crash. After that, I tried use `tlsa` module instead of `tlsa`, but it not resolve problem. Backtrace: [kamailio_5.6.3_backtrace_full.txt](https://github.com/kamailio/kamailio/fil… [kamailio_5.6.3_backtrace.txt](https://github.com/kamailio/kamailio/files/14… **Additional Information** > openssl version OpenSSL 3.0.11 19 Sep 2023 (Library: OpenSSL 3.0.11 19 Sep 2023) **Kamailio**: > kamailio -v version: kamailio 5.6.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 > kamailio -v version: kamailio 5.7.4 (x86_64/linux) c717c0 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c717c0 compiled on 13:23:19 Mar 20 2024 with gcc 12.2.0 **OS**: > lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm > uname -a Linux hostname 6.1.0-18-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.76-1 (2024-02-01) x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3791 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3791(a)github.com>

8 months, 1 week

git:master:b59812ff: modules: readme files regenerated - secsipid ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b59812ff025a4c7e531ce9ad29d435820908fa8a URL: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T07:31:23+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… Patch: https://github.com/kamailio/kamailio/commit/b59812ff025a4c7e531ce9ad29d4358… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 0433f481cf3..9297251072a 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -346,8 +346,8 @@ request_route { ... request_route { ... - http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey) -"); + secsipid_get_url("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)" +); if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... } ... } @@ -359,7 +359,8 @@ request_route { 4.5. secsipid_get_url(url, ovar) - Get the content of a URL and store the result in a variable. + Get the content of a URL and store the result in a variable. The result + is cached by libsecsipid, if caching is enabled. The url parameters can contain pseudo-variables and ovar has to be the name of a writable pseudo-variable.

8 months, 1 week

git:master:01ec19f7: secsipid: note that get url function is doing caching

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 01ec19f73a7257a83bd9abb9a02c12e2c3d225e0 URL: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-21T07:21:27+01:00 secsipid: note that get url function is doing caching - use get url function in example for verify --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… Patch: https://github.com/kamailio/kamailio/commit/01ec19f73a7257a83bd9abb9a02c12e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index c43ccf3c637..f8f2e823a21 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -338,7 +338,7 @@ request_route { ... request_route { ... - http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); + secsipid_get_url("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); if(secsipid_verify("$hdr(Identity)", "$var(pubkey)", "A")) { ... } ... } @@ -356,7 +356,8 @@ request_route { <function moreinfo="none">secsipid_get_url(url, ovar)</function> </title> <para> - Get the content of a URL and store the result in a variable. + Get the content of a URL and store the result in a variable. The result + is cached by libsecsipid, if caching is enabled. </para> <para> The url parameters can contain pseudo-variables and ovar has to be

8 months, 1 week

[kamailio/kamailio] xhttp: fix execution of async functions (PR #3723)

by Vadim Saranov

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3720 #### Description Fixing R-RURI and adding necessary headers when creating fake_msg in xhttp_mod.c for successful message validation and the ability to perform various kamailio functions from event_route[xhttp:request]. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3723 -- Commit Summary -- * xhttp: fix execution of async functions -- File Changes -- M src/modules/xhttp/xhttp_mod.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3723.patch https://github.com/kamailio/kamailio/pull/3723.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3723 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3723(a)github.com>

8 months, 1 week

git:master:eca79b06: modules: readme files regenerated - pvtpl ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: eca79b066984d8bd219c19a8c0dccb4955503bfc URL: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-20T16:16:11+01:00 modules: readme files regenerated - pvtpl ... [skip ci] --- Modified: src/modules/pvtpl/README --- Diff: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… Patch: https://github.com/kamailio/kamailio/commit/eca79b066984d8bd219c19a8c0dccb4… --- diff --git a/src/modules/pvtpl/README b/src/modules/pvtpl/README index 4ed20d00202..5bf5553aa97 100644 --- a/src/modules/pvtpl/README +++ b/src/modules/pvtpl/README @@ -30,12 +30,15 @@ Daniel-Constantin Mierla 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) + + 5. Template File List of Examples 1.1. Set tpl parameter - 1.2. gcrypt_aes_encrypt usage + 1.2. pvtpl_render usage + 1.3. Template file Chapter 1. Admin Guide @@ -53,7 +56,9 @@ Chapter 1. Admin Guide 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) + + 5. Template File 1. Overview @@ -101,18 +106,33 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") 4. Functions - 4.1. pvtpl_apply(tplname, res) + 4.1. pvtpl_render(tplname, res) -4.1. pvtpl_apply(tplname, res) +4.1. pvtpl_render(tplname, res) - Encrypts the text with the key using AES256 ECB encryption algorithm. - The result is encoded in base64 format and stored in res. The parameter - res must be a read-write variables. The parameters text and key can be - static strings or strings with variables (dynamic strings). + Render the template 'tplname' using config variables, setting the + result in the variable specified by 'res'. This function can be used from ANY_ROUTE. - Example 1.2. gcrypt_aes_encrypt usage + Example 1.2. pvtpl_render usage +... +pvtpl_render("t1", "$var(out)"); +... + +5. Template File + + The template file can contain text and config variables that are + evaluate when running pvtpl_render() functions. + + The templates files are loaded at startup and prepared for runtime. It + is no option to reload the template files. + + Example 1.3. Template file ... -gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); +{ + "from": "$fu", + "to": "$tu", + "x" : $var(x) +} ...

8 months, 1 week

git:master:d3900987: pvtpl: docs - section for template file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3900987ddd012a192c4a429b29ac8d4e24587c5 URL: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T16:15:27+01:00 pvtpl: docs - section for template file --- Modified: src/modules/pvtpl/doc/pvtpl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… Patch: https://github.com/kamailio/kamailio/commit/d3900987ddd012a192c4a429b29ac8d… --- diff --git a/src/modules/pvtpl/doc/pvtpl_admin.xml b/src/modules/pvtpl/doc/pvtpl_admin.xml index 8ca0174d3c4..25459ac1139 100644 --- a/src/modules/pvtpl/doc/pvtpl_admin.xml +++ b/src/modules/pvtpl/doc/pvtpl_admin.xml @@ -120,11 +120,35 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") <title><function>pvtpl_render</function> usage</title> <programlisting format="linespecific"> ... -pvtpl_render("t1", "$var(out)") +pvtpl_render("t1", "$var(out)"); ... </programlisting> </example> </section> </section> + <section> + <title>Template File</title> + <para> + The template file can contain text and config variables that are evaluate + when running pvtpl_render() functions. + </para> + <para> + The templates files are loaded at startup and prepared for runtime. It is + no option to reload the template files. + </para> + <example> + <title>Template file</title> + <programlisting format="linespecific"> +... +{ + "from": "$fu", + "to": "$tu", + "x" : $var(x) +} +... +</programlisting> + </example> + + </section> </chapter>

8 months, 1 week

git:master:d75e10f9: pvtpl: renamed pvtpl_apply() to pvtpl_render()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d75e10f983e7afaa7779e8fde6524d7eccdfd497 URL: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-20T16:07:16+01:00 pvtpl: renamed pvtpl_apply() to pvtpl_render() --- Modified: src/modules/pvtpl/doc/pvtpl_admin.xml Modified: src/modules/pvtpl/pvtpl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… Patch: https://github.com/kamailio/kamailio/commit/d75e10f983e7afaa7779e8fde6524d7… --- diff --git a/src/modules/pvtpl/doc/pvtpl_admin.xml b/src/modules/pvtpl/doc/pvtpl_admin.xml index 8ccfb8f9a23..8ca0174d3c4 100644 --- a/src/modules/pvtpl/doc/pvtpl_admin.xml +++ b/src/modules/pvtpl/doc/pvtpl_admin.xml @@ -105,24 +105,22 @@ modparam("pvtpl", "tpl", "name=tpl2;fpath=/etc/kamailio/tpl2.pvtpl;bsize=256;") <section> <title>Functions</title> - <section id="pvtpl.f.pvtpl_apply"> + <section id="pvtpl.f.pvtpl_render"> <title> - <function moreinfo="none">pvtpl_apply(tplname, res)</function> + <function moreinfo="none">pvtpl_render(tplname, res)</function> </title> <para> - Encrypts the text with the key using AES256 ECB encryption algorithm. - The result is encoded in base64 format and stored in res. The parameter - res must be a read-write variables. The parameters text and key can - be static strings or strings with variables (dynamic strings). + Render the template 'tplname' using config variables, setting the result + in the variable specified by 'res'. </para> <para> This function can be used from ANY_ROUTE. </para> <example> - <title><function>gcrypt_aes_encrypt</function> usage</title> + <title><function>pvtpl_render</function> usage</title> <programlisting format="linespecific"> ... -gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); +pvtpl_render("t1", "$var(out)") ... </programlisting> </example> diff --git a/src/modules/pvtpl/pvtpl_mod.c b/src/modules/pvtpl/pvtpl_mod.c index 15ee74b6838..9862a225236 100644 --- a/src/modules/pvtpl/pvtpl_mod.c +++ b/src/modules/pvtpl/pvtpl_mod.c @@ -42,7 +42,7 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv); +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv); /* clang-format off */ typedef struct pvtpl_item { @@ -61,7 +61,7 @@ static pvtpl_item_t *_pvtpl_list = NULL; /* clang-format off */ static cmd_export_t cmds[]={ - {"pvtpl_apply", (cmd_function)w_pvtpl_apply, 2, fixup_spve_pvar, + {"pvtpl_render", (cmd_function)w_pvtpl_render, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -278,7 +278,7 @@ static int pvtpl_tpl_param(modparam_t type, void *val) /** * */ -static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) +static int pvtpl_render(sip_msg_t *msg, str *tplname, pv_spec_t *dst) { pvtpl_item_t *it; pv_value_t val; @@ -313,7 +313,7 @@ static int pvtpl_apply(sip_msg_t *msg, str *tplname, pv_spec_t *dst) /** * */ -static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) +static int ki_pvtpl_render(sip_msg_t *msg, str *tplname, str *opv) { pv_spec_t *dst; @@ -324,13 +324,13 @@ static int ki_pvtpl_apply(sip_msg_t *msg, str *tplname, str *opv) return -1; } - return pvtpl_apply(msg, tplname, dst); + return pvtpl_render(msg, tplname, dst); } /** * */ -static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) +static int w_pvtpl_render(sip_msg_t *msg, char *ptplname, char *popv) { str tplname; pv_spec_t *dst; @@ -341,7 +341,7 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) } dst = (pv_spec_t *)popv; - return pvtpl_apply(msg, &tplname, dst); + return pvtpl_render(msg, &tplname, dst); } /** @@ -349,8 +349,8 @@ static int w_pvtpl_apply(sip_msg_t *msg, char *ptplname, char *popv) */ /* clang-format off */ static sr_kemi_t sr_kemi_pvtpl_exports[] = { - { str_init("pvtpl"), str_init("pvtpl_apply"), - SR_KEMIP_INT, ki_pvtpl_apply, + { str_init("pvtpl"), str_init("pvtpl_render"), + SR_KEMIP_INT, ki_pvtpl_render, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

8 months, 1 week

← Newer
1
...
8
9
10
11
12
13
14
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024