sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
303 discussions

git:master:8ff02413: http_async_client: $http_req returns $null when read
by Camille Oudot 16 Feb '16

16 Feb '16

Module: kamailio Branch: master Commit: 8ff02413451f43b42cf565056c28264a43eed5a9 URL: https://github.com/kamailio/kamailio/commit/8ff02413451f43b42cf565056c28264… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-16T10:39:08+01:00 http_async_client: $http_req returns $null when read --- Modified: modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8ff02413451f43b42cf565056c28264… Patch: https://github.com/kamailio/kamailio/commit/8ff02413451f43b42cf565056c28264… --- diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index 0bd51a4..20d953a 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -206,7 +206,7 @@ static pv_export_t pvs[] = { PVT_OTHER, ah_get_err, 0, 0, 0, 0, 0}, {STR_STATIC_INIT("http_req"), - PVT_OTHER, 0, ah_set_req, + PVT_OTHER, pv_get_null, ah_set_req, ah_parse_req_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

1 0

[kamailio] rr: add enable_double_rr_always option (#257)
by Andrey Utkin 15 Feb '16

15 Feb '16

This patch helps us to handle inadequatness of Linphone mobile apps (both iOS and Android flavours are affected) without reinventing a lot of logics to handle each transport (we use TCP, TLS, WS, WSS). E.g. if we have two TLS-based Linphone clients, even with enable_double_rr for gentle cross-forwarding we would get single RR header without transport= attribute, resulting in Linphone sending ACK and BYE via UDP. This new option, being enabled, results in two RR headers being always inserted, with transport attribute being always added. I believe this cannot harm the installation with enable_double_rr, just makes instructions more explicit. The Linphone's behaviour looks like a set of different bugs, but it would get us much more efforts to fix. I don't know if any other useragent needs such workaround. So I would perfectly understand if this commit wouldn't be accepted upstream. Also this commit currently lacks README doc rebuild, because I don't know how to do that. Only XML doc is updated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/257 -- Commit Summary -- * rr: add enable_double_rr_always option -- File Changes -- M modules/rr/doc/rr_admin.xml (24) M modules/rr/record.c (14) M modules/rr/rr_mod.c (2) M modules/rr/rr_mod.h (1) M tcp_read.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/257.patch https://github.com/kamailio/kamailio/pull/257.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/257

3 10

git:master:b344ba0b: http_async_client: update doc with $http_req(key)
by Camille Oudot 15 Feb '16

15 Feb '16

Module: kamailio Branch: master Commit: b344ba0b527c0c0dd12063f6f8a37f13bddb317b URL: https://github.com/kamailio/kamailio/commit/b344ba0b527c0c0dd12063f6f8a37f1… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T18:43:00+01:00 http_async_client: update doc with $http_req(key) --- Modified: modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b344ba0b527c0c0dd12063f6f8a37f1… Patch: https://github.com/kamailio/kamailio/commit/b344ba0b527c0c0dd12063f6f8a37f1… --- diff --git a/modules/http_async_client/doc/http_async_client_admin.xml b/modules/http_async_client/doc/http_async_client_admin.xml index 1a53d2d..45ac3b1 100644 --- a/modules/http_async_client/doc/http_async_client_admin.xml +++ b/modules/http_async_client/doc/http_async_client_admin.xml @@ -562,7 +562,33 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); <section> <title>Pseudo Variables</title> - <para>The following pseudo variables can only be used in the callback routes executed by http_async_query()</para> + <para>The <literal>$http_req(key)</literal> write-only variable can be used to set custom parameters before sending a HTTP query</para> + <para>setting this variable has the same effect than using the <literal>http_set_*()</literal>functions</para> + <para><literal>key</literal> can be one of:</para> + <itemizedlist> + <listitem><para><emphasis>all</emphasis>: if set to <literal>$null</literal>, resets all the parameters to their default value (the ones defined in modparam)</para></listitem> + <listitem><para><emphasis>hdr</emphasis>: sets/modifies/remove a HTTP header (see <emphasis>http_append_header()</emphasis>). N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> + <listitem><para><emphasis>method</emphasis>: sets the HTTP method (see <emphasis>http_set_method()</emphasis>)</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout (see <emphasis>http_set_timeout()</emphasis>)</para></listitem> + <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use (see <emphasis>http_set_tls_client_cert()</emphasis>)</para></listitem> + <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use (see <emphasis>http_set_tls_client_key()</emphasis>)</para></listitem> + <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate files to use (see <emphasis>http_set_tls_ca_path()</emphasis>)</para></listitem> + </itemizedlist> + <example> + <title><literal>$http_req(key)</literal> variable usage</title> + <programlisting format="linespecific"> +... +$http_req(all) = $null; # reset the parameters +$http_req(timeout) = 100; # 100 ms +$http_req(method) = "DELETE"; +$http_req(hdr) = "X-Sip-Call-Id: " + $ci; +$http_req(hdr) = "X-Foo: bar"; # add a 2nd header +# the following request will use the above parameters +http_query("https://example.com/test.php", "HTTP_REPLY"); +... + </programlisting> + </example> + <para>The following read-only pseudo variables can only be used in the callback routes executed by http_async_query()</para> <itemizedlist> <listitem><para> <emphasis>$http_ok</emphasis>: 1 if cURL executed the request successfully, 0 otherwise (check $ah_err for details) @@ -587,7 +613,6 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); </para></listitem> </itemizedlist> </section> - <section> <title>Statistics</title> <section>

1 0

git:master:7c98ac5f: http_async_client: update README
by Camille Oudot 15 Feb '16

15 Feb '16

Module: kamailio Branch: master Commit: 7c98ac5f939755e2eae859e670182b6446d80227 URL: https://github.com/kamailio/kamailio/commit/7c98ac5f939755e2eae859e670182b6… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T18:43:56+01:00 http_async_client: update README --- Modified: modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/7c98ac5f939755e2eae859e670182b6… Patch: https://github.com/kamailio/kamailio/commit/7c98ac5f939755e2eae859e670182b6…

1 0

git:master:43946417: http_async_client: minor indentation changes
by Camille Oudot 15 Feb '16

15 Feb '16

Module: kamailio Branch: master Commit: 43946417e3f0c2bbd07e5c4ec8ccd48b31c5ecf9 URL: https://github.com/kamailio/kamailio/commit/43946417e3f0c2bbd07e5c4ec8ccd48… Author: Giacomo Vacca <gv(a)rtcsoft.net> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T14:53:42+01:00 http_async_client: minor indentation changes --- Modified: modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/43946417e3f0c2bbd07e5c4ec8ccd48… Patch: https://github.com/kamailio/kamailio/commit/43946417e3f0c2bbd07e5c4ec8ccd48… --- diff --git a/modules/http_async_client/http_multi.c b/modules/http_async_client/http_multi.c index 20ce731..a5df0ab 100644 --- a/modules/http_async_client/http_multi.c +++ b/modules/http_async_client/http_multi.c @@ -455,7 +455,7 @@ int new_request(str *query, str *post, http_m_params_t *query_params, http_multi cell->url = (char*)shm_malloc(query->len + 1); if (cell->url==0) { LM_ERR("no more shm mem\n"); - goto error; + goto error; } strncpy(cell->url, query->s, query->len); cell->url[query->len] = '\0'; @@ -495,7 +495,7 @@ int new_request(str *query, str *post, http_m_params_t *query_params, http_multi cell->post_data = shm_malloc(post->len + 1); if (cell->post_data == NULL) { LM_ERR("cannot allocate pkg memory for post\n"); - goto error; + goto error; } strncpy(cell->post_data, post->s, post->len); cell->post_data[post->len] = '\0'; @@ -522,7 +522,7 @@ int new_request(str *query, str *post, http_m_params_t *query_params, http_multi rc = curl_multi_add_handle(g->multi, cell->easy); if (check_mcode(rc, cell->error) < 0) { LM_ERR("error adding curl handler: %s\n", cell->error); - goto error; + goto error; } /* note that the add_handle() will set a time-out to trigger very soon so * that the necessary socket_action() call will be called by this app */

1 0

git:master:012498f2: http_async_client: review doc with correct module name
by Camille Oudot 15 Feb '16

15 Feb '16

Module: kamailio Branch: master Commit: 012498f280279b66ab336f0a855c35af4fec9c14 URL: https://github.com/kamailio/kamailio/commit/012498f280279b66ab336f0a855c35a… Author: Giacomo Vacca <gv(a)rtcsoft.net> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T14:53:01+01:00 http_async_client: review doc with correct module name --- Modified: modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/012498f280279b66ab336f0a855c35a… Patch: https://github.com/kamailio/kamailio/commit/012498f280279b66ab336f0a855c35a…

1 0

git:master:da26a524: http_async_client: review tls-related param names and vars
by Camille Oudot 15 Feb '16

15 Feb '16

Module: kamailio Branch: master Commit: da26a524e8b318f69116494726d582fbc09bfd32 URL: https://github.com/kamailio/kamailio/commit/da26a524e8b318f69116494726d582f… Author: Giacomo Vacca <gv(a)rtcsoft.net> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T14:52:45+01:00 http_async_client: review tls-related param names and vars --- Modified: modules/http_async_client/async_http.c Modified: modules/http_async_client/async_http.h Modified: modules/http_async_client/doc/http_async_client_admin.xml Modified: modules/http_async_client/hm_hash.h Modified: modules/http_async_client/http_async_client_mod.c Modified: modules/http_async_client/http_multi.c Modified: modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/da26a524e8b318f69116494726d582f… Patch: https://github.com/kamailio/kamailio/commit/da26a524e8b318f69116494726d582f…

1 0

git:master:ba86ae06: http_async_client: refactor query string param setting
by Camille Oudot 15 Feb '16

15 Feb '16

Module: kamailio Branch: master Commit: ba86ae06a52c0535a3fb3d0eb30b8380300e185d URL: https://github.com/kamailio/kamailio/commit/ba86ae06a52c0535a3fb3d0eb30b838… Author: Giacomo Vacca <gv(a)rtcsoft.net> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T14:52:37+01:00 http_async_client: refactor query string param setting --- Modified: modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ba86ae06a52c0535a3fb3d0eb30b838… Patch: https://github.com/kamailio/kamailio/commit/ba86ae06a52c0535a3fb3d0eb30b838… --- diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index 7663af9..068ce3a 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -87,6 +87,7 @@ static int w_http_set_method(sip_msg_t* msg, char* method, char*); static int w_http_set_ssl_cert(sip_msg_t* msg, char* sc, char*); static int w_http_set_ssl_key(sip_msg_t* msg, char* sk, char*); static int w_http_set_ca_path(sip_msg_t* msg, char* cp, char*); +static int set_query_param(str* param, str input); static int fixup_http_async_get(void** param, int param_no); static int fixup_http_async_post(void** param, int param_no); @@ -593,20 +594,7 @@ static int w_http_set_ssl_cert(sip_msg_t* msg, char* sc, char*foo) return -1; } - if (ah_params.ssl_cert.s) { - shm_free(ah_params.ssl_cert.s); - ah_params.ssl_cert.s = NULL; - ah_params.ssl_cert.len = 0; - } - - if (_ssl_cert.s && _ssl_cert.len > 0) { - if (shm_str_dup(&ah_params.ssl_cert, &_ssl_cert) < 0) { - LM_ERR("Error allocating ah_params.ssl_cert\n"); - return -1; - } - } - - return 1; + return set_query_param(&ah_params.ssl_cert, _ssl_cert); } static int w_http_set_ssl_key(sip_msg_t* msg, char* sk, char*foo) @@ -618,20 +606,7 @@ static int w_http_set_ssl_key(sip_msg_t* msg, char* sk, char*foo) return -1; } - if (ah_params.ssl_key.s) { - shm_free(ah_params.ssl_key.s); - ah_params.ssl_key.s = NULL; - ah_params.ssl_key.len = 0; - } - - if (_ssl_key.s && _ssl_key.len > 0) { - if (shm_str_dup(&ah_params.ssl_key, &_ssl_key) < 0) { - LM_ERR("Error allocating ah_params.ssl_key\n"); - return -1; - } - } - - return 1; + return set_query_param(&ah_params.ssl_key, _ssl_key); } static int w_http_set_ca_path(sip_msg_t* msg, char* cp, char*foo) @@ -643,15 +618,23 @@ static int w_http_set_ca_path(sip_msg_t* msg, char* cp, char*foo) return -1; } - if (ah_params.ca_path.s) { - shm_free(ah_params.ca_path.s); - ah_params.ca_path.s = NULL; - ah_params.ca_path.len = 0; + return set_query_param(&ah_params.ca_path, _ca_path); +} + +/* + * Helper to copy input string parameter into a query parameter + */ +static int set_query_param(str* param, str input) +{ + if (param->s) { + shm_free(param->s); + param->s = NULL; + param->len = 0; } - if (_ca_path.s && _ca_path.len > 0) { - if (shm_str_dup(&ah_params.ca_path, &_ca_path) < 0) { - LM_ERR("Error allocating ah_params.ca_path\n"); + if (input.s && input.len > 0) { + if (shm_str_dup(param, &input) < 0) { + LM_ERR("Error allocating parameter\n"); return -1; } }

1 0

git:master:250ff7e7: http_async_client: Fix minor avp doc typo (http_err)
by Camille Oudot 15 Feb '16

15 Feb '16

Module: kamailio Branch: master Commit: 250ff7e7e1b6d96ac3a70b90703594c1befc30c2 URL: https://github.com/kamailio/kamailio/commit/250ff7e7e1b6d96ac3a70b90703594c… Author: Giacomo Vacca <gv(a)rtcsoft.net> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T14:52:19+01:00 http_async_client: Fix minor avp doc typo (http_err) --- Modified: modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/250ff7e7e1b6d96ac3a70b90703594c… Patch: https://github.com/kamailio/kamailio/commit/250ff7e7e1b6d96ac3a70b90703594c… --- diff --git a/modules/http_async_client/doc/http_async_client_admin.xml b/modules/http_async_client/doc/http_async_client_admin.xml index 0fc3854..6add2c5 100644 --- a/modules/http_async_client/doc/http_async_client_admin.xml +++ b/modules/http_async_client/doc/http_async_client_admin.xml @@ -340,7 +340,7 @@ route[HTTP_REPLY] { xlog("L_INFO", "route[HTTP_REPLY]: status $http_rs\n"); xlog("L_INFO", "route[HTTP_REPLY]: body $http_rb\n"); } else { - xlog("L_INFO", "route[HTTP_REPLY]: error $http_error)\n"); + xlog("L_INFO", "route[HTTP_REPLY]: error $http_err)\n"); } } ...

1 0

Proxy
by Emad Numan 15 Feb '16

15 Feb '16

Dear, We are looking for a Kamailio/asterisk/Open Ser programmer/engineer. We need to fill this vacant job in our company. If you like to join our team please send me an e-mail to numan(a)bmdcompany.com. Best regards, Emad

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016