sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
302 discussions

git:4.2:21b9fd01: permissions: safety check for trusted hash table
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: 21b9fd01edef11ac3d3352115d52b7d0d985d95f URL: https://github.com/kamailio/kamailio/commit/21b9fd01edef11ac3d3352115d52b7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:35:53+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 (cherry picked from commit f2958e5861a96e40f0aca05d5d5bd7fa14c2089e) (cherry picked from commit 02ba3dd9fbb41fb3f03fa230672c72acedc39f0d) --- Modified: modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/21b9fd01edef11ac3d3352115d52b7d… Patch: https://github.com/kamailio/kamailio/commit/21b9fd01edef11ac3d3352115d52b7d… --- diff --git a/modules/permissions/trusted.c b/modules/permissions/trusted.c index db20e8f..f42c096 100644 --- a/modules/permissions/trusted.c +++ b/modules/permissions/trusted.c @@ -43,9 +43,9 @@ #define TABLE_VERSION 5 -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; @@ -69,16 +69,21 @@ int reload_trusted_table(void) char *pattern, *tag; - cols[0] = &source_col; - cols[1] = &proto_col; - cols[2] = &from_col; - cols[3] = &tag_col; + 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; + cols[3] = &tag_col; + if (perm_dbf.use_table(db_handle, &trusted_table) < 0) { LM_ERR("failed to use trusted table\n"); return -1;

1 0

git:4.2:2ee84814: etc/kamailio-oob.cfg: remove modules_k from mpath
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: 2ee84814ccaa1a1a55c4e04d7907eb9b57910d6a URL: https://github.com/kamailio/kamailio/commit/2ee84814ccaa1a1a55c4e04d7907eb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:35:39+02:00 etc/kamailio-oob.cfg: remove modules_k from mpath (cherry picked from commit d796409e653031fdfecee554500b06a43b981296) (cherry picked from commit 27c0918a9198e6c7d684541ddfabe598d35dbba8) --- Modified: etc/kamailio-oob.cfg --- Diff: https://github.com/kamailio/kamailio/commit/2ee84814ccaa1a1a55c4e04d7907eb9… Patch: https://github.com/kamailio/kamailio/commit/2ee84814ccaa1a1a55c4e04d7907eb9… --- diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 2aa3289..d926c9f 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -223,9 +223,9 @@ voicemail.srv_port = "5060" desc "VoiceMail Port" # set paths to location of modules (to sources or installation folders) #!ifdef WITH_SRCPATH -mpath="modules_k:modules" +mpath="modules" #!else -mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" +mpath="/usr/local/lib/kamailio/modules/" #!endif #!ifdef WITH_MYSQL

1 0

git:4.2:da34ecf1: pv: catch early setting $rU with empty string
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: da34ecf150ca91e98d32de144a3a77285e1e262c URL: https://github.com/kamailio/kamailio/commit/da34ecf150ca91e98d32de144a3a772… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:35:27+02:00 pv: catch early setting $rU with empty string - avoids backing up and restoring last char, which can create inappropriate access when using static empty string value (cherry picked from commit adf1bca4a820e9cb5fcc94a1953b0fcdbd8a20da) (cherry picked from commit 3551d707fa497554f3da767e9fba8e046f83b417) --- Modified: modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/da34ecf150ca91e98d32de144a3a772… Patch: https://github.com/kamailio/kamailio/commit/da34ecf150ca91e98d32de144a3a772… --- diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 56253b8..fc96cb5 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -2095,7 +2095,8 @@ int pv_set_ruri_user(struct sip_msg* msg, pv_param_t *param, return -1; } - if((val==NULL) || (val->flags&PV_VAL_NULL)) + if((val==NULL) || (val->flags&PV_VAL_NULL) + || ((val->flags&PV_VAL_STR) && val->rs.len<=0)) { memset(&act, 0, sizeof(act)); act.type = SET_USER_T;

1 0

