sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

git:4.3:f050389b: tm: extended docs for t_reply()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: f050389b568aaab3717484b67b9b157199c63bbc URL: https://github.com/kamailio/kamailio/commit/f050389b568aaab3717484b67b9b157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-09T10:34:16+02:00 tm: extended docs for t_reply() (cherry picked from commit a221ec34074c25838f470070cb6c7e604a33fc98) --- Modified: modules/tm/README Modified: modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/f050389b568aaab3717484b67b9b157… Patch: https://github.com/kamailio/kamailio/commit/f050389b568aaab3717484b67b9b157… --- diff --git a/modules/tm/README b/modules/tm/README index 01ec6ac..3b30194 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -1728,7 +1728,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 @@ -1829,6 +1829,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 d93d181..5146d40 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>

8 years, 11 months

git:4.3:1a08fa07: sl: extended docs for sl_send_reply()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 1a08fa07b601c5f9636c6dba223230ec91301768 URL: https://github.com/kamailio/kamailio/commit/1a08fa07b601c5f9636c6dba223230e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-09T10:34:07+02:00 sl: extended docs for sl_send_reply() (cherry picked from commit 29aa683f7c3d507a88b83ecd84d9023c5e162ab1) --- Modified: modules/sl/README Modified: modules/sl/doc/sl_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a08fa07b601c5f9636c6dba223230e… Patch: https://github.com/kamailio/kamailio/commit/1a08fa07b601c5f9636c6dba223230e… --- 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>

8 years, 11 months

git:4.3:1eb9aacf: core: resolve negative index for dset before checking if it is last branch

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 1eb9aacfc5f5b6936bcd6a4f4f219733c7cb7974 URL: https://github.com/kamailio/kamailio/commit/1eb9aacfc5f5b6936bcd6a4f4f21973… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-09T10:33:59+02:00 core: resolve negative index for dset before checking if it is last branch - faster dropping of last branch (cherry picked from commit f8f40045e1370002076f568a1e73e0b4b67e9d66) --- Modified: dset.c --- Diff: https://github.com/kamailio/kamailio/commit/1eb9aacfc5f5b6936bcd6a4f4f21973… Patch: https://github.com/kamailio/kamailio/commit/1eb9aacfc5f5b6936bcd6a4f4f21973… --- diff --git a/dset.c b/dset.c index 2fb3b70..46cc40d 100644 --- a/dset.c +++ b/dset.c @@ -122,14 +122,14 @@ int drop_sip_branch(int idx) return 0; if(idx<0 && (int)nr_branches+idx<0) return 0; + if(idx<0) + idx += nr_branches; /* last branch */ if(idx==nr_branches-1) { nr_branches--; return 0; } - if(idx<0) - idx = nr_branches+idx; /* shift back one position */ for(; idx<nr_branches-1; idx++) memcpy(&branches[idx], &branches[idx+1], sizeof(branch_t));

8 years, 11 months

