sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

git:4.3:76b5d394: pkg/kamailio/deb: update version to 4.3.3

by Victor Seva

Module: kamailio Branch: 4.3 Commit: 76b5d394ddec84c6a80dcfd67df2e2ec036f37da URL: https://github.com/kamailio/kamailio/commit/76b5d394ddec84c6a80dcfd67df2e2e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-10-02T13:26:39+02:00 pkg/kamailio/deb: update version to 4.3.3 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/76b5d394ddec84c6a80dcfd67df2e2e… Patch: https://github.com/kamailio/kamailio/commit/76b5d394ddec84c6a80dcfd67df2e2e… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index b858306..cf814c5 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.3) unstable; urgency=medium + + * update version to 4.3.3 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 13:25:18 +0200 + kamailio (4.3.2) unstable; urgency=medium * update version to 4.3.2 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index b858306..cf814c5 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.3) unstable; urgency=medium + + * update version to 4.3.3 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 13:25:18 +0200 + kamailio (4.3.2) unstable; urgency=medium * update version to 4.3.2 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index b858306..cf814c5 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.3) unstable; urgency=medium + + * update version to 4.3.3 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 13:25:18 +0200 + kamailio (4.3.2) unstable; urgency=medium * update version to 4.3.2 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index b858306..cf814c5 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.3) unstable; urgency=medium + + * update version to 4.3.3 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 13:25:18 +0200 + kamailio (4.3.2) unstable; urgency=medium * update version to 4.3.2 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index b858306..cf814c5 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.3) unstable; urgency=medium + + * update version to 4.3.3 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 13:25:18 +0200 + kamailio (4.3.2) unstable; urgency=medium * update version to 4.3.2 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index b858306..cf814c5 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.3.3) unstable; urgency=medium + + * update version to 4.3.3 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 13:25:18 +0200 + kamailio (4.3.2) unstable; urgency=medium * update version to 4.3.2

9 years, 2 months

git:master:5f5ac84b: Merge branch 'master' of https://github.com/kamailio/kamailio

by Olle E. Johansson

Module: kamailio Branch: master Commit: 5f5ac84b9fac40bf75afd1baafc587410e9e3128 URL: https://github.com/kamailio/kamailio/commit/5f5ac84b9fac40bf75afd1baafc5874… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-02T13:34:40+03:00 Merge branch 'master' of https://github.com/kamailio/kamailio Sorry... * 'master' of https://github.com/kamailio/kamailio: dialog: avoid useless re-entrant locking when linking the new dialog --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5f5ac84b9fac40bf75afd1baafc5874… Patch: https://github.com/kamailio/kamailio/commit/5f5ac84b9fac40bf75afd1baafc5874… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 123330b..ef7a336 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -847,7 +847,7 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) dlg->vars = get_local_varlist_pointer(req, 1); /* after dlg_search() slot was kept locked */ - link_dlg(dlg, 0, 0); + link_dlg(dlg, 0, 1); /* unlock after dlg_search() */ dlg_hash_release(&callid);

9 years, 2 months

git:master:2471d1db: jansson Add explaination of error handling.

by Olle E. Johansson