git:4.2:be2892e6: Makefile.defs: detect gcc version 5.0+
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: be2892e6a60915902c89044483786625e78a3f0d URL: https://github.com/kamailio/kamailio/commit/be2892e6a60915902c8904448378662… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:35:12+02:00 Makefile.defs: detect gcc version 5.0+ - reported by Anthony Messina, GH #230 (cherry picked from commit 35e5da141569b8ace7c0a8fd743d02de6c0df525) (cherry picked from commit 6279f50a2cdbcba34226f959f40258bb768954bc) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/be2892e6a60915902c8904448378662… Patch: https://github.com/kamailio/kamailio/commit/be2892e6a60915902c8904448378662…

1 0

git:4.2:af2e7c59: modules/htable: improves error message when loading from database
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: af2e7c59e2a1ae020481ba2b7c601cebb701edf4 URL: https://github.com/kamailio/kamailio/commit/af2e7c59e2a1ae020481ba2b7c601ce… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:34:33+02:00 modules/htable: improves error message when loading from database (cherry picked from commit f39736b276878f0de1e0471311119f12f1878801) (cherry picked from commit 48996cc1e879a2abf96306fc69ace2a86b8ef836) --- Modified: modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/af2e7c59e2a1ae020481ba2b7c601ce… Patch: https://github.com/kamailio/kamailio/commit/af2e7c59e2a1ae020481ba2b7c601ce… --- diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index 0231ece..fd1ffad 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -198,11 +198,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.2:ae275c32: modules/[rls|presence_xml]: fixes warning [-Wtautological-compare]
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: ae275c324e8c64984bb8f84efd5353c44f279ab3 URL: https://github.com/kamailio/kamailio/commit/ae275c324e8c64984bb8f84efd5353c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:34:12+02:00 modules/[rls|presence_xml]: fixes warning [-Wtautological-compare] warning: comparison of unsigned expression < 0 is always false (cherry picked from commit d5339cf397b83b79cd1594e37df69990374ec467) (cherry picked from commit 9c2dbc86a63c6bc403798d8ba48dfea764ca2537) --- Modified: modules/presence_xml/presence_xml.c Modified: modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/ae275c324e8c64984bb8f84efd5353c… Patch: https://github.com/kamailio/kamailio/commit/ae275c324e8c64984bb8f84efd5353c… --- 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 c87e91e..d77c74c 100644 --- a/modules/rls/rls.c +++ b/modules/rls/rls.c @@ -338,7 +338,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:4.2:d7164b06: modules/rls: normalize RLS entry URIs
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: d7164b062961c421c2b11f74a5826a52bc09d3aa URL: https://github.com/kamailio/kamailio/commit/d7164b062961c421c2b11f74a5826a5… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:33:16+02:00 modules/rls: normalize RLS entry URIs - RLS entry URI is xs:AnyURI, which may be an absolute or relative URI. In relative URI, URI scheme is missing. (cherry picked from commit 68bb6b35098f5555ca35ddb21527660e46b7336a) (cherry picked from commit 41a211e6c13dcecaa6752238d63dfae932433ea7) --- Modified: modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/d7164b062961c421c2b11f74a5826a5… Patch: https://github.com/kamailio/kamailio/commit/d7164b062961c421c2b11f74a5826a5… --- diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index 801d5e4..223d375 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -987,23 +987,32 @@ int send_resource_subs(char* uri, void* param) str pres_uri, *tmp_str; struct sip_uri parsed_pres_uri; int duplicate = 0; + str *normalized_uri; subs_info_t *s = (subs_info_t *) ((void**)param)[0]; list_entry_t **rls_contact_list = (list_entry_t **) ((void**)param)[1]; pres_uri.s = uri; pres_uri.len = strlen(uri); - if (parse_uri(pres_uri.s, pres_uri.len, &parsed_pres_uri) < 0) - { - LM_ERR("bad uri: %.*s\n", pres_uri.len, pres_uri.s); - return -1; + + normalized_uri = normalize_sip_uri(&pres_uri); + if (normalized_uri->s == NULL || normalized_uri->len == 0) { + LM_ERR("failed to normalize RLS entry URI %.*s\n", + pres_uri.len, pres_uri.s); + return -1; + } + + if (parse_uri(normalized_uri->s, normalized_uri->len, &parsed_pres_uri) + < 0) { + LM_ERR("bad uri: %.*s\n", normalized_uri->len, normalized_uri->s); + return -1; } if (check_self(&parsed_pres_uri.host, 0, PROTO_NONE) != 1 && rls_disable_remote_presence != 0) { LM_WARN("Unable to subscribe to remote contact %.*s for watcher %.*s\n", - pres_uri.len, pres_uri.s, + normalized_uri->len, normalized_uri->s, s->watcher_uri->len, s->watcher_uri->s); return 1; @@ -1014,8 +1023,8 @@ int send_resource_subs(char* uri, void* param) if (rls_max_backend_subs > 0 && ++counter > rls_max_backend_subs) return 1; - s->pres_uri = &pres_uri; - s->remote_target = &pres_uri; + s->pres_uri = normalized_uri; + s->remote_target = normalized_uri; /* Build list of contacts... checking each contact exists only once */ if ((tmp_str = (str *)pkg_malloc(sizeof(str))) == NULL) @@ -1029,8 +1038,8 @@ int send_resource_subs(char* uri, void* param) LM_ERR("out of private memory\n"); return -1; } - memcpy(tmp_str->s, pres_uri.s, pres_uri.len); - tmp_str->len = pres_uri.len; + memcpy(tmp_str->s, normalized_uri->s, normalized_uri->len); + tmp_str->len = normalized_uri->len; *rls_contact_list = list_insert(tmp_str, *rls_contact_list, &duplicate); if (duplicate != 0) {