git:4.3:e5452003: pv: convert negative index to positive position for $branch(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: e5452003a5219e50d26baa72e773fa1690b45a3d URL: https://github.com/kamailio/kamailio/commit/e5452003a5219e50d26baa72e773fa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-09T10:33:48+02:00 pv: convert negative index to positive position for $branch(...) - better access to branch structures (cherry picked from commit 6461b799ce64315b72b8e2f4f7e4617603330833) --- Modified: modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/e5452003a5219e50d26baa72e773fa1… Patch: https://github.com/kamailio/kamailio/commit/e5452003a5219e50d26baa72e773fa1… --- diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index e35330a..34626b3 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -133,6 +133,16 @@ int pv_set_branchx_helper(sip_msg_t *msg, pv_param_t *param, LM_ERR("invalid index\n"); return -1; } + if(idx<0) + { + if((int)nr_branches + idx >= 0) { + idx += nr_branches; + } else { + LM_ERR("index too low: %d (%u)\n", idx, nr_branches); + return -1; + } + } + LM_DBG("managing branch index %d (%u)\n", idx, nr_branches); br = get_sip_branch(idx); }

8 years, 11 months

git:4.3:6ebecf0e: mtree: readme regenerated

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 6ebecf0eb1ec1c171adda651ce4aff775cd75547 URL: https://github.com/kamailio/kamailio/commit/6ebecf0eb1ec1c171adda651ce4aff7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-09T10:33:36+02:00 mtree: readme regenerated (cherry picked from commit c36b93f61a7fe76321aab8e62e1bbeee5122c5ed) --- Modified: modules/mtree/README --- Diff: https://github.com/kamailio/kamailio/commit/6ebecf0eb1ec1c171adda651ce4aff7… Patch: https://github.com/kamailio/kamailio/commit/6ebecf0eb1ec1c171adda651ce4aff7… --- diff --git a/modules/mtree/README b/modules/mtree/README index 28dd6d8..2d2dbed 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -20,9 +20,9 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright (c) 2010 Daniel-Constantin Mierla (asipto.com) + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) - Copyright (c) 2011 Juha Heinanen + Copyright © 2011 Juha Heinanen __________________________________________________________________ Table of Contents @@ -130,8 +130,16 @@ Chapter 1. Admin Guide 1. Overview - This module loads data indexed by prefixes from database and returns - associated string or precompiled value. + This module loads (prefix, value) records from database and indexes + them in a named memory tree. Name of the tree is specified for each + record or as module parameter. + + It exports to configuration file functions to match against in-memory + trees and return the values (raw or precompiled) associated with + matched prefixes. + + The maximum size of the prefix is limited internally to 63, database + table definition may enforce lower maximum size. 2. Dependencies @@ -323,7 +331,7 @@ modparam("mtree", "mt_allow_duplicates", 1) 4.1. mt_match(mtree, pv, mode) -4.1. mt_match(mtree, pv, mode) +4.1. mt_match(mtree, pv, mode) Match 'pv' value against 'mtree'. If 'mtree' type is 0 or 2 and value of 'mode' is NOT 2, sets a value of the longest matching prefix to @@ -347,7 +355,7 @@ mt_match("mytree", "$rU", "0"); 5.3. mt_summary 5.4. mt_match -5.1. mt_list +5.1. mt_list List content of a tree. @@ -361,7 +369,7 @@ mt_match("mytree", "$rU", "0"); _mtname_ _empty_line_ -5.2. mt_reload +5.2. mt_reload Reload mtree from database. @@ -376,7 +384,7 @@ mt_match("mytree", "$rU", "0"); _mtname_ _empty_line_ -5.3. mt_summary +5.3. mt_summary List usage summary for all trees. @@ -388,7 +396,7 @@ mt_match("mytree", "$rU", "0"); :mt_summary:_reply_fifo_file_ _empty_line_ -5.4. mt_match +5.4. mt_match Match prefix value against mtree. @@ -412,7 +420,7 @@ mt_match("mytree", "$rU", "0"); 6.2. mtree.reload 6.3. mtree.match -6.1. mtree.summary +6.1. mtree.summary List usage summary for all trees or for the tree whose name is given as parameter. @@ -420,7 +428,7 @@ mt_match("mytree", "$rU", "0"); Parameters: * _mtree_ - (optional) the name of the tree. -6.2. mtree.reload +6.2. mtree.reload Reload mtree from database to memory. @@ -428,7 +436,7 @@ mt_match("mytree", "$rU", "0"); * _mtree_ - name of mtree or empty string meaning all mtrees -6.3. mtree.match +6.3. mtree.match Match prefix value against mtree

8 years, 11 months

git:4.3:9e05772c: mtree: more details about what module does and max prefix size

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 9e05772c277f487d0c5bacdb33b1aaa8634e133f URL: https://github.com/kamailio/kamailio/commit/9e05772c277f487d0c5bacdb33b1aaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-09T10:33:28+02:00 mtree: more details about what module does and max prefix size (cherry picked from commit 74fadc549929d3dc873ce3b8b1db20559562ab54) --- Modified: modules/mtree/doc/mtree_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9e05772c277f487d0c5bacdb33b1aaa… Patch: https://github.com/kamailio/kamailio/commit/9e05772c277f487d0c5bacdb33b1aaa… --- diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index 17c2c8f..8ca17e0 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -17,8 +17,18 @@ <section> <title>Overview</title> <para> - This module loads data indexed by prefixes from database and returns - associated string or precompiled value. + This module loads (prefix, value) records from database and indexes + them in a named memory tree. Name of the tree is specified for each + record or as module parameter. + </para> + <para> + It exports to configuration file functions to match against in-memory + trees and return the values (raw or precompiled) associated with + matched prefixes. + </para> + <para> + The maximum size of the prefix is limited internally to 63, database + table definition may enforce lower maximum size. </para> </section> <section>

8 years, 11 months

git:4.3:bfe40dd6: mtree: internal prefix max size set to 64

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: bfe40dd69e154b90820d8e87ea5ea46e51601e54 URL: https://github.com/kamailio/kamailio/commit/bfe40dd69e154b90820d8e87ea5ea46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-09T10:33:19+02:00 mtree: internal prefix max size set to 64 - allow for larger prefix values to be used (e.g., case of uuid, ipv6) - db corresponding field still set to varchar(32) (cherry picked from commit 47086a4ee0a6ee6a766d7591e91e5663acf31562) --- Modified: modules/mtree/mtree.h --- Diff: https://github.com/kamailio/kamailio/commit/bfe40dd69e154b90820d8e87ea5ea46… Patch: https://github.com/kamailio/kamailio/commit/bfe40dd69e154b90820d8e87ea5ea46… --- diff --git a/modules/mtree/mtree.h b/modules/mtree/mtree.h index 662f6cf..923c801 100644 --- a/modules/mtree/mtree.h +++ b/modules/mtree/mtree.h @@ -59,7 +59,7 @@ typedef struct _mt_node struct _mt_node *child; } mt_node_t; -#define MT_MAX_DEPTH 32 +#define MT_MAX_DEPTH 64 #define MT_NODE_SIZE mt_char_list.len

8 years, 11 months

git:master:a221ec34: tm: extended docs for t_reply()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a221ec34074c25838f470070cb6c7e604a33fc98 URL: https://github.com/kamailio/kamailio/commit/a221ec34074c25838f470070cb6c7e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-08T22:37:07+02:00 tm: extended docs for t_reply() --- Modified: modules/tm/README Modified: modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/a221ec34074c25838f470070cb6c7e6… Patch: https://github.com/kamailio/kamailio/commit/a221ec34074c25838f470070cb6c7e6… --- diff --git a/modules/tm/README b/modules/tm/README index 01ec6ac..3b30194 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -1728,7 +1728,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 @@ -1829,6 +1829,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 59955bc..b53b97d 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>

8 years, 11 months

git:master:29aa683f: sl: extended docs for sl_send_reply()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 29aa683f7c3d507a88b83ecd84d9023c5e162ab1 URL: https://github.com/kamailio/kamailio/commit/29aa683f7c3d507a88b83ecd84d9023… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-08T22:37:07+02:00 sl: extended docs for sl_send_reply() --- Modified: modules/sl/README Modified: modules/sl/doc/sl_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/29aa683f7c3d507a88b83ecd84d9023… Patch: https://github.com/kamailio/kamailio/commit/29aa683f7c3d507a88b83ecd84d9023… --- 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>

8 years, 11 months

git:master:e42c4401: ims_charging: In case of Tel-URIs, use type END_USER_E164 and STRIP tel: (Bugfix)

by Carsten Bock

Module: kamailio Branch: master Commit: e42c4401a73f3707db4d0146a6cdf3adcd45699f URL: https://github.com/kamailio/kamailio/commit/e42c4401a73f3707db4d0146a6cdf3a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-06-08T13:49:39+02:00 ims_charging: In case of Tel-URIs, use type END_USER_E164 and STRIP tel: (Bugfix) --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/e42c4401a73f3707db4d0146a6cdf3a… Patch: https://github.com/kamailio/kamailio/commit/e42c4401a73f3707db4d0146a6cdf3a… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 7215036..ab2488a 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -547,6 +547,9 @@ void send_ccr_interim(struct ro_session* ro_session, unsigned int used, unsigned //getting subscription id type if (strncasecmp(subscr.id.s, "tel:", 4) == 0) { subscr.type = Subscription_Type_MSISDN; + // Strip "tel:": + subscr.id.s += 4; + subscr.id.len -= 4; } else { subscr.type = Subscription_Type_IMPU; //default is END_USER_SIP_URI } @@ -780,6 +783,9 @@ void send_ccr_stop(struct ro_session *ro_session) { //getting subscription id type if (strncasecmp(subscr.id.s, "tel:", 4) == 0) { subscr.type = Subscription_Type_MSISDN; + // Strip "tel:": + subscr.id.s += 4; + subscr.id.len -= 4; } else { subscr.type = Subscription_Type_IMPU; //default is END_USER_SIP_URI } @@ -996,6 +1002,9 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, int reservat //getting subscription id type if (strncasecmp(subscription_id.s, "tel:", 4) == 0) { subscription_id_type = Subscription_Type_MSISDN; + // Strip "tel:": + subscription_id.s += 4; + subscription_id.len -= 4; } else { subscription_id_type = Subscription_Type_IMPU; //default is END_USER_SIP_URI }

8 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015