sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

git:master:ca0cd715: http_async_client: new $http_req() PV

by Camille Oudot

Module: kamailio Branch: master Commit: ca0cd715209eb5b5b3d14230771bfb35f1fdbf37 URL: https://github.com/kamailio/kamailio/commit/ca0cd715209eb5b5b3d14230771bfb3… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-15T15:15:27+01:00 http_async_client: new $http_req() PV the $http_req() PV allows to set custom request parameters for the next asynchronous HTTP query --- Modified: modules/http_async_client/async_http.c Modified: modules/http_async_client/async_http.h Modified: modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ca0cd715209eb5b5b3d14230771bfb3… Patch: https://github.com/kamailio/kamailio/commit/ca0cd715209eb5b5b3d14230771bfb3…

8 years, 8 months

git:master:e8564838: mtree: coherent indentation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e85648385ae56ca3bac0d1b06400ececa28fd55a URL: https://github.com/kamailio/kamailio/commit/e85648385ae56ca3bac0d1b06400ece… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-17T08:43:52+01:00 mtree: coherent indentation --- Modified: modules/mtree/mtree.c Modified: modules/mtree/mtree.h Modified: modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e85648385ae56ca3bac0d1b06400ece… Patch: https://github.com/kamailio/kamailio/commit/e85648385ae56ca3bac0d1b06400ece…

8 years, 8 months

git:master:d5fe09b8: http_client: Updated copyright in README

by Hugh Waite

Module: kamailio Branch: master Commit: d5fe09b83a8a14d46b8d8354f354d7e47a1815ee URL: https://github.com/kamailio/kamailio/commit/d5fe09b83a8a14d46b8d8354f354d7e… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-02-16T17:45:18Z http_client: Updated copyright in README --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5fe09b83a8a14d46b8d8354f354d7e… Patch: https://github.com/kamailio/kamailio/commit/d5fe09b83a8a14d46b8d8354f354d7e… --- diff --git a/modules/http_client/README b/modules/http_client/README index 037dc47..e1c6d51 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -12,11 +12,17 @@ Carsten Bock ng-voice GmbH +Hugh Waite + + Xura Inc + Copyright © 2008-2009 Juha Heinanen Copyright © 2013 Carsten Bock, ng-voice GmbH Copyright © 2015 Olle E. Johansson, Edvina AB + + Copyright © 2016 Hugh Waite, Xura Inc __________________________________________________________________ Table of Contents diff --git a/modules/http_client/doc/http_client.xml b/modules/http_client/doc/http_client.xml index 5aed165..c870bb9 100644 --- a/modules/http_client/doc/http_client.xml +++ b/modules/http_client/doc/http_client.xml @@ -37,6 +37,14 @@ <email>carsten(a)ng-voice.com</email> </address> </author> + <author> + <firstname>Hugh</firstname> + <surname>Waite</surname> + <affiliation><orgname>Xura Inc</orgname></affiliation> + <address> + <email>hugh.waite(a)xura.com</email> + </address> + </author> </authorgroup> <copyright> <year>2008-2009</year> @@ -50,6 +58,10 @@ <year>2015</year> <holder>Olle E. Johansson, Edvina AB</holder> </copyright> + <copyright> + <year>2016</year> + <holder>Hugh Waite, Xura Inc</holder> + </copyright> </bookinfo> <toc></toc>

8 years, 8 months

git:master:17e7d757: pv: Fix crash when xavp has no attributes

by Hugh Waite

Module: kamailio Branch: master Commit: 17e7d757b04b6da5b5d4d2eb076ac746fcc0ee05 URL: https://github.com/kamailio/kamailio/commit/17e7d757b04b6da5b5d4d2eb076ac74… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-02-16T17:25:14Z pv: Fix crash when xavp has no attributes - Fixes the crash reported in #511 --- Modified: modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/17e7d757b04b6da5b5d4d2eb076ac74… Patch: https://github.com/kamailio/kamailio/commit/17e7d757b04b6da5b5d4d2eb076ac74… --- diff --git a/modules/pv/pv_xavp.c b/modules/pv/pv_xavp.c index 8c11426..67ffd45 100644 --- a/modules/pv/pv_xavp.c +++ b/modules/pv/pv_xavp.c @@ -111,6 +111,8 @@ int pv_get_xavp(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); if(xname->next==NULL) return pv_xavp_get_value(msg, param, res, avp); + if(avp->val.type != SR_XTYPE_XAVP) + return pv_get_null(msg, param, res); idx = 0; idxf = 0;