1 0

git:4.2:5996db0a: dispatcher: Fix typo in error message
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: 5996db0a9df9eab96ff2c018993841025632478c URL: https://github.com/kamailio/kamailio/commit/5996db0a9df9eab96ff2c0189938410… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:31:54+02:00 dispatcher: Fix typo in error message (cherry picked from commit 55a7bf18d0663a9503320143958d0d9e2e845b26) (cherry picked from commit 2b34e4def552444fd72b9dc4f4ae286b19a839b7) --- Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/5996db0a9df9eab96ff2c0189938410… Patch: https://github.com/kamailio/kamailio/commit/5996db0a9df9eab96ff2c0189938410… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 13f3f56..aeb97f9 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -722,7 +722,7 @@ static int ds_warn_fixup(void** param, int param_no) { if(!dst_avp_param.s || !grp_avp_param.s || !cnt_avp_param.s) { - LM_ERR("failover functions used, but AVPs paraamters required" + LM_ERR("failover functions used, but required AVP parameters" " are NULL -- feature disabled\n"); } return 0;

1 0

git:4.2:de215078: tm: extended docs for t_reply()
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: de21507868af81ef3155e6de4b1e788058578459 URL: https://github.com/kamailio/kamailio/commit/de21507868af81ef3155e6de4b1e788… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:31:00+02:00 tm: extended docs for t_reply() (cherry picked from commit a221ec34074c25838f470070cb6c7e604a33fc98) (cherry picked from commit f050389b568aaab3717484b67b9b157199c63bbc) --- Modified: modules/tm/README Modified: modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/de21507868af81ef3155e6de4b1e788… Patch: https://github.com/kamailio/kamailio/commit/de21507868af81ef3155e6de4b1e788… --- diff --git a/modules/tm/README b/modules/tm/README index 892f778..cbf7de9 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -1721,7 +1721,7 @@ failure_route[1] { deciding if the transaction is complete. In the referred block, you can start a new branch which is required for failover of multiple outbound flows (RFC 5626). Note that the set of commands which are usable within - a branch_failure route is limited to a subset of the failure_rotue + a branch_failure route is limited to a subset of the failure_route commands including logging, rewriting URI and initiating new branches. Any other commands may generate errors or result in unpredictable behavior. Note that whenever failure_route is entered, uri is reset to @@ -1822,6 +1822,17 @@ if (t_newtran()) { Sends a stateful reply after a transaction has been established. See t_newtran for usage. + If the code is in the range 300-399 (redirect reply), the current + destination set is appended to the reply as Contact headers. The + destination set contains the request URI (R-URI), if it is modified + compared to the received one, plus the branches added to the request + (e.g., after an append_branch() or lookup("location")). If the R-URI + was changed but it is not desired to be part of the destination set, it + can be reverted using the function revert_uri(). + + Custom headers to the reply can be added using append_to_reply() + function from textops module. + Meaning of the parameters is as follows: * code - Reply code number. * reason_phrase - Reason string. diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index af7d11d..e2da84c 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -326,6 +326,19 @@ if (t_newtran()) { Sends a stateful reply after a transaction has been established. See <function>t_newtran</function> for usage. </para> + <para> + If the code is in the range 300-399 (redirect reply), the current + destination set is appended to the reply as Contact headers. + The destination set contains the request URI (R-URI), if it is + modified compared to the received one, plus the branches added to the + request (e.g., after an append_branch() or lookup("location")). + If the R-URI was changed but it is not desired to be part of the + destination set, it can be reverted using the function revert_uri(). + </para> + <para> + Custom headers to the reply can be added using append_to_reply() + function from textops module. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem>