Module: kamailio Branch: master Commit: 2471d1db579089f9e46feabe59830c53ac862e72 URL: https://github.com/kamailio/kamailio/commit/2471d1db579089f9e46feabe59830c5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-02T13:33:46+03:00 jansson Add explaination of error handling. The pvar remains unchanged if the key/path is not found. Any previous value remains, and it's not reset to a default value or NULL. --- Modified: modules/jansson/README Modified: modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2471d1db579089f9e46feabe59830c5… Patch: https://github.com/kamailio/kamailio/commit/2471d1db579089f9e46feabe59830c5… --- diff --git a/modules/jansson/README b/modules/jansson/README index c5be0a6..87d28a8 100644 --- a/modules/jansson/README +++ b/modules/jansson/README @@ -111,7 +111,9 @@ Chapter 1. Admin Guide foo.bar[0][1].baz). The function can put a string, integer, null, or new json string into - destination. + destination. If the key/path can't be found in the JSON data structure, + the pvar is not changed. If it had a previous value, that value remains + unchanged. Example 1.1. jansson_get usage ... diff --git a/modules/jansson/doc/jansson_admin.xml b/modules/jansson/doc/jansson_admin.xml index b1b0eab..baab686 100644 --- a/modules/jansson/doc/jansson_admin.xml +++ b/modules/jansson/doc/jansson_admin.xml @@ -67,13 +67,15 @@ <function moreinfo="none">jansson_get(key/path, src, dst)</function> </title> <para> - Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. </para> <para> The path string supports dot delimited notation (e.g. foo.bar.baz), array notation (e.g. [0]), or a combination of the two (e.g. foo.bar[0][1].baz). </para> <para> The function can put a string, integer, null, or new json string into destination. + If the key/path can't be found in the JSON data structure, the pvar is not changed. If it had a previous + value, that value remains unchanged. </para> <example> <title><function>jansson_get</function> usage</title>

9 years, 2 months

git:4.3:bf0efda9: dialog: avoid useless re-entrant locking when linking the new dialog

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: bf0efda9cbd3ab02e1cdefb187ae2ac3089e1b18 URL: https://github.com/kamailio/kamailio/commit/bf0efda9cbd3ab02e1cdefb187ae2ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T11:00:53+02:00 dialog: avoid useless re-entrant locking when linking the new dialog (cherry picked from commit 02fa3bf1b62cb10a33a8b216cfe7baa9e1b84054) --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/bf0efda9cbd3ab02e1cdefb187ae2ac… Patch: https://github.com/kamailio/kamailio/commit/bf0efda9cbd3ab02e1cdefb187ae2ac… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index b93dfaa..75dc86f 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -847,7 +847,7 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) dlg->vars = get_local_varlist_pointer(req, 1); /* after dlg_search() slot was kept locked */ - link_dlg(dlg, 0, 0); + link_dlg(dlg, 0, 1); /* unlock after dlg_search() */ dlg_hash_release(&callid);

9 years, 2 months

git:master:02fa3bf1: dialog: avoid useless re-entrant locking when linking the new dialog

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 02fa3bf1b62cb10a33a8b216cfe7baa9e1b84054 URL: https://github.com/kamailio/kamailio/commit/02fa3bf1b62cb10a33a8b216cfe7baa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T11:00:15+02:00 dialog: avoid useless re-entrant locking when linking the new dialog --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/02fa3bf1b62cb10a33a8b216cfe7baa… Patch: https://github.com/kamailio/kamailio/commit/02fa3bf1b62cb10a33a8b216cfe7baa… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 123330b..ef7a336 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -847,7 +847,7 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) dlg->vars = get_local_varlist_pointer(req, 1); /* after dlg_search() slot was kept locked */ - link_dlg(dlg, 0, 0); + link_dlg(dlg, 0, 1); /* unlock after dlg_search() */ dlg_hash_release(&callid);

9 years, 2 months

git:master:09c5e606: tcpops Add tcp_conid_state function to check connection state

by Olle E. Johansson

Module: kamailio Branch: master Commit: 09c5e6069aaeed472d1d4e4088d14551d90f90a9 URL: https://github.com/kamailio/kamailio/commit/09c5e6069aaeed472d1d4e4088d1455… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-01T22:07:07+03:00 tcpops Add tcp_conid_state function to check connection state --- Modified: modules/tcpops/README Modified: modules/tcpops/doc/functions.xml Modified: modules/tcpops/doc/tcpops.xml Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/09c5e6069aaeed472d1d4e4088d1455… Patch: https://github.com/kamailio/kamailio/commit/09c5e6069aaeed472d1d4e4088d1455…

9 years, 2 months

git:master:369f79b8: curl Fix documentation, remove local character

by Olle E. Johansson