8 years, 8 months

git:4.3:a84d800c: pv: Fix crash when xavp has no attributes

by Hugh Waite

Module: kamailio Branch: 4.3 Commit: a84d800c491c7d05e7abec1f8fe169c6c52e8e62 URL: https://github.com/kamailio/kamailio/commit/a84d800c491c7d05e7abec1f8fe169c… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2016-02-16T17:25:41Z pv: Fix crash when xavp has no attributes - Fixes the crash reported in #511 (cherry picked from commit 19bb634ba043e74480c724fb7ed8a2dad43e8dda) --- Modified: modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/a84d800c491c7d05e7abec1f8fe169c… Patch: https://github.com/kamailio/kamailio/commit/a84d800c491c7d05e7abec1f8fe169c… --- diff --git a/modules/pv/pv_xavp.c b/modules/pv/pv_xavp.c index 53fd99a..3ef86fb 100644 --- a/modules/pv/pv_xavp.c +++ b/modules/pv/pv_xavp.c @@ -111,6 +111,8 @@ int pv_get_xavp(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); if(xname->next==NULL) return pv_xavp_get_value(msg, param, res, avp); + if(avp->val.type != SR_XTYPE_XAVP) + return pv_get_null(msg, param, res); idx = 0; idxf = 0;

8 years, 8 months

git:master:a176c7f1: modules/ims_registrar_pcscf: Check if we subscribe to reg_info before processing notify - fix crash

by Richard Good

Module: kamailio Branch: master Commit: a176c7f1e5686d0aed5c95830d62eb964358841a URL: https://github.com/kamailio/kamailio/commit/a176c7f1e5686d0aed5c95830d62eb9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-02-16T15:51:03+02:00 modules/ims_registrar_pcscf: Check if we subscribe to reg_info before processing notify - fix crash --- Modified: modules/ims_registrar_pcscf/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/a176c7f1e5686d0aed5c95830d62eb9… Patch: https://github.com/kamailio/kamailio/commit/a176c7f1e5686d0aed5c95830d62eb9… --- diff --git a/modules/ims_registrar_pcscf/notify.c b/modules/ims_registrar_pcscf/notify.c index f6010b4..c23e4b2 100644 --- a/modules/ims_registrar_pcscf/notify.c +++ b/modules/ims_registrar_pcscf/notify.c @@ -79,6 +79,8 @@ extern usrloc_api_t ul; extern time_t time_now; +extern int subscribe_to_reginfo; + int process_contact(udomain_t * _d, int expires, str contact_uri, int contact_state) { char bufport[5], *rest, *sep, *val, *port, *trans; pcontact_t* pcontact; @@ -476,6 +478,11 @@ int reginfo_handle_notify(struct sip_msg* msg, char* domain, char* s2) { LM_DBG("Handling notify\n"); str body; int result = 1; + + if(subscribe_to_reginfo != 1){ + LM_ERR("Received a NOTIFY for reg-info but I have not SUBSCRIBED for them. Ignoring"); + return -1; + } /* If not done yet, parse the whole message now: */ if (parse_headers(msg, HDR_EOH_F, 0) == -1) {

8 years, 8 months

Errored: kamailio/kamailio#1965 (master - 4e75738)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #1965 Status: Errored Duration: 10 minutes and 11 seconds Commit: 4e75738 (master) Author: Camille Oudot Message: http_async_query: update README View the changeset: https://github.com/kamailio/kamailio/compare/8ff02413451f...4e75738d22b0 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/109560910 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

8 years, 8 months

git:master:4e75738d: http_async_query: update README

by Camille Oudot

