sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

git:master:61e076f0: http_client: use core helpers for fixup of http request functions

by Daniel-Constantin Mierla

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

8 months, 1 week

git:master:19e91e09: core: fixup helpers for functions with strings and output variable params

by Daniel-Constantin Mierla

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

8 months, 1 week

git:master:ccd4481d: http_client: clang-format new code

by Daniel-Constantin Mierla

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); } /*!

8 months, 1 week

git:master:61d04f44: modules: readme files regenerated - http_client ... [skip ci]

by Kamailio Dev

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)

8 months, 1 week

git:master:584b51fd: http_client: documentation section for http_client_request_v2pk(...)

by Elena-Ramona Modroiu

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>

8 months, 1 week

git:master:09ad47cd: http_client: new function http_client_request_v2pk(...)

by Elena-Ramona Modroiu

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…

8 months, 1 week

git:master:93503fdc: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

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"); } }

8 months, 1 week

git:master:779654d3: rtpengine: fix doc typos

by Richard Fuchs

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"); } }

8 months, 1 week

git:master:5b0e9e8c: rtpengine: format files in clang format

by Richard Fuchs

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…

8 months, 1 week

git:master:7d95e672: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

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…

8 months, 1 week

← Newer
1
...
7
8
9
10
11
12
13
...
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