1 0

git:4.2:4faa5009: sl: extended docs for sl_send_reply()
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: 4faa50094a44d8c06c2fd3987f107731530eae47 URL: https://github.com/kamailio/kamailio/commit/4faa50094a44d8c06c2fd3987f10773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:30:39+02:00 sl: extended docs for sl_send_reply() (cherry picked from commit 29aa683f7c3d507a88b83ecd84d9023c5e162ab1) (cherry picked from commit 1a08fa07b601c5f9636c6dba223230ec91301768) --- Modified: modules/sl/README Modified: modules/sl/doc/sl_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4faa50094a44d8c06c2fd3987f10773… Patch: https://github.com/kamailio/kamailio/commit/4faa50094a44d8c06c2fd3987f10773… --- diff --git a/modules/sl/README b/modules/sl/README index 5d7723d..a45dc33 100644 --- a/modules/sl/README +++ b/modules/sl/README @@ -191,6 +191,17 @@ modparam("sl", "bind_tm", 0) # feature disabled text reason. The reply is sent stateless, totally independent of the Transaction module and with no retransmission for the INVITE's replies. + If the code is in the range 300-399 (redirect reply), the current + destination set is appended to the reply as Contact headers. The + destination set contains the request URI (R-URI), if it is modified + compared to the received one, plus the branches added to the request + (e.g., after an append_branch() or lookup("location")). If the R-URI + was changed but it is not desired to be part of the destination set, it + can be reverted using the function revert_uri(). + + Custom headers to the reply can be added using append_to_reply() + function from textops module. + Meaning of the parameters is as follows: * code - Return code. * reason - Reason phrase. diff --git a/modules/sl/doc/sl_functions.xml b/modules/sl/doc/sl_functions.xml index 1420e86..76c9067 100644 --- a/modules/sl/doc/sl_functions.xml +++ b/modules/sl/doc/sl_functions.xml @@ -16,6 +16,19 @@ of the Transaction module and with no retransmission for the INVITE's replies. </para> + <para> + If the code is in the range 300-399 (redirect reply), the current + destination set is appended to the reply as Contact headers. + The destination set contains the request URI (R-URI), if it is + modified compared to the received one, plus the branches added to the + request (e.g., after an append_branch() or lookup("location")). + If the R-URI was changed but it is not desired to be part of the + destination set, it can be reverted using the function revert_uri(). + </para> + <para> + Custom headers to the reply can be added using append_to_reply() + function from textops module. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem>

1 0

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