Module: kamailio Branch: master Commit: 4e75738d22b0ae444e64fbe6571f2b266139c738 URL: https://github.com/kamailio/kamailio/commit/4e75738d22b0ae444e64fbe6571f2b2… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-16T10:43:57+01:00 http_async_query: update README --- Modified: modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/4e75738d22b0ae444e64fbe6571f2b2… Patch: https://github.com/kamailio/kamailio/commit/4e75738d22b0ae444e64fbe6571f2b2… --- diff --git a/modules/http_async_client/README b/modules/http_async_client/README index 664c73a..fbaf8a6 100644 --- a/modules/http_async_client/README +++ b/modules/http_async_client/README @@ -412,7 +412,7 @@ t_reply("200", "Ok"); ... tls_verify_host("0"); # host verification is disabled for the next query -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... 4.4. tls_verify_peer(verify) @@ -428,7 +428,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... tls_verify_peer("0"); # server identity verification is disabled for the next query -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... 4.5. http_set_timeout(timeout) @@ -442,7 +442,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... http_set_timeout("200"); # the server must respond in maximum 200ms, otherwise the query will fail -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... 4.6. http_append_header(header) @@ -472,7 +472,8 @@ http_append_header("X-Sip-Call-Id: $ci"); http_append_header("Content-Type": application/json"); # the curl default 'application/x-www-form-urlencoded' Content-Type will be repl aced -http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY") +; ... 4.7. http_set_method(method) @@ -488,7 +489,8 @@ http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); ... http_set_method("PUT"); # the next query will be a HTTP PUT request -http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY") +; ... 4.8. http_set_tls_client_cert(path) @@ -501,7 +503,7 @@ http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); ... http_set_tls_client_cert("/etc/kamailio/ssl/cert.pem"); # Next query will use the client cert above -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... 4.9. http_set_tls_client_key(path) @@ -514,7 +516,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... http_set_tls_client_key("/etc/kamailio/ssl/cert.key"); # Next query will use the client cert key above -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... 4.10. http_set_tls_ca_path(path) @@ -527,7 +529,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... http_set_tls_client_key("/etc/kamailio/ssl/ca/"); # Next query will use the CA certs above -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... 5. Pseudo Variables @@ -561,7 +563,7 @@ $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"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... The following read-only pseudo variables can only be used in the

8 years, 8 months

git:master:1dd1b923: http_async_query: fix function name in doc

by Camille Oudot

Module: kamailio Branch: master Commit: 1dd1b92363c78d24b036be7916d5c58e893d99bf URL: https://github.com/kamailio/kamailio/commit/1dd1b92363c78d24b036be7916d5c58… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-16T10:43:38+01:00 http_async_query: fix function name in doc --- Modified: modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1dd1b92363c78d24b036be7916d5c58… Patch: https://github.com/kamailio/kamailio/commit/1dd1b92363c78d24b036be7916d5c58… --- 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 45ac3b1..3c3f46b 100644 --- a/modules/http_async_client/doc/http_async_client_admin.xml +++ b/modules/http_async_client/doc/http_async_client_admin.xml @@ -389,7 +389,7 @@ t_reply("200", "Ok"); ... tls_verify_host("0"); # host verification is disabled for the next query -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... </programlisting> </example> @@ -411,7 +411,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... tls_verify_peer("0"); # server identity verification is disabled for the next query -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... </programlisting> </example> @@ -433,7 +433,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... http_set_timeout("200"); # the server must respond in maximum 200ms, otherwise the query will fail -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... </programlisting> </example> @@ -464,7 +464,7 @@ http_append_header("X-Sip-Call-Id: $ci"); # a new 'X-Sip-Call-Id' header will be added to the next query http_append_header("Content-Type": application/json"); # the curl default 'application/x-www-form-urlencoded' Content-Type will be replaced -http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); ... </programlisting> </example> @@ -486,7 +486,7 @@ http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); ... http_set_method("PUT"); # the next query will be a HTTP PUT request -http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); ... </programlisting> </example> @@ -508,7 +508,7 @@ http_query("https://example.com/test.php", "{'foo': 'bar'}", "HTTP_REPLY"); ... http_set_tls_client_cert("/etc/kamailio/ssl/cert.pem"); # Next query will use the client cert above -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... </programlisting> </example> @@ -530,7 +530,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... http_set_tls_client_key("/etc/kamailio/ssl/cert.key"); # Next query will use the client cert key above -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... </programlisting> </example> @@ -552,7 +552,7 @@ http_query("https://example.com/test.php", "HTTP_REPLY"); ... http_set_tls_client_key("/etc/kamailio/ssl/ca/"); # Next query will use the CA certs above -http_query("https://example.com/test.php", "HTTP_REPLY"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... </programlisting> </example> @@ -584,7 +584,7 @@ $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"); +http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... </programlisting> </example>

8 years, 8 months

git:master:8ff02413: http_async_client: $http_req returns $null when read

by Camille Oudot

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

8 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016