sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
302 discussions

git:4.3:48996cc1: modules/htable: improves error message when loading from database
by Daniel-Constantin Mierla 17 Jul '15

17 Jul '15

Module: kamailio Branch: 4.3 Commit: 48996cc1e879a2abf96306fc69ace2a86b8ef836 URL: https://github.com/kamailio/kamailio/commit/48996cc1e879a2abf96306fc69ace2a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:24:41+02:00 modules/htable: improves error message when loading from database (cherry picked from commit f39736b276878f0de1e0471311119f12f1878801) --- Modified: modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/48996cc1e879a2abf96306fc69ace2a… Patch: https://github.com/kamailio/kamailio/commit/48996cc1e879a2abf96306fc69ace2a… --- diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index 06f3057..4288554 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -197,11 +197,17 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) do { for(i=0; i<RES_ROW_N(db_res); i++) { - if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING - || VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { - LM_ERR("key type must be string and its value not null\n"); + if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { + LM_ERR("key value must not be null\n"); goto error; } + + if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) { + LM_ERR("key type must be string (type=%d)\n", + RES_ROWS(db_res)[i].values[0].type); + goto error; + } + kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { LM_ERR("null key in row %d\n", i);

1 0

git:4.3:9c2dbc86: modules/[rls|presence_xml]: fixes warning [-Wtautological-compare]
by Daniel-Constantin Mierla 17 Jul '15

17 Jul '15

Module: kamailio Branch: 4.3 Commit: 9c2dbc86a63c6bc403798d8ba48dfea764ca2537 URL: https://github.com/kamailio/kamailio/commit/9c2dbc86a63c6bc403798d8ba48dfea… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:23:47+02:00 modules/[rls|presence_xml]: fixes warning [-Wtautological-compare] warning: comparison of unsigned expression < 0 is always false (cherry picked from commit d5339cf397b83b79cd1594e37df69990374ec467) --- Modified: modules/presence_xml/presence_xml.c Modified: modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/9c2dbc86a63c6bc403798d8ba48dfea… Patch: https://github.com/kamailio/kamailio/commit/9c2dbc86a63c6bc403798d8ba48dfea… --- diff --git a/modules/presence_xml/presence_xml.c b/modules/presence_xml/presence_xml.c index 29bf3ec..f8781ef 100644 --- a/modules/presence_xml/presence_xml.c +++ b/modules/presence_xml/presence_xml.c @@ -382,7 +382,7 @@ static int pxml_add_xcap_server( modparam_t type, void* val) LM_ERR("while converting string to int\n"); goto error; } - if(port< 0 || port> 65535) + if(port< 1 || port> 65535) { LM_ERR("wrong port number\n"); goto error; diff --git a/modules/rls/rls.c b/modules/rls/rls.c index 23c6a7c..26d9be0 100644 --- a/modules/rls/rls.c +++ b/modules/rls/rls.c @@ -333,7 +333,7 @@ static int mod_init(void) port_str.len, port_str.s); return -1; } - if(xcap_port< 0 || xcap_port> 65535) + if(xcap_port< 1 || xcap_port> 65535) { LM_ERR("wrong xcap server port\n"); return -1;

1 0

git:master:8cf4696b: modules/cdp: update auth session timeout when it is = lifetime as well...
by jaybeepee 17 Jul '15

17 Jul '15

Module: kamailio Branch: master Commit: 8cf4696b66fe9475a125b520c8dcb7f96e264ecd URL: https://github.com/kamailio/kamailio/commit/8cf4696b66fe9475a125b520c8dcb7f… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-07-17T12:27:48+02:00 modules/cdp: update auth session timeout when it is = lifetime as well... - only really makes a difference if grace time = 0 --- Modified: modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/8cf4696b66fe9475a125b520c8dcb7f… Patch: https://github.com/kamailio/kamailio/commit/8cf4696b66fe9475a125b520c8dcb7f… --- diff --git a/modules/cdp/authstatemachine.c b/modules/cdp/authstatemachine.c index be8cbaf..462065d 100644 --- a/modules/cdp/authstatemachine.c +++ b/modules/cdp/authstatemachine.c @@ -107,7 +107,7 @@ void update_auth_session_timers(cdp_auth_session_t *x, AAAMessage *msg) { default: x->lifetime = time(0) + auth_lifetime; } - if (x->timeout != -1 && x->timeout < x->lifetime) x->timeout = x->lifetime + x->grace_period; + if (x->timeout != -1 && x->timeout <= x->lifetime) x->timeout = x->lifetime + x->grace_period; } avp = AAAFindMatchingAVP(msg, 0, AVP_Session_Timeout, 0, 0); if (avp && avp->data.len == 4) {

1 0

