- sr-dev - kamailio.org

git:5.8:814f5bdc: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: 5.8 Commit: 814f5bdc9ee5d4594ffb0fd72843bca7b5fa79ea URL: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:09:22+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() (cherry picked from commit 0d240e4e0dc3184ef37d338ba6872d295d6b16f2) --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… Patch: https://github.com/kamailio/kamailio/commit/814f5bdc9ee5d4594ffb0fd72843bca… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

1 0

git:master:0d240e4e: dmq: fix inter-lock on error
by Victor Seva 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 0d240e4e0dc3184ef37d338ba6872d295d6b16f2 URL: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-03-23T00:00:44+01:00 dmq: fix inter-lock on error triggered by intermittent DNS resolution error. dmq workers were getting locked at dmq_notification_callback_f() due to this missing lock_release() --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… Patch: https://github.com/kamailio/kamailio/commit/0d240e4e0dc3184ef37d338ba6872d2… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 6189acf5359..5e9452a51f3 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -405,8 +405,10 @@ int extract_node_list(dmq_node_list_t *update_list, struct sip_msg *msg) /* trim the \r, \n and \0's */ trim_r(tmp_uri); find = build_dmq_node(&tmp_uri, 0); - if(find == NULL) - return -1; + if(find == NULL) { + LM_ERR("error building dmq node\n"); + goto error; + } ret = find_dmq_node(update_list, find); if(!ret) {

1 0

