sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:c1fa7806: Merge pull request #1141 from vitalikvoip/ipops_naptr
by GitHub 29 May '17

29 May '17

Module: kamailio Branch: master Commit: c1fa78063c6b040433d426e6fcf472f0b430a7cf URL: https://github.com/kamailio/kamailio/commit/c1fa78063c6b040433d426e6fcf472f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-29T23:16:38+02:00 Merge pull request #1141 from vitalikvoip/ipops_naptr ipops: new naptr_query function --- Modified: src/modules/ipops/doc/ipops_admin.xml Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/c1fa78063c6b040433d426e6fcf472f… Patch: https://github.com/kamailio/kamailio/commit/c1fa78063c6b040433d426e6fcf472f…

1 0

git:master:8866127d: ipops: new naptr_query function
by Vitaliy Aleksandrov 29 May '17

29 May '17

Module: kamailio Branch: master Commit: 8866127dcd9780eb0b4f2aeb08ab5a1dbe9fe20f URL: https://github.com/kamailio/kamailio/commit/8866127dcd9780eb0b4f2aeb08ab5a1… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Date: 2017-05-29T11:42:27+03:00 ipops: new naptr_query function --- Modified: src/modules/ipops/doc/ipops_admin.xml Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/8866127dcd9780eb0b4f2aeb08ab5a1… Patch: https://github.com/kamailio/kamailio/commit/8866127dcd9780eb0b4f2aeb08ab5a1…

1 0