[kamailio] kamcmd permissions.trustedReload crashes when using MySQL (#228)
by Emmanuel Schmidbauer 17 Jul '15

17 Jul '15

When we reload trusted table and using MySQL as database, kamailio crashes. This does not happen when using PostgreSQL We only have one record in the database too: mysql> select * from trusted\G *************************** 1. row *************************** id: 1 src_ip: 192.168.110.152 proto: from_pattern: NULL ruri_pattern: NULL tag: fs02 priority: 0 1 row in set (0.00 sec) --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/228

2 7

git:master:f2958e58: permissions: safety check for trusted hash table
by Daniel-Constantin Mierla 17 Jul '15

17 Jul '15

Module: kamailio Branch: master Commit: f2958e5861a96e40f0aca05d5d5bd7fa14c2089e URL: https://github.com/kamailio/kamailio/commit/f2958e5861a96e40f0aca05d5d5bd7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T09:04:28+02:00 permissions: safety check for trusted hash table - avoid crash if a db reload is issued in db-only mode - reported Emmanuel Schmidbauer, GH #228 --- Modified: modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/f2958e5861a96e40f0aca05d5d5bd7f… Patch: https://github.com/kamailio/kamailio/commit/f2958e5861a96e40f0aca05d5d5bd7f… --- diff --git a/modules/permissions/trusted.c b/modules/permissions/trusted.c index 8da51ff..67e70a1 100644 --- a/modules/permissions/trusted.c +++ b/modules/permissions/trusted.c @@ -43,9 +43,9 @@ #define TABLE_VERSION 6 -struct trusted_list ***hash_table; /* Pointer to current hash table pointer */ -struct trusted_list **hash_table_1; /* Pointer to hash table 1 */ -struct trusted_list **hash_table_2; /* Pointer to hash table 2 */ +struct trusted_list ***hash_table = 0; /* Pointer to current hash table pointer */ +struct trusted_list **hash_table_1 = 0; /* Pointer to hash table 1 */ +struct trusted_list **hash_table_2 = 0; /* Pointer to hash table 2 */ static db1_con_t* db_handle = 0; @@ -70,6 +70,16 @@ int reload_trusted_table(void) char *pattern, *ruri_pattern, *tag; + if (hash_table == 0) { + LM_ERR("in-memory hash table not initialized\n"); + return -1; + } + + if (db_handle == 0) { + LM_ERR("no connection to database\n"); + return -1; + } + cols[0] = &source_col; cols[1] = &proto_col; cols[2] = &from_col; @@ -77,11 +87,6 @@ int reload_trusted_table(void) cols[4] = &tag_col; cols[5] = &priority_col; - if (db_handle == 0) { - LM_ERR("no connection to database\n"); - return -1; - } - if (perm_dbf.use_table(db_handle, &trusted_table) < 0) { LM_ERR("failed to use trusted table\n"); return -1;

1 0

git:master:6dd7f13c: Merge pull request #252 from fredposner/patch-6
by Daniel-Constantin Mierla 17 Jul '15

17 Jul '15

Module: kamailio Branch: master Commit: 6dd7f13c8a7b928cf7aa8baaaf30114912284362 URL: https://github.com/kamailio/kamailio/commit/6dd7f13c8a7b928cf7aa8baaaf30114… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T08:35:52+02:00 Merge pull request #252 from fredposner/patch-6 Update pipelimit_admin.xml --- Modified: modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6dd7f13c8a7b928cf7aa8baaaf30114… Patch: https://github.com/kamailio/kamailio/commit/6dd7f13c8a7b928cf7aa8baaaf30114…

1 0

git:master:b0f465bc: Update pipelimit_admin.xml
by Fred Posner 17 Jul '15

17 Jul '15

Module: kamailio Branch: master Commit: b0f465bc6e402ba77923216affc2020ad25e97c0 URL: https://github.com/kamailio/kamailio/commit/b0f465bc6e402ba77923216affc2020… Author: Fred Posner <fred(a)palner.com> Committer: Fred Posner <fred(a)palner.com> Date: 2015-07-16T15:17:52-04:00 Update pipelimit_admin.xml - added information about algorithms - corrected rl typos - corrected example (wrong algorithm) - added note about algorithms being case sensitive - added example using pipelimit for specific method (INVITE) --- Modified: modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0f465bc6e402ba77923216affc2020… Patch: https://github.com/kamailio/kamailio/commit/b0f465bc6e402ba77923216affc2020…

1 0

[kamailio] Update pipelimit_admin.xml (#252)
by Fred Posner 17 Jul '15

17 Jul '15

- added information about algorithms - corrected rl typos - corrected example (wrong algorithm) - added note about algorithms being case sensitive - added example using pipelimit for specific method (INVITE) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/252 -- Commit Summary -- * Update pipelimit_admin.xml -- File Changes -- M modules/pipelimit/doc/pipelimit_admin.xml (79) -- Patch Links -- https://github.com/kamailio/kamailio/pull/252.patch https://github.com/kamailio/kamailio/pull/252.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/252

2 2

git:master:7b02509b: Merge pull request #251 from fredposner/patch-5
by Daniel-Constantin Mierla 17 Jul '15

17 Jul '15

Module: kamailio Branch: master Commit: 7b02509b4ea793d93828fbf7ab4843e88de855f5 URL: https://github.com/kamailio/kamailio/commit/7b02509b4ea793d93828fbf7ab4843e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T08:35:28+02:00 Merge pull request #251 from fredposner/patch-5 Update README --- Modified: modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/7b02509b4ea793d93828fbf7ab4843e… Patch: https://github.com/kamailio/kamailio/commit/7b02509b4ea793d93828fbf7ab4843e…

1 0

git:master:59a35caa: Update README
by Fred Posner 17 Jul '15

17 Jul '15

Module: kamailio Branch: master Commit: 59a35caa53c50fac0e35a51a58239227d4f5cae8 URL: https://github.com/kamailio/kamailio/commit/59a35caa53c50fac0e35a51a5823922… Author: Fred Posner <fred(a)palner.com> Committer: Fred Posner <fred(a)palner.com> Date: 2015-07-16T15:01:15-04:00 Update README - added information about algorithms - corrected rl typos - corrected example (wrong algorithm) - added note about algorithms being case sensitive - added example using pipelimit for specific method (INVITE) --- Modified: modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/59a35caa53c50fac0e35a51a5823922… Patch: https://github.com/kamailio/kamailio/commit/59a35caa53c50fac0e35a51a5823922…

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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 July 2015