[kamailio/kamailio] kamcmd keepalive.list the last up and down time reversed (Issue #3790)
by suiyuemanbu 22 Mar '24

22 Mar '24

kamailio 5.7.0 kamcmd keepalive.list { uri: sip:192.168.10.12:8877 owner: drouting last checked: Mon Mar 18 17:45:39 2024 last up: Mon Mar 18 17:45:59 2024 //err last down: Thu Jan 1 08:00:00 1970 //err state: 2 } { uri: sip:192.168.10.124:5080 owner: drouting last checked: Tue Mar 19 10:34:39 2024 last up: Thu Jan 1 08:00:00 1970 //err last down: Tue Mar 19 10:34:39 2024 //err state: 1 } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3790 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3790(a)github.com>

2 4

git:master:4ada8180: file_out: Cast to correct type of str
by Xenofon Karamanos 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 4ada818099b5b7cb7deff1b1ce93b5aacaa1b84e URL: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-03-22T10:30:30Z file_out: Cast to correct type of str --- Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… Patch: https://github.com/kamailio/kamailio/commit/4ada818099b5b7cb7deff1b1ce93b5a… --- diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 7e035f13359..886f01f944f 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -344,7 +344,7 @@ static int fo_add_filename(modparam_t type, void *val) LM_ERR("modparam value is null\n"); return -1; } - if(strlen((char *)val) == 0) { + if(strlen(((str *)val)->s) == 0) { LM_ERR("modparam value is empty\n"); return -1; }

1 0

git:master:5f901c35: core: socket info - parse advertise ip part to get address family
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 5f901c3557f9f875545d82a7ab00f6d0c5c1fe52 URL: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:25:48+01:00 core: socket info - parse advertise ip part to get address family --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… Patch: https://github.com/kamailio/kamailio/commit/5f901c3557f9f875545d82a7ab00f6d… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index e048e0e2c4b..ab59df73dd6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -338,6 +338,11 @@ static inline struct socket_info *new_sock_info(char *name, p = si->useinfo.name.s + 1; si->useinfo.af = AF_INET6; } else { + ip_addr_t *ipv = NULL; + ipv = str2ipx(&si->useinfo.name); + if(ipv != NULL) { + si->useinfo.af = ipv->af; + } si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s; }

1 0

git:master:919216d0: core: fixup helpers with option to check if variable is writable
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 919216d051b8d459eb97f7ab0968d6bf0bead188 URL: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:18:23+01:00 core: fixup helpers with option to check if variable is writable --- Modified: src/core/mod_fix.c --- Diff: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… Patch: https://github.com/kamailio/kamailio/commit/919216d051b8d459eb97f7ab0968d6b… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 520ed44708c..0947f788461 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,12 +730,21 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_n_pvar(void **param, int n, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no, int pvmode) { + int ret = 0; if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == n + 1) - return fixup_pvar_null(param, 1); + if(param_no == n + 1) { + ret = fixup_pvar_null(param, 1); + if((ret == 0) && (pvmode == 1)) { + if(((pv_spec_t *)(*param))->setf == NULL) { + LM_ERR("pvar is not writeble\n"); + return E_UNSPEC; + } + } + return ret; + } return E_UNSPEC; } @@ -756,7 +765,7 @@ int fixup_free_spve_n_pvar(void **param, int n, int param_no) */ int fixup_spve_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 1, param_no); + return fixup_spve_n_pvar(param, 1, param_no, 0); } /** @@ -772,7 +781,7 @@ int fixup_free_spve_pvar(void **param, int param_no) */ int fixup_spve2_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 2, param_no); + return fixup_spve_n_pvar(param, 2, param_no, 1); } /** @@ -788,7 +797,7 @@ int fixup_free_spve2_pvar(void **param, int param_no) */ int fixup_spve3_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 3, param_no); + return fixup_spve_n_pvar(param, 3, param_no, 1); } /** @@ -804,7 +813,7 @@ int fixup_free_spve3_pvar(void **param, int param_no) */ int fixup_spve4_pvar(void **param, int param_no) { - return fixup_spve_n_pvar(param, 4, param_no); + return fixup_spve_n_pvar(param, 4, param_no, 1); } /**

1 0

git:master:61e076f0: http_client: use core helpers for fixup of http request functions
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 61e076f0dbb302b88c5013503697afd9dfd81748 URL: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T10:17:18+01:00 http_client: use core helpers for fixup of http request functions --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… Patch: https://github.com/kamailio/kamailio/commit/61e076f0dbb302b88c5013503697afd… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 9be9b88d835..c15e36c4957 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -133,8 +133,6 @@ static int fixup_http_query_post(void **param, int param_no); static int fixup_free_http_query_post(void **param, int param_no); static int fixup_http_query_post_hdr(void **param, int param_no); static int fixup_free_http_query_post_hdr(void **param, int param_no); -static int fixup_http_query_request(void **param, int param_no); -static int fixup_free_http_query_request(void **param, int param_no); static int fixup_curl_connect(void **param, int param_no); static int fixup_free_curl_connect(void **param, int param_no); @@ -187,11 +185,11 @@ static cmd_export_t cmds[] = { {"http_client_get", (cmd_function)w_http_query_get_hdr, 4, fixup_http_query_post_hdr, fixup_free_http_query_post_hdr, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_client_request", (cmd_function)w_http_query_request, 5, fixup_http_query_request, - fixup_free_http_query_request, + {"http_client_request", (cmd_function)w_http_query_request, 5, fixup_spve4_pvar, + fixup_free_spve4_pvar, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_client_request_v2pk", (cmd_function)w_http_query_request_v2pk, 5, fixup_http_query_request, - fixup_free_http_query_request, + {"http_client_request_v2pk", (cmd_function)w_http_query_request_v2pk, 5, fixup_spve4_pvar, + fixup_free_spve4_pvar, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"http_connect", (cmd_function)w_curl_connect, 3, fixup_curl_connect, fixup_free_curl_connect, @@ -639,49 +637,6 @@ static int fixup_free_curl_connect(void **param, int param_no) return -1; } -/* - * Fix http_client_request params: met, url, hdrs, data (strings that may contain - * pvars) and result (writable pvar). - */ -static int fixup_http_query_request(void **param, int param_no) -{ - if(param_no <= 4) { - return fixup_spve_null(param, 1); - } - - if(param_no == 5) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("http_query: failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("http_query: result pvar is not writeble\n"); - return -1; - } - return 0; - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - -/* - * Free http_client_request params. - */ -static int fixup_free_http_query_request(void **param, int param_no) -{ - if(param_no <= 4) { - return fixup_free_spve_null(param, 1); - } - - if(param_no == 5) { - return fixup_free_pvar_null(param, 1); - } - - LM_ERR("http_query: invalid parameter number <%d>\n", param_no); - return -1; -} - /* * Wrapper for Curl_connect (GET) */

1 0

git:master:19e91e09: core: fixup helpers for functions with strings and output variable params
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 19e91e097a851cc8c169c9c3144e2ab7669a5b71 URL: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T09:43:25+01:00 core: fixup helpers for functions with strings and output variable params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… Patch: https://github.com/kamailio/kamailio/commit/19e91e097a851cc8c169c9c3144e2ab… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 10be560982f..520ed44708c 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -730,11 +730,11 @@ int fixup_free_spve_spve_igp(void **param, int param_no) /** * */ -int fixup_spve_pvar(void **param, int param_no) +int fixup_spve_n_pvar(void **param, int n, int param_no) { - if(param_no == 1) + if(param_no >= 1 && param_no <= n) return fixup_spve_null(param, 1); - if(param_no == 2) + if(param_no == n + 1) return fixup_pvar_null(param, 1); return E_UNSPEC; } @@ -742,15 +742,79 @@ int fixup_spve_pvar(void **param, int param_no) /** * */ -int fixup_free_spve_pvar(void **param, int param_no) +int fixup_free_spve_n_pvar(void **param, int n, int param_no) { - if(param_no == 1) + if(param_no >= 1 && param_no <= n) return fixup_free_spve_null(param, 1); - if(param_no == 2) + if(param_no == n + 1) return fixup_free_pvar_null(param, 1); return E_UNSPEC; } +/** + * + */ +int fixup_spve_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 1, param_no); +} + +/** + * + */ +int fixup_free_spve_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 1, param_no); +} + +/** + * + */ +int fixup_spve2_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 2, param_no); +} + +/** + * + */ +int fixup_free_spve2_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 2, param_no); +} + +/** + * + */ +int fixup_spve3_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 3, param_no); +} + +/** + * + */ +int fixup_free_spve3_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 3, param_no); +} + +/** + * + */ +int fixup_spve4_pvar(void **param, int param_no) +{ + return fixup_spve_n_pvar(param, 4, param_no); +} + +/** + * + */ +int fixup_free_spve4_pvar(void **param, int param_no) +{ + return fixup_free_spve_n_pvar(param, 4, param_no); +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 3143f060426..a202c4ade2b 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -148,6 +148,12 @@ int fixup_spve_igp(void **param, int param_no); int fixup_free_spve_igp(void **param, int param_no); int fixup_spve_pvar(void **param, int param_no); int fixup_free_spve_pvar(void **param, int param_no); +int fixup_spve2_pvar(void **param, int param_no); +int fixup_free_spve2_pvar(void **param, int param_no); +int fixup_spve3_pvar(void **param, int param_no); +int fixup_free_spve3_pvar(void **param, int param_no); +int fixup_spve4_pvar(void **param, int param_no); +int fixup_free_spve4_pvar(void **param, int param_no); int fixup_spve_spve_igp(void **param, int param_no); int fixup_free_spve_spve_igp(void **param, int param_no);

1 0

git:master:ccd4481d: http_client: clang-format new code
by Daniel-Constantin Mierla 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: ccd4481dcd42093ccca6d39cd71afc8fd4db938d URL: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-22T09:42:33+01:00 http_client: clang-format new code --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… Patch: https://github.com/kamailio/kamailio/commit/ccd4481dcd42093ccca6d39cd71afc8… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index a359ce5090d..df6b8233b51 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -272,10 +272,11 @@ static int curL_request_url(struct sip_msg *_m, const char *_met, * - 1 (default) : timeout value is in seconds. * - 2 : timeout value is in milliseconds. */ - if (timeout_mode == 1) { /* timeout is in seconds (default) */ + if(timeout_mode == 1) { /* timeout is in seconds (default) */ res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)params->timeout); - } else if (timeout_mode == 2) { /* timeout is in milliseconds */ - res |= curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, (long)params->timeout); + } else if(timeout_mode == 2) { /* timeout is in milliseconds */ + res |= curl_easy_setopt( + curl, CURLOPT_TIMEOUT_MS, (long)params->timeout); } res |= curl_easy_setopt( @@ -734,7 +735,8 @@ int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, int http_client_request(sip_msg_t *_m, char *_url, str *_dst, char *_body, char *_hdrs, char *_met, unsigned int _httpver) { - return http_client_request_c(_m, _url, _dst, _body, NULL, _hdrs, _met, _httpver); + return http_client_request_c( + _m, _url, _dst, _body, NULL, _hdrs, _met, _httpver); } /*! diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 64c3a7c65ab..9be9b88d835 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -1091,9 +1091,8 @@ static int w_http_query_post_hdr( /*! * helper for HTTP-Query function */ -static int ki_http_request_helper( - sip_msg_t *_m, str *met, str *url, str *body, str *hdrs, - unsigned int httpver, pv_spec_t *dst) +static int ki_http_request_helper(sip_msg_t *_m, str *met, str *url, str *body, + str *hdrs, unsigned int httpver, pv_spec_t *dst) { int ret = 0; str result = {NULL, 0}; @@ -1199,8 +1198,8 @@ static int ki_http_query_request_v2pk( return -1; } - return ki_http_request_helper(_m, met, url, body, hdrs, - CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); + return ki_http_request_helper( + _m, met, url, body, hdrs, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE, dst); } /*!

1 0

git:master:61d04f44: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 61d04f441488af1b943c4d5f8c35befc9cdd0437 URL: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-22T07:31:22+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… Patch: https://github.com/kamailio/kamailio/commit/61d04f441488af1b943c4d5f8c35bef… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 43dddfef13e..0884d21c289 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -75,6 +75,7 @@ Hugh Waite 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 5. Pseudovariables @@ -134,6 +135,7 @@ Hugh Waite 1.26. http_client_query() usage 1.27. http_client_get() usage 1.28. http_client_request() usage + 1.29. http_client_request_v2pk() usage Chapter 1. Admin Guide @@ -178,6 +180,7 @@ Chapter 1. Admin Guide 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 5. Pseudovariables @@ -706,6 +709,7 @@ modparam("http_client", "netinterface", "eth0") 4.4. http_client_query(url, [post-data], [hdrs], result) 4.5. http_client_get(url, body, hdrs, respv) 4.6. http_client_request(met, url, body, hdrs, respv) + 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -894,6 +898,22 @@ switch ($rc) { } ... +4.7. http_client_request_v2pk(met, url, body, hdrs, respv) + + Similar to http_client_request(), but using HTTP/2 prior-knowledge that + the server does not need HTTP/1.1-Upgrade (direct HTTP/2 by seting + libcurl option CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE). + + Example 1.29. http_client_request_v2pk() usage +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa +ram})&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Pseudovariables 5.1. $curlerror(error)

1 0

git:master:584b51fd: http_client: documentation section for http_client_request_v2pk(...)
by Elena-Ramona Modroiu 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 584b51fd00c87539eba44e86121fc0df2c465a27 URL: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-22T07:16:53+01:00 http_client: documentation section for http_client_request_v2pk(...) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… Patch: https://github.com/kamailio/kamailio/commit/584b51fd00c87539eba44e86121fc0d… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index dd647fcb9a1..2fb918d5997 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -984,6 +984,28 @@ http_client_request("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param}) switch ($rc) { ... } +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_request_v2pk"> + <title> + <function moreinfo="none">http_client_request_v2pk(met, url, body, hdrs, respv)</function> + </title> + <para> + Similar to http_client_request(), but using HTTP/2 prior-knowledge + that the server does not need HTTP/1.1-Upgrade (direct HTTP/2 by + seting libcurl option CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE). + </para> + <example> + <title><function>http_client_request_v2pk()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} ... </programlisting> </example>

1 0

git:master:09ad47cd: http_client: new function http_client_request_v2pk(...)
by Elena-Ramona Modroiu 22 Mar '24

22 Mar '24

Module: kamailio Branch: master Commit: 09ad47cd64e698a9bad55d2d697e88166ff948cf URL: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: 2024-03-22T07:03:31+01:00 http_client: new function http_client_request_v2pk(...) - do HTTP/2 request with prior-knowledge --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881… Patch: https://github.com/kamailio/kamailio/commit/09ad47cd64e698a9bad55d2d697e881…

1 0

git:master:93503fdc: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 93503fdc337dc76a9a0d8222e1d03d77489ea834 URL: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T16:46:12+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… Patch: https://github.com/kamailio/kamailio/commit/93503fdc337dc76a9a0d8222e1d03d7… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 83ce7e9f4b0..472d6dd93e4 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -276,7 +276,7 @@ Joey Golan 1.87. set_rtpengine_set usage 1.88. rtpengine_offer usage 1.89. rtpengine_offer usage to force transcoding from opus to PCMU - 1.90. rtpengine_offer usage + 1.90. rtpengine_offer usage of via-branch parameter 1.91. rtpengine_answer usage 1.92. rtpengine_info usage 1.93. rtpengine_delete usage @@ -2540,14 +2540,14 @@ onreply_route[1] } ... - Example 1.90. rtpengine_offer usage + Example 1.90. rtpengine_offer usage of via-branch parameter route { ... if (is_method("INVITE")) { if (has_body("application/sdp")) { - if (rtpengine_offer("replace-origin replace-session-connection via-b -ranch=auto-next strict-source label=callee OSRTP-accept transport-protocol=RTP/A -VP address-family=IP4", "auto-next")) + if (rtpengine_offer("replace-origin replace-session-connection stric +t-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4 +", "auto-next")) t_on_reply("1"); } }

1 0

git:master:779654d3: rtpengine: fix doc typos
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 779654d3654586dc1b2ac64b9ea6e7ce1dae75c8 URL: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:40:39-04:00 rtpengine: fix doc typos Fix doc typos in `rtpengine_offer()` usage examples. --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… Patch: https://github.com/kamailio/kamailio/commit/779654d3654586dc1b2ac64b9ea6e7c… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index b6145b3b6e2..6d79abfaeff 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2885,13 +2885,13 @@ onreply_route[1] <example> - <title><function>rtpengine_offer</function> usage</title> + <title><function>rtpengine_offer</function> usage of via-branch parameter</title> <programlisting format="linespecific"> route { ... if (is_method("INVITE")) { if (has_body("application/sdp")) { - if (rtpengine_offer("replace-origin replace-session-connection via-branch=auto-next strict-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4", "auto-next")) + if (rtpengine_offer("replace-origin replace-session-connection strict-source label=callee OSRTP-accept transport-protocol=RTP/AVP address-family=IP4", "auto-next")) t_on_reply("1"); } }

1 0

git:master:5b0e9e8c: rtpengine: format files in clang format
by Richard Fuchs 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 5b0e9e8cb818e1de0c88f9b505a5813147629499 URL: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-03-21T11:40:39-04:00 rtpengine: format files in clang format Formatting in clang for files not complying with it. --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813… Patch: https://github.com/kamailio/kamailio/commit/5b0e9e8cb818e1de0c88f9b505a5813…

1 0

git:master:7d95e672: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

Module: kamailio Branch: master Commit: 7d95e67213f05c9ede6f0339246ae7e2fe93dea5 URL: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-03-21T16:16:24+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e… Patch: https://github.com/kamailio/kamailio/commit/7d95e67213f05c9ede6f0339246ae7e…

1 0

[kamailio/kamailio] rtpengine: add flags processing on the daemon side (PR #3788)
by Donat Zenichev 21 Mar '24

21 Mar '24

#### 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>

3 6

git:master:c6fff3a5: rtpengine: update documentation in regards of flags processing
by Richard Fuchs 21 Mar '24

21 Mar '24

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…

1 0

git:master:5cd02f56: rtpengine: add flags processing on the daemon side
by Richard Fuchs 21 Mar '24

21 Mar '24

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…

1 0

[kamailio/kamailio] TLS crash in Kamailio 5.6.3 (5.7.4) on Debian 12 (Issue #3791)
by Evgeniy G 21 Mar '24

21 Mar '24

**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>

3 4

git:master:b59812ff: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 21 Mar '24

21 Mar '24

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.

1 0

git:master:01ec19f7: secsipid: note that get url function is doing caching
by Daniel-Constantin Mierla 21 Mar '24

21 Mar '24

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

1 0

[kamailio/kamailio] xhttp: fix execution of async functions (PR #3723)
by Vadim Saranov 21 Mar '24

21 Mar '24

#### 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>

3 5

git:master:eca79b06: modules: readme files regenerated - pvtpl ... [skip ci]
by Kamailio Dev 20 Mar '24

20 Mar '24

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) +} ...

1 0

git:master:d3900987: pvtpl: docs - section for template file
by Daniel-Constantin Mierla 20 Mar '24

20 Mar '24

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>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev