sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:0cc64de7: registrar: allow unregister() to be used in any route
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 0cc64de7530fe90cbe3183caa494d9ef9941ee51 URL: https://github.com/kamailio/kamailio/commit/0cc64de7530fe90cbe3183caa494d9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T10:01:35+02:00 registrar: allow unregister() to be used in any route --- Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/0cc64de7530fe90cbe3183caa494d9e… Patch: https://github.com/kamailio/kamailio/commit/0cc64de7530fe90cbe3183caa494d9e… --- diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 83730e9a19..ec374571e9 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -192,9 +192,9 @@ static cmd_export_t cmds[] = { {"add_sock_hdr", (cmd_function)w_add_sock_hdr, 1, fixup_spve_null, 0, REQUEST_ROUTE }, {"unregister", (cmd_function)w_unregister, 2, unreg_fixup, 0, - REQUEST_ROUTE| FAILURE_ROUTE }, + ANY_ROUTE }, {"unregister", (cmd_function)w_unregister2, 3, unreg_fixup, 0, - REQUEST_ROUTE| FAILURE_ROUTE }, + ANY_ROUTE }, {"reg_fetch_contacts", (cmd_function)pv_fetch_contacts, 3, fetchc_fixup, 0, REQUEST_ROUTE| FAILURE_ROUTE },

1 0

git:master:8b8b5780: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 8b8b5780c968079fd57d7b236ebfbfe3c9c76607 URL: https://github.com/kamailio/kamailio/commit/8b8b5780c968079fd57d7b236ebfbfe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-13T09:32:20+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/8b8b5780c968079fd57d7b236ebfbfe… Patch: https://github.com/kamailio/kamailio/commit/8b8b5780c968079fd57d7b236ebfbfe…

1 0

git:master:f9f113d9: http_client: docs for query_maxdatasize parameter
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: f9f113d9b07ea351c75f3d7fed5478074d5575c4 URL: https://github.com/kamailio/kamailio/commit/f9f113d9b07ea351c75f3d7fed54780… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:25:15+02:00 http_client: docs for query_maxdatasize parameter --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f9f113d9b07ea351c75f3d7fed54780… Patch: https://github.com/kamailio/kamailio/commit/f9f113d9b07ea351c75f3d7fed54780… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 55c65ccc97..1079bfe17a 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -458,6 +458,24 @@ modparam("http_client", "keep_connections", 1) <programlisting format="linespecific"> ... modparam("http_client", "query_result", 0) +... + </programlisting> + </example> + </section> + <section id="http_client.p.query_maxdatasize"> + <title><varname>query_maxdatasize</varname> (int)</title> + <para> + Control the size in bytes of the data to be returned by the + http_client_query(...) in the result variable. + </para> + <para> + Default value: 0 (disabled, unlimited size). + </para> + <example> + <title>Set <varname>query_maxdatasize</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "query_maxdatasize", 2048) ... </programlisting> </example>

1 0

