sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
303 discussions

[kamailio] srutils: change names colliding with libcrypto (#513)
by Camille Oudot 19 Feb '16

19 Feb '16

Kamailio's **srutils** SHA functions have names that collide with OpenSSL's **libcrypto** SHA functions. In practice, OpenSSL fails to validate a server cert if **srutils** is loaded before **libcrypto**, because their SHA functions are not 100% equivalent. On my Debian, **http_async_client** was unable to issue any HTTPS request unless server certificate verification was disabled. This patch solves the issue by renaming the SHA functions in **srutils** to non-colliding names. I think this has no side effect because they are only used internally. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/513 -- Commit Summary -- * srutils: change names colliding with libcrypto -- File Changes -- M lib/srutils/sha256.c (56) M lib/srutils/sha256.h (98) M lib/srutils/shautils.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/513.patch https://github.com/kamailio/kamailio/pull/513.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/513

3 4

git:master:546944d6: Merge pull request #513 from kamailio/co/crypto_name_collision
by Camille Oudot 19 Feb '16

19 Feb '16

Module: kamailio Branch: master Commit: 546944d6fb8acffec01a7ddae719d14bb88d8a20 URL: https://github.com/kamailio/kamailio/commit/546944d6fb8acffec01a7ddae719d14… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-19T10:17:45+01:00 Merge pull request #513 from kamailio/co/crypto_name_collision srutils: change names colliding with libcrypto --- Modified: lib/srutils/sha256.c Modified: lib/srutils/sha256.h Modified: lib/srutils/shautils.c --- Diff: https://github.com/kamailio/kamailio/commit/546944d6fb8acffec01a7ddae719d14… Patch: https://github.com/kamailio/kamailio/commit/546944d6fb8acffec01a7ddae719d14…

1 0

git:master:4b5da2d9: srutils: change names colliding with libcrypto
by Camille Oudot 19 Feb '16

19 Feb '16

Module: kamailio Branch: master Commit: 4b5da2d909ea3fcd531eecff2f3e02adad26fa27 URL: https://github.com/kamailio/kamailio/commit/4b5da2d909ea3fcd531eecff2f3e02a… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-18T11:09:24+01:00 srutils: change names colliding with libcrypto --- Modified: lib/srutils/sha256.c Modified: lib/srutils/sha256.h Modified: lib/srutils/shautils.c --- Diff: https://github.com/kamailio/kamailio/commit/4b5da2d909ea3fcd531eecff2f3e02a… Patch: https://github.com/kamailio/kamailio/commit/4b5da2d909ea3fcd531eecff2f3e02a…

1 0

git:master:3db2f281: kamailio.cfg: more coherent use of curly braces for blocks
by Daniel-Constantin Mierla 18 Feb '16

18 Feb '16

Module: kamailio Branch: master Commit: 3db2f281af67381b7cf81eb8d8d24719dc66296b URL: https://github.com/kamailio/kamailio/commit/3db2f281af67381b7cf81eb8d8d2471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-18T15:28:54+01:00 kamailio.cfg: more coherent use of curly braces for blocks - use them always when execution actions in if-else blocks that are not return-exit-drop - single line blocks with return-exit-drop made single line with the if statement --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3db2f281af67381b7cf81eb8d8d2471… Patch: https://github.com/kamailio/kamailio/commit/3db2f281af67381b7cf81eb8d8d2471…

1 0

[kamailio] Database timeout over SSL? (#406)
by Tobias Lindgren 18 Feb '16

18 Feb '16

Hi, having some rare issues writing acc-data to a remote MySQL server. The connection is made using the MySQL SSL options. Most, 99,9%, of the writes work well. The error is: ``` Nov 20 13:48:55 /usr/sbin/kamailio[28976]: WARNING: db_mysql [km_dbase.c:84]: db_mysql_submit_query(): driver error on ping: SSL connection error: socket layer receive error Nov 20 13:48:55 /usr/sbin/kamailio[28976]: ERROR: db_mysql [km_dbase.c:121]: db_mysql_submit_query(): driver error on query: SSL connection error: socket layer receive error Nov 20 13:48:55 /usr/sbin/kamailio[28976]: ERROR: <core> [db_query.c:235]: db_do_insert_cmd(): error while submitting query ``` Apart from the connection details (using [mysql-ssl-conf] for the SSL config block) I have this config: ``` modparam("db_mysql", "ping_interval", 30); modparam("db_mysql", "timeout_interval", 8); ``` The documentation suggests that "ping_interval" is the "Time interval in seconds to send ping messages to MySQL server in order to keep the connection open." However, looking at the code this seems a bit misleading because it looks like the ping is only done on an actual query (db_mysql_submit_query), i.e. not with a regular interval/on a timer as suggested by the documentation? Also the "auto_reconnect" parameter is stated as default 1 (on), but in the code this is just used as a "retry" of the query itself and MYSQL_OPT_RECONNECT is never set on the connection (https://dev.mysql.com/doc/refman/5.5/en/auto-reconnect.html)? Maybe this is not necessary and it's enough to just re-try the query? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/406

4 53

git:master:15c13983: Merge pull request #503 from smititelu/SIPPROXY-195
by Daniel-Constantin Mierla 18 Feb '16

18 Feb '16

Module: kamailio Branch: master Commit: 15c139831f7135f141f7a32c34ecf24e37bfc3fc URL: https://github.com/kamailio/kamailio/commit/15c139831f7135f141f7a32c34ecf24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-18T15:19:20+01:00 Merge pull request #503 from smititelu/SIPPROXY-195 Complete the list of checking routing blocks types with t_is_request_route() config function --- Modified: modules/tmx/doc/tmx_admin.xml Modified: modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/15c139831f7135f141f7a32c34ecf24… Patch: https://github.com/kamailio/kamailio/commit/15c139831f7135f141f7a32c34ecf24… --- diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index 8c2dcfe..b3a756e 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -301,6 +301,31 @@ route[abc] { </programlisting> </example> </section> + <section id="tmx.f.t_is_request_route"> + <title> + <function moreinfo="none">t_is_request_route()</function> + </title> + <para> + Returns true if the top-executed route block is request_route. + </para> + <para> + This function can be used from ANY_ROUTE . + </para> + <example> + <title><function>t_is_request_route</function> usage</title> + <programlisting format="linespecific"> +... +request_route[xyz] { + route(abc); +} + +route[abc] { + if(t_is_request_route()) { ... } +} +... +</programlisting> + </example> + </section> <section id="tmx.f.t_suspend"> <title> <function moreinfo="none">t_suspend()</function> diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index b6a9cce..41f9da2 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -70,6 +70,7 @@ static int t_flush_flags(struct sip_msg* msg, char*, char* ); static int t_is_failure_route(struct sip_msg* msg, char*, char* ); static int t_is_branch_route(struct sip_msg* msg, char*, char* ); static int t_is_reply_route(struct sip_msg* msg, char*, char*); +static int t_is_request_route(struct sip_msg* msg, char*, char*); static int w_t_suspend(struct sip_msg* msg, char*, char*); static int w_t_continue(struct sip_msg* msg, char *idx, char *lbl, char *rtn); @@ -191,6 +192,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"t_is_reply_route", (cmd_function)t_is_reply_route, 0, 0, 0, ANY_ROUTE }, + {"t_is_request_route", (cmd_function)t_is_request_route, 0, 0, + 0, ANY_ROUTE }, {"t_suspend", (cmd_function)w_t_suspend, 0, 0, 0, ANY_ROUTE }, {"t_continue", (cmd_function)w_t_continue, 3, @@ -566,6 +569,16 @@ static int t_is_reply_route(struct sip_msg* msg, char *foo, char *bar) /** * */ +static int t_is_request_route(struct sip_msg* msg, char *foo, char *bar) +{ + if(route_type == REQUEST_ROUTE) + return 1; + return -1; +} + +/** + * + */ static int w_t_suspend(struct sip_msg* msg, char *p1, char *p2) { unsigned int tindex;

1 0

git:master:af0cc3c6: tmx: Update doku
by Stefan Mititelu 18 Feb '16

18 Feb '16

Module: kamailio Branch: master Commit: af0cc3c6a961de85c98e68df72d3b26b35e89ffc URL: https://github.com/kamailio/kamailio/commit/af0cc3c6a961de85c98e68df72d3b26… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-08T11:07:17+02:00 tmx: Update doku Update doku for t_is_request_route() config function. --- Modified: modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/af0cc3c6a961de85c98e68df72d3b26… Patch: https://github.com/kamailio/kamailio/commit/af0cc3c6a961de85c98e68df72d3b26… --- diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index 8c2dcfe..b3a756e 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -301,6 +301,31 @@ route[abc] { </programlisting> </example> </section> + <section id="tmx.f.t_is_request_route"> + <title> + <function moreinfo="none">t_is_request_route()</function> + </title> + <para> + Returns true if the top-executed route block is request_route. + </para> + <para> + This function can be used from ANY_ROUTE . + </para> + <example> + <title><function>t_is_request_route</function> usage</title> + <programlisting format="linespecific"> +... +request_route[xyz] { + route(abc); +} + +route[abc] { + if(t_is_request_route()) { ... } +} +... +</programlisting> + </example> + </section> <section id="tmx.f.t_suspend"> <title> <function moreinfo="none">t_suspend()</function>

1 0

[kamailio] Add t_is_request_route() config function (#503)
by Stefan Mititelu 18 Feb '16

18 Feb '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/503 -- Commit Summary -- * tmx: Add t_is_request_route() config function * tmx: Update doku -- File Changes -- M modules/tmx/doc/tmx_admin.xml (25) M modules/tmx/tmx_mod.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/503.patch https://github.com/kamailio/kamailio/pull/503.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/503

2 2

git:master:98ae4911: tmx: Add t_is_request_route() config function
by Stefan Mititelu 18 Feb '16

18 Feb '16

Module: kamailio Branch: master Commit: 98ae491145eab5457d672b1ae373aeec9dd3f1a7 URL: https://github.com/kamailio/kamailio/commit/98ae491145eab5457d672b1ae373aee… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-08T10:55:00+02:00 tmx: Add t_is_request_route() config function Add t_is_request_route() config function. --- Modified: modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/98ae491145eab5457d672b1ae373aee… Patch: https://github.com/kamailio/kamailio/commit/98ae491145eab5457d672b1ae373aee… --- diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index b6a9cce..41f9da2 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -70,6 +70,7 @@ static int t_flush_flags(struct sip_msg* msg, char*, char* ); static int t_is_failure_route(struct sip_msg* msg, char*, char* ); static int t_is_branch_route(struct sip_msg* msg, char*, char* ); static int t_is_reply_route(struct sip_msg* msg, char*, char*); +static int t_is_request_route(struct sip_msg* msg, char*, char*); static int w_t_suspend(struct sip_msg* msg, char*, char*); static int w_t_continue(struct sip_msg* msg, char *idx, char *lbl, char *rtn); @@ -191,6 +192,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"t_is_reply_route", (cmd_function)t_is_reply_route, 0, 0, 0, ANY_ROUTE }, + {"t_is_request_route", (cmd_function)t_is_request_route, 0, 0, + 0, ANY_ROUTE }, {"t_suspend", (cmd_function)w_t_suspend, 0, 0, 0, ANY_ROUTE }, {"t_continue", (cmd_function)w_t_continue, 3, @@ -566,6 +569,16 @@ static int t_is_reply_route(struct sip_msg* msg, char *foo, char *bar) /** * */ +static int t_is_request_route(struct sip_msg* msg, char *foo, char *bar) +{ + if(route_type == REQUEST_ROUTE) + return 1; + return -1; +} + +/** + * + */ static int w_t_suspend(struct sip_msg* msg, char *p1, char *p2) { unsigned int tindex;

1 0

Re: [sr-dev] [kamailio] core: mem - shm common defines to pass the module name (1755c1b)
by Daniel-Constantin Mierla 18 Feb '16

18 Feb '16

Indeed, that is disabled code, changed to be in pair with the new memory management interface defines that print module name. The whole code has to be removed actually, probably I left if there when I did the new dynamic mem manager interface just in case it needs to be reverted, but it is clear now is not going to happen. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/1755c1b7d60327b43ec5fa4ee4d3d30…

1 0

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