Module: kamailio Branch: master Commit: 369f79b8a1f24dacb52634fc13530fd42c921898 URL: https://github.com/kamailio/kamailio/commit/369f79b8a1f24dacb52634fc13530fd… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-02T08:23:26+03:00 curl Fix documentation, remove local character --- Modified: modules/curl/README Modified: modules/curl/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/369f79b8a1f24dacb52634fc13530fd… Patch: https://github.com/kamailio/kamailio/commit/369f79b8a1f24dacb52634fc13530fd… --- diff --git a/modules/curl/README b/modules/curl/README index 1ce4575..b75df17 100644 --- a/modules/curl/README +++ b/modules/curl/README @@ -119,6 +119,9 @@ Chapter 1. Admin Guide 1. Overview + Note: This module is still in development. Not all options documented + here work yet. + This module implements protocol functions that use the libcurl library to fetch data from external HTTP servers or post data to HTTP servers. The module is using a concept of "connections" to define properties of @@ -303,12 +306,13 @@ content_type, data, result) Example 1.9. curl_connect() usage ... -modparam("curl", "curlcon", "anders=>http://kamailio.org/api/"); +modparam("curl", "curlcon", "apiserver=>http://kamailio.org/api/"); ... # POST Request -$var(res) = curl_connect("apiserver", "/postlåda", "application/json", "{ ok, { -200, ok}}", "$avp(gurka)"); -xlog("L_INFO", "API-server Curl connection: $avp(gurka) Result $var(res)\n"); +$var(res) = curl_connect("apiserver", "/mailbox", "application/json", "{ ok, {20 +0, ok}}", "$avp(gurka)"); +xlog("L_INFO", "API-server Curl connection: $avp(gurka) Result code $var(res)\n" +); ... 4.2. curl_http_query(url, [post-data], result) diff --git a/modules/curl/doc/curl_admin.xml b/modules/curl/doc/curl_admin.xml index 3bd7c31..1639b86 100644 --- a/modules/curl/doc/curl_admin.xml +++ b/modules/curl/doc/curl_admin.xml @@ -16,6 +16,10 @@ <section> <title>Overview</title> <para> + Note: This module is still in development. Not all options documented + here work yet. + </para> + <para> This module implements protocol functions that use the libcurl library to fetch data from external HTTP servers or post data to HTTP servers. The module is using a concept of "connections" to define properties @@ -286,11 +290,11 @@ modparam("curl", "curlcon", "apifour=>http://stockholm.example.com/api/getstuff; <title><function>curl_connect()</function> usage</title> <programlisting format="linespecific"> ... -modparam("curl", "curlcon", "anders=>http://kamailio.org/api/"); +modparam("curl", "curlcon", "apiserver=>http://kamailio.org/api/"); ... # POST Request -$var(res) = curl_connect("apiserver", "/postlåda", "application/json", "{ ok, {200, ok}}", "$avp(gurka)"); -xlog("L_INFO", "API-server Curl connection: $avp(gurka) Result $var(res)\n"); +$var(res) = curl_connect("apiserver", "/mailbox", "application/json", "{ ok, {200, ok}}", "$avp(gurka)"); +xlog("L_INFO", "API-server Curl connection: $avp(gurka) Result code $var(res)\n"); ... </programlisting> </example>

9 years, 2 months