git:master:ea4b25c6: http_client: new param query_maxdatasize
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: ea4b25c67c0e4ea072ce1bbc11ae21bc7c9484a3 URL: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:20:08+02:00 http_client: new param query_maxdatasize - set the maximum size to be downloaded for http_client_query() result - default: 0 - disabled (unlimited size) --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… Patch: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 05dc827126..bfa42ac527 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -653,7 +653,7 @@ int http_client_query( query_params.timeout = default_connection_timeout; query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = default_query_result; - query_params.maxdatasize = 0; + query_params.maxdatasize = default_query_maxdatasize; if(default_useragent.s != NULL && default_useragent.len > 0) { query_params.useragent = default_useragent.s; } diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index fc20b65525..bdc2253b3d 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -104,6 +104,8 @@ unsigned int default_authmethod = * - 0: return full result * - 1: return first line only */ unsigned int default_query_result = 1; +/*!< Default download size for result of query function. 0=disabled (no limit) */ +unsigned int default_query_maxdatasize = 0; str http_client_config_file = STR_NULL; @@ -201,6 +203,7 @@ static param_export_t params[] = { {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, {"query_result", PARAM_INT, &default_query_result }, + {"query_maxdatasize", PARAM_INT, &default_query_maxdatasize }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 7f236dfa7e..a3620bd233 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -63,6 +63,7 @@ extern unsigned int extern unsigned int default_keep_connections; /*!< Keep http connections open for reuse */ extern unsigned int default_query_result; /*!< Default query result mode */ +extern unsigned int default_query_maxdatasize; /*!< Default query result maximum download size */ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */

1 0

git:master:d93b1861: http_client: docs for query_result parameter
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: d93b1861c6e9be5991040d2da327d2f543d9f9ab URL: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:15:43+02:00 http_client: docs for query_result parameter --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… Patch: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 70bcd2a433..55c65ccc97 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -36,10 +36,10 @@ <para> Like in SIP, the HTTP URL may need encoding to be transported safely over the network. Check the string encoding functions in the Transformation - Cookbook (as used in the http_client_query example below). + Cookbook (as used in the http_client_query() example below). </para> <para> - The function http_client_query allows &kamailio; to issue an HTTP GET + The function http_client_query() allows &kamailio; to issue an HTTP GET request and get access to parts of the reply. This function has been ported from the utils module and now use the same libcurl functions. We recommend using the new functionality provided by @@ -433,6 +433,31 @@ modparam("http_client", "authmethod", 3) <programlisting format="linespecific"> ... modparam("http_client", "keep_connections", 1) +... + </programlisting> + </example> + </section> + <section id="http_client.p.query_result"> + <title><varname>query_result</varname> (int)</title> + <para> + Control what is returned by the http_client_query(...) in the result + variable. + </para> + <para> + Valid values are: + <itemizedlist> + <listitem><para>0 - Return the entire HTTP result body</para></listitem> + <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + </itemizedlist> + </para> + <para> + Default value: 1 (return first line). + </para> + <example> + <title>Set <varname>query_result</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "query_result", 0) ... </programlisting> </example> @@ -796,17 +821,18 @@ http_get_redirect("apiserver", "$var(targeturl)"); </para> <para> If HTTP server returns a class 2xx, 3xx or 4xx reply, - the first line of the reply's body (if any) is + the first line or the entire reply body (if any) is stored in <quote>result</quote> parameter, - which must be a writable pseudo variable. + which must be a writable pseudo variable. See the query_result + parameter for controling what value to be stored in the result + variable. </para> <para> Function returns reply code of HTTP reply or -1 if something went wrong. </para> <para> - This function can be used from REQUEST_ROUTE, - ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <para> Note that this function is based on the http_query function in the utils module.

1 0

git:master:d07b522b: http_client: new param query_result
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: d07b522b927f26b01a24417e0fb9f64c87fb79fb URL: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:07:34+02:00 http_client: new param query_result - control if the http_client_query() returns only the first line or the entire result - 0: return the entire result - 1: return the first line (default, backward compatible) --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… Patch: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 695324bf43..05dc827126 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -652,7 +652,7 @@ int http_client_query( query_params.verify_host = default_tls_verify_host; query_params.timeout = default_connection_timeout; query_params.http_follow_redirect = default_http_follow_redirect; - query_params.oneline = 1; + query_params.oneline = default_query_result; query_params.maxdatasize = 0; if(default_useragent.s != NULL && default_useragent.len > 0) { query_params.useragent = default_useragent.s; diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 432d71a6c8..fc20b65525 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -100,6 +100,11 @@ unsigned int default_authmethod = CURLAUTH_BASIC | CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */ +/*!< Default http query result mode + * - 0: return full result + * - 1: return first line only */ +unsigned int default_query_result = 1; + str http_client_config_file = STR_NULL; static curl_version_info_data *curl_info; @@ -195,6 +200,7 @@ static param_export_t params[] = { {"httpcon", PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param}, {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, + {"query_result", PARAM_INT, &default_query_result }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index d7bb7658f9..7f236dfa7e 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -62,6 +62,7 @@ extern unsigned int default_authmethod; /*!< authentication method - Basic, Digest or both */ extern unsigned int default_keep_connections; /*!< Keep http connections open for reuse */ +extern unsigned int default_query_result; /*!< Default query result mode */ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */

1 0

git:master:b3d9da5c: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: b3d9da5c5e80e42e550c4cf56c29aee1ab068c92 URL: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-12T21:01:45+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee… Patch: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index d75a9de697..d430714543 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -197,7 +197,11 @@ modparam("topos", "branch_expire", 300) 3.6. dialog_expire (int) - Interval in seconds after which the dialog records are deleted. + Interval in seconds after which the dialog records are deleted. Keep in + mind that the module does not update the dialog timestamp after the + initial call setup on re-INVITEs or other in-dialog messages. So set a + large enough value (according your longest call duration) to prevent + problems in re-writing messages. Default value is 10800 (3 hours).

1 0

git:5.2:db0ae1e3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: db0ae1e3dde3331810ba8b154d7e111bf3322583 URL: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-12T21:01:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111… Patch: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index d75a9de697..d430714543 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -197,7 +197,11 @@ modparam("topos", "branch_expire", 300) 3.6. dialog_expire (int) - Interval in seconds after which the dialog records are deleted. + Interval in seconds after which the dialog records are deleted. Keep in + mind that the module does not update the dialog timestamp after the + initial call setup on re-INVITEs or other in-dialog messages. So set a + large enough value (according your longest call duration) to prevent + problems in re-writing messages. Default value is 10800 (3 hours).

1 0

git:5.2:6e5cb772: topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: 6e5cb772817a8275c89869c868ce20a2ddb47df9 URL: https://github.com/kamailio/kamailio/commit/6e5cb772817a8275c89869c868ce20a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-12T20:55:26+02:00 topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024) (cherry picked from commit 3ccf5ee691440e806d441f0e58562ddc4137a488) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e5cb772817a8275c89869c868ce20a… Patch: https://github.com/kamailio/kamailio/commit/6e5cb772817a8275c89869c868ce20a… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b81672b006..681c5bb9a1 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -192,6 +192,10 @@ modparam("topos", "branch_expire", 300) <title><varname>dialog_expire</varname> (int)</title> <para> Interval in seconds after which the dialog records are deleted. + Keep in mind that the module does not update the dialog timestamp + after the initial call setup on re-INVITEs or other in-dialog + messages. So set a large enough value (according your longest call + duration) to prevent problems in re-writing messages. </para> <para> <emphasis>

1 0

git:master:3ccf5ee6: topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 3ccf5ee691440e806d441f0e58562ddc4137a488 URL: https://github.com/kamailio/kamailio/commit/3ccf5ee691440e806d441f0e58562dd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-12T20:54:48+02:00 topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3ccf5ee691440e806d441f0e58562dd… Patch: https://github.com/kamailio/kamailio/commit/3ccf5ee691440e806d441f0e58562dd… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b81672b006..681c5bb9a1 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -192,6 +192,10 @@ modparam("topos", "branch_expire", 300) <title><varname>dialog_expire</varname> (int)</title> <para> Interval in seconds after which the dialog records are deleted. + Keep in mind that the module does not update the dialog timestamp + after the initial call setup on re-INVITEs or other in-dialog + messages. So set a large enough value (according your longest call + duration) to prevent problems in re-writing messages. </para> <para> <emphasis>

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019