[kamailio/kamailio] ipops: new naptr_query function (#1141)
by vitalikvoip 29 May '17

29 May '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1141 -- Commit Summary -- * ipops: new naptr_query function -- File Changes -- M src/modules/ipops/doc/ipops_admin.xml (96) M src/modules/ipops/ipops_mod.c (34) M src/modules/ipops/ipops_pv.c (506) M src/modules/ipops/ipops_pv.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1141.patch https://github.com/kamailio/kamailio/pull/1141.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1141

2 2

[kamailio/kamailio] tsilo: deadlock in ts_append() (#1138)
by vitalikvoip 29 May '17

29 May '17

Hi, Recently I found a bug in ts_append() function of the tsilo module. It works for most users until they start using some functions in branch routes of newly created branches. The root of the problem is that static buffer from pv_get_buffer() can be overwritten by some branch_route actions. In the end in the ts_append() lock_entry_by_ruri locks one mutex and unlock_entry_by_ruri unlocks another one. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1138 -- Commit Summary -- * Fix memory leak in ldap module that happens after calling ldap_result_next() * Merge branch 'master' of https://github.com/kamailio/kamailio * tsilo: fix deadlock in ts_append() -- File Changes -- M src/modules/tsilo/tsilo.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1138.patch https://github.com/kamailio/kamailio/pull/1138.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1138

2 8

git:5.0:368a7ca5: tsilo: fix deadlock in ts_append()
by Federico Cabiddu 29 May '17

29 May '17

Module: kamailio Branch: 5.0 Commit: 368a7ca57bb3caf2a26d3840177f96fe8ed5f034 URL: https://github.com/kamailio/kamailio/commit/368a7ca57bb3caf2a26d3840177f96f… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-05-29T11:13:09+02:00 tsilo: fix deadlock in ts_append() Copy ruri parameter into pkg mem before calling ts_append(). Value saved in a static buffer from pv_get_buffer() can be corrupted if a new branch adds an additional SIP header in its branch_route (cherry picked from commit bd57cd59c2936e62f6e231cac4ba42920eb109b3) --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/368a7ca57bb3caf2a26d3840177f96f… Patch: https://github.com/kamailio/kamailio/commit/368a7ca57bb3caf2a26d3840177f96f… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index f622fdcd98..f5b1732e89 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -250,15 +250,25 @@ static int fixup_ts_append(void** param, int param_no) */ static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri) { - str ruri = {0}; + str tmp = STR_NULL; + str ruri = STR_NULL; + int rc; - if(_ruri==NULL || (fixup_get_svalue(_msg, (gparam_p)_ruri, &ruri)!=0 || ruri.len<=0)) { + if(_ruri==NULL || (fixup_get_svalue(_msg, (gparam_p)_ruri, &tmp)!=0 || tmp.len<=0)) { LM_ERR("invalid ruri parameter\n"); return -1; } - if(ts_check_uri(&ruri)<0) + if(ts_check_uri(&tmp)<0) return -1; - return ts_append(_msg, &ruri, _table); + + if (pkg_str_dup(&ruri, &tmp) < 0) + return -1; + + rc = ts_append(_msg, &ruri, _table); + + pkg_free(ruri.s); + + return rc; } /** *

1 0

git:master:1104411b: Merge pull request #1140 from vitalikvoip/tsilo_deadlock
by GitHub 29 May '17

29 May '17

Module: kamailio Branch: master Commit: 1104411ba7c229738e954eec5f6fca2f0451fe93 URL: https://github.com/kamailio/kamailio/commit/1104411ba7c229738e954eec5f6fca2… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-29T11:06:39+02:00 Merge pull request #1140 from vitalikvoip/tsilo_deadlock tsilo: fix deadlock in ts_append() --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/1104411ba7c229738e954eec5f6fca2… Patch: https://github.com/kamailio/kamailio/commit/1104411ba7c229738e954eec5f6fca2… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index f622fdcd98..f5b1732e89 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -250,15 +250,25 @@ static int fixup_ts_append(void** param, int param_no) */ static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri) { - str ruri = {0}; + str tmp = STR_NULL; + str ruri = STR_NULL; + int rc; - if(_ruri==NULL || (fixup_get_svalue(_msg, (gparam_p)_ruri, &ruri)!=0 || ruri.len<=0)) { + if(_ruri==NULL || (fixup_get_svalue(_msg, (gparam_p)_ruri, &tmp)!=0 || tmp.len<=0)) { LM_ERR("invalid ruri parameter\n"); return -1; } - if(ts_check_uri(&ruri)<0) + if(ts_check_uri(&tmp)<0) return -1; - return ts_append(_msg, &ruri, _table); + + if (pkg_str_dup(&ruri, &tmp) < 0) + return -1; + + rc = ts_append(_msg, &ruri, _table); + + pkg_free(ruri.s); + + return rc; } /** *

1 0

git:master:bd57cd59: tsilo: fix deadlock in ts_append()
by Vitaliy Aleksandrov 29 May '17

29 May '17

Module: kamailio Branch: master Commit: bd57cd59c2936e62f6e231cac4ba42920eb109b3 URL: https://github.com/kamailio/kamailio/commit/bd57cd59c2936e62f6e231cac4ba429… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Date: 2017-05-29T11:14:50+03:00 tsilo: fix deadlock in ts_append() Copy ruri parameter into pkg mem before calling ts_append(). Value saved in a static buffer from pv_get_buffer() can be corrupted if a new branch adds an additional SIP header in its branch_route --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/bd57cd59c2936e62f6e231cac4ba429… Patch: https://github.com/kamailio/kamailio/commit/bd57cd59c2936e62f6e231cac4ba429… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index f622fdcd98..f5b1732e89 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -250,15 +250,25 @@ static int fixup_ts_append(void** param, int param_no) */ static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri) { - str ruri = {0}; + str tmp = STR_NULL; + str ruri = STR_NULL; + int rc; - if(_ruri==NULL || (fixup_get_svalue(_msg, (gparam_p)_ruri, &ruri)!=0 || ruri.len<=0)) { + if(_ruri==NULL || (fixup_get_svalue(_msg, (gparam_p)_ruri, &tmp)!=0 || tmp.len<=0)) { LM_ERR("invalid ruri parameter\n"); return -1; } - if(ts_check_uri(&ruri)<0) + if(ts_check_uri(&tmp)<0) return -1; - return ts_append(_msg, &ruri, _table); + + if (pkg_str_dup(&ruri, &tmp) < 0) + return -1; + + rc = ts_append(_msg, &ruri, _table); + + pkg_free(ruri.s); + + return rc; } /** *

1 0

[kamailio/kamailio] tsilo: fix deadlock in ts_append() (#1140)
by vitalikvoip 29 May '17

29 May '17

Copy ruri parameter into pkg mem before calling ts_append(). Value saved in a static buffer from pv_get_buffer() can be corrupted if a new branch adds an additional SIP header in its branch_route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1140 -- Commit Summary -- * tsilo: fix deadlock in ts_append() -- File Changes -- M src/modules/tsilo/tsilo.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1140.patch https://github.com/kamailio/kamailio/pull/1140.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1140

2 2

git:master:ff95605d: drouting: updates for keepalive api
by Daniel-Constantin Mierla 29 May '17

29 May '17

Module: kamailio Branch: master Commit: ff95605d37b2e956ed218efcff530e428137f07d URL: https://github.com/kamailio/kamailio/commit/ff95605d37b2e956ed218efcff530e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-29T07:31:02+02:00 drouting: updates for keepalive api --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/ff95605d37b2e956ed218efcff530e4… Patch: https://github.com/kamailio/kamailio/commit/ff95605d37b2e956ed218efcff530e4… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index 05927c834c..e18ce7f76d 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -219,7 +219,7 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s) } -void dr_keepalive_statechanged(str uri, ka_state state, void *user_attr) { +void dr_keepalive_statechanged(str *uri, ka_state state, void *user_attr) { ((pgw_t *)user_attr)->state = state; } @@ -231,7 +231,7 @@ static int dr_update_keepalive(pgw_t *addrs) for(cur = addrs; cur != NULL; cur = cur->next) { LM_DBG("uri: %.*s\n", cur->ip.len, cur->ip.s); - keepalive_api.add_destination(cur->ip, owner, 0, dr_keepalive_statechanged, cur); + keepalive_api.add_destination(&cur->ip, &owner, 0, dr_keepalive_statechanged, cur); } return 0;

1 0

git:master:211dc1be: keepalive: allow variables in cfg function parameters
by Daniel-Constantin Mierla 29 May '17

29 May '17

Module: kamailio Branch: master Commit: 211dc1be81b25d732ff6100417067962f7dbd451 URL: https://github.com/kamailio/kamailio/commit/211dc1be81b25d732ff610041706796… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-29T07:18:14+02:00 keepalive: allow variables in cfg function parameters - use str* instead of str for api functions --- Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/211dc1be81b25d732ff610041706796… Patch: https://github.com/kamailio/kamailio/commit/211dc1be81b25d732ff610041706796…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017