git:master:889a82f8: tcpops: release tcp connection id in w_tcp_conid_state()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 889a82f8b61620c224cc9eca4bd5b41369aa6fae URL: https://github.com/kamailio/kamailio/commit/889a82f8b61620c224cc9eca4bd5b41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T21:59:12+02:00 tcpops: release tcp connection id in w_tcp_conid_state() - tcpconn_get() increases reference number, tcpconn_put() is required, otherwise the associated structure won't be destroyed after close - debug message for unexpected connection state reworked --- Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/889a82f8b61620c224cc9eca4bd5b41… Patch: https://github.com/kamailio/kamailio/commit/889a82f8b61620c224cc9eca4bd5b41… --- diff --git a/modules/tcpops/tcpops_mod.c b/modules/tcpops/tcpops_mod.c index c1c75e0..8241760 100644 --- a/modules/tcpops/tcpops_mod.c +++ b/modules/tcpops/tcpops_mod.c @@ -231,32 +231,43 @@ static int w_tcp_conid_state(sip_msg_t* msg, char* conid, char *p2) if (unlikely((s_con = tcpconn_get(i_conid, 0, 0, 0, 0)) == NULL)) { LM_DBG("Connection id %d does not exist.\n", i_conid); - return -1; + ret = -1; + goto done; } /* Connection structure exists, now check what Kamailio thinks of it */ if (s_con->state == S_CONN_OK) { /* All is fine, return happily */ - return 1; + ret = 1; + goto done; } if (s_con->state == S_CONN_EOF) { /* Socket closed or about to close under our feet */ - return -2; + ret = -2; + goto done; } if (s_con->state == S_CONN_ERROR) { /* Error on read/write - will close soon */ - return -3; + ret = -3; + goto done; } if (s_con->state == S_CONN_BAD) { /* Unknown state */ - return -4; + ret = -4; + goto done; } if (s_con->state == S_CONN_ACCEPT) { /* Incoming connection to be set up */ - return 2; + ret = 2; + goto done; } if (s_con->state == S_CONN_CONNECT) { /* Outbound connection moving to S_CONN_OK */ - return 3; + ret = 3; + goto done; } /* Wonder what state we're in here */ - LM_DBG("Connection id %d is in state %d - go figure. I will treat is a good. If not, file a bug report please.\n", i_conid, s_con->flags); - - return 1; /* Good connection */ + LM_DBG("Connection id %d is in unexpected state %d - assuming ok.\n", i_conid, s_con->flags); + + /* Good connection */ + ret = 1; +done: + if(s_con) tcpconn_put(s_con); + return ret; } static int w_tcpops_set_connection_lifetime2(sip_msg_t* msg, char* conid, char* time)

9 years, 2 months

git:master:df3a2724: tcpops: fixed prototype declaration for w_tcp_conid_state()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: df3a27240aa6f7a2531f4c5d62bf23846079ecc1 URL: https://github.com/kamailio/kamailio/commit/df3a27240aa6f7a2531f4c5d62bf238… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-01T21:53:47+02:00 tcpops: fixed prototype declaration for w_tcp_conid_state() --- Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/df3a27240aa6f7a2531f4c5d62bf238… Patch: https://github.com/kamailio/kamailio/commit/df3a27240aa6f7a2531f4c5d62bf238… --- diff --git a/modules/tcpops/tcpops_mod.c b/modules/tcpops/tcpops_mod.c index c088d1a..c1c75e0 100644 --- a/modules/tcpops/tcpops_mod.c +++ b/modules/tcpops/tcpops_mod.c @@ -49,7 +49,7 @@ static int w_tcp_keepalive_disable1(sip_msg_t* msg, char* con); static int w_tcp_keepalive_disable0(sip_msg_t* msg); static int w_tcpops_set_connection_lifetime2(sip_msg_t* msg, char* con, char* time); static int w_tcpops_set_connection_lifetime1(sip_msg_t* msg, char* time); -static int w_tcp_is_conid_alive(sip_msg_t* msg, char* con); +static int w_tcp_conid_state(sip_msg_t* msg, char* con, char* p2); static int fixup_numpv(void** param, int param_no); @@ -222,7 +222,7 @@ static int w_tcp_keepalive_disable0(sip_msg_t* msg) return tcpops_keepalive_disable(fd, 0); } -static int w_tcp_conid_state(sip_msg_t* msg, char* conid) +static int w_tcp_conid_state(sip_msg_t* msg, char* conid, char *p2) { struct tcp_connection *s_con; int ret = -1;

9 years, 2 months

Broken: kamailio/kamailio#1372 (master - 09c5e60)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #1372 Status: Broken Duration: 9 minutes and 7 seconds Commit: 09c5e60 (master) Author: Olle E. Johansson Message: tcpops Add tcp_conid_state function to check connection state View the changeset: https://github.com/kamailio/kamailio/compare/6620fe7b0963...09c5e6069aae View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/83177823 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015