sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:4c65f4fd: dialplan: added append_branch parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4c65f4fd4dda697e48757e06e011fa58a2000588 URL: https://github.com/kamailio/kamailio/commit/4c65f4fd4dda697e48757e06e011fa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T09:21:59+02:00 dialplan: added append_branch parameter - control if the module should do append branch if r-uri or r-uri username are changed inside failure route - default value is 1 (append branch - preserves compatibility) --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/4c65f4fd4dda697e48757e06e011fa5… Patch: https://github.com/kamailio/kamailio/commit/4c65f4fd4dda697e48757e06e011fa5… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index cac1df7124..5a94e8c21c 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -85,6 +85,7 @@ dp_param_p default_par2 = NULL; int dp_fetch_rows = 1000; int dp_match_dynamic = 0; +int dp_append_branch = 1; static param_export_t mod_params[]={ { "db_url", PARAM_STR, &dp_db_url }, @@ -100,6 +101,7 @@ static param_export_t mod_params[]={ { "attrs_pvar", PARAM_STR, &attr_pvar_s }, { "fetch_rows", PARAM_INT, &dp_fetch_rows }, { "match_dynamic", PARAM_INT, &dp_match_dynamic }, + { "append_branch", PARAM_INT, &dp_append_branch }, {0,0,0} }; @@ -267,11 +269,15 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * dest, return -1; } - if(is_route_type(FAILURE_ROUTE) - && (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) { - if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) != 1) { - LM_ERR("append_branch action failed\n"); - return -1; + if(dp_append_branch!=0) { + if(is_route_type(FAILURE_ROUTE) + && (dest->type == PVT_RURI + || dest->type == PVT_RURI_USERNAME)) { + if(append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) + != 1) { + LM_ERR("append branch action failed\n"); + return -1; + } } }

7 years, 4 months

git:master:b59771bb: modules/sipcapture: fix (param_export_t).name typo

by Mikko Lehto

Module: kamailio Branch: master Commit: b59771bb81bbe240b98113252df10377a75da700 URL: https://github.com/kamailio/kamailio/commit/b59771bb81bbe240b98113252df1037… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-25T15:54:57+03:00 modules/sipcapture: fix (param_export_t).name typo --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/b59771bb81bbe240b98113252df1037… Patch: https://github.com/kamailio/kamailio/commit/b59771bb81bbe240b98113252df1037… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index beaff682d3..1c365f8168 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -367,7 +367,7 @@ static param_export_t params[] = { {"insert_retries", INT_PARAM, &insert_retries }, {"insert_retry_timeout", INT_PARAM, &insert_retry_timeout }, {"table_time_sufix", PARAM_STR, &table_time_sufix }, - {"topoh_unamsk", PARAM_INT, &sc_topoh_unmask }, + {"topoh_unmask", PARAM_INT, &sc_topoh_unmask }, {"nonsip_hook", PARAM_INT, &nonsip_hook }, {0, 0, 0} };

7 years, 4 months

git:5.0:605feb78: modules/sipcapture: fix (param_export_t).name typo

by Mikko Lehto

Module: kamailio Branch: 5.0 Commit: 605feb7876c4a4a70b3c336b477a597182a8e60a URL: https://github.com/kamailio/kamailio/commit/605feb7876c4a4a70b3c336b477a597… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-25T22:36:51+03:00 modules/sipcapture: fix (param_export_t).name typo (cherry picked from commit b59771bb81bbe240b98113252df10377a75da700) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/605feb7876c4a4a70b3c336b477a597… Patch: https://github.com/kamailio/kamailio/commit/605feb7876c4a4a70b3c336b477a597… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index efc53d1054..7167cf3053 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -367,7 +367,7 @@ static param_export_t params[] = { {"insert_retries", INT_PARAM, &insert_retries }, {"insert_retry_timeout", INT_PARAM, &insert_retry_timeout }, {"table_time_sufix", PARAM_STR, &table_time_sufix }, - {"topoh_unamsk", PARAM_INT, &sc_topoh_unmask }, + {"topoh_unmask", PARAM_INT, &sc_topoh_unmask }, {"nonsip_hook", PARAM_INT, &nonsip_hook }, {0, 0, 0} };

7 years, 4 months

git:master:f3a96c82: modules: readme files regenerated - dialplan ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f3a96c82dae858da68d586a2ded97d7ae3c11a2e URL: https://github.com/kamailio/kamailio/commit/f3a96c82dae858da68d586a2ded97d7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-25T19:46:22+02:00 modules: readme files regenerated - dialplan ... [skip ci] --- Modified: src/modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/f3a96c82dae858da68d586a2ded97d7… Patch: https://github.com/kamailio/kamailio/commit/f3a96c82dae858da68d586a2ded97d7…

7 years, 4 months

git:master:2cae9f8a: dialplan: added documentation for dp_match() and dp_translate()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2cae9f8a301befb0a00f1831c9d5773924e35c10 URL: https://github.com/kamailio/kamailio/commit/2cae9f8a301befb0a00f1831c9d5773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 dialplan: added documentation for dp_match() and dp_translate() --- Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2cae9f8a301befb0a00f1831c9d5773… Patch: https://github.com/kamailio/kamailio/commit/2cae9f8a301befb0a00f1831c9d5773… --- diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index 8153974401..073c2b24ed 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -394,6 +394,103 @@ modparam("dialplan", "match_dynamic", 1) <section> <title>Functions</title> + <section id="dialplan.p.dp_replace"> + <title> + <function moreinfo="none">dp_replace(dpid, inval, outvar)</function> + </title> + <para> + The function translates the input value 'inval' using the rules with dialplan + id 'dpid', storing the value in the variable 'outvar'. If the rule that was + applied has attributes, they are stored in the variable provided via the + module parameter 'attrs_pvar'. + </para> + <para> + The behavior is same as dp_translate("dpid", "inval/outvar"), but the + parameters have a more flexible format. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>dpid</emphasis> - the dialplan id to match the rules and apply + the transformations. It can be a static string or a config variable + holding an integer value. + </para> + </listitem> + <listitem> + <para> + <emphasis>inval</emphasis> - input value. It can be a static or a + dynamic string. The dynamic string can contain config variables, + combined or not with static strings, that are evaluated at runtime. + </para> + </listitem> + <listitem> + <para> + <emphasis>outvar</emphasis> - output variable name. The value resulted + after applying the matching rule is stored in this variable. The name + must refer to a writable variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dp_replace</function> usage</title> + <programlisting format="linespecific"> +... +dp_replace("240", "$rU", "$var(newru)"); +xlog("'$rU' was translated to '$var(newru)'\n"); +dp_replace("240", "+49$rU", "$var(newval)"); +... + </programlisting> + </example> + </section> + + <section id="dialplan.p.dp_match"> + <title> + <function moreinfo="none">dp_match(dpid, inval)</function> + </title> + <para> + The function matches the input value 'inval' using the rules with dialplan + id 'dpid'. If the rule that was applied has attributes, they are stored in + the variable provided via the module parameter 'attrs_pvar'. + </para> + <para> + The behavior is same as dp_translate("dpid", "inval"), but the + parameters have a more flexible format. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>dpid</emphasis> - the dialplan id to match the rules and apply + the transformations. It can be a static string or a config variable + holding an integer value. + </para> + </listitem> + <listitem> + <para> + <emphasis>inval</emphasis> - input value. It can be a static or a + dynamic string. The dynamic string can contain config variables, + combined or not with static strings, that are evaluated at runtime. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dp_match</function> usage</title> + <programlisting format="linespecific"> +... +dp_match("240", "+49$rU"); +xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); +... + </programlisting> + </example> + </section> + <section id="dialplan.p.dp_translate"> <title> <function moreinfo="none">dp_translate(id, [src[/dest]])</function>

7 years, 4 months

git:master:2c105fa6: dialplan: added dp_match() and dp_replace() functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2c105fa6a66e24a6d9e24f96b0f4c04b60ce0da9 URL: https://github.com/kamailio/kamailio/commit/2c105fa6a66e24a6d9e24f96b0f4c04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 dialplan: added dp_match() and dp_replace() functions - alternatives to dp_translate() with dedicated required parameters (avoiding second parameter of two variables separated by '/') - dp_match(dpid, inval) - dp_replace(dpid, inval, outvar) - dpid can be interger or variable - inval can be a static or dynamic (with vars) string - outvar has to be a writable variable --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dialplan.h Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/2c105fa6a66e24a6d9e24f96b0f4c04… Patch: https://github.com/kamailio/kamailio/commit/2c105fa6a66e24a6d9e24f96b0f4c04…

7 years, 4 months

git:master:e049d6db: core: added helper fixup for int and str dynamic parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e049d6db78d9a86049f88acc27188d726974054f URL: https://github.com/kamailio/kamailio/commit/e049d6db78d9a86049f88acc27188d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 core: added helper fixup for int and str dynamic parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/e049d6db78d9a86049f88acc27188d7… Patch: https://github.com/kamailio/kamailio/commit/e049d6db78d9a86049f88acc27188d7… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index d817b75565..3e8562add6 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -461,7 +461,6 @@ int fixup_igp_pvar(void** param, int param_no) } - int fixup_free_igp_pvar(void** param, int param_no) { if (param_no == 1) @@ -472,7 +471,6 @@ int fixup_free_igp_pvar(void** param, int param_no) } - int fixup_igp_pvar_pvar(void** param, int param_no) { if (param_no == 1) @@ -483,7 +481,6 @@ int fixup_igp_pvar_pvar(void** param, int param_no) } - int fixup_free_igp_pvar_pvar(void** param, int param_no) { if (param_no == 1) @@ -494,6 +491,25 @@ int fixup_free_igp_pvar_pvar(void** param, int param_no) } +int fixup_igp_spve(void** param, int param_no) +{ + if (param_no == 1) + return fixup_igp_null(param, param_no); + else if (param_no == 2) + return fixup_spve_all(param, param_no); + return E_UNSPEC; +} + + +int fixup_free_igp_spve(void** param, int param_no) +{ + if (param_no == 1) + return fixup_free_igp_null(param, param_no); + else if (param_no == 2) + return fixup_free_spve_all(param, param_no); + return E_UNSPEC; +} + /** macro for declaring a spve fixup and the corresponding free_fixup * for a function expecting first no1 params as fparam converted spve diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 835342ab86..869dd78527 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -122,6 +122,12 @@ int fixup_free_igp_pvar(void** param, int param_no); int fixup_igp_pvar_pvar(void** param, int param_no); int fixup_free_igp_pvar_pvar(void** param, int param_no); +int fixup_igp_spve(void** param, int param_no); +int fixup_free_igp_spve(void** param, int param_no); + +int fixup_pvar_all(void** param, int param_no); +int fixup_free_pvar_all(void** param, int param_no); + int fixup_spve_spve(void** param, int param_no); int fixup_free_spve_spve(void** param, int param_no); int fixup_spve_null(void** param, int param_no);

7 years, 4 months

git:master:36b8c1a1: dialplan: increased the size for dialplan attributes to 256

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36b8c1a138548ea3689cac77e18ac304ec2ee0e5 URL: https://github.com/kamailio/kamailio/commit/36b8c1a138548ea3689cac77e18ac30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 dialplan: increased the size for dialplan attributes to 256 --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/36b8c1a138548ea3689cac77e18ac30… Patch: https://github.com/kamailio/kamailio/commit/36b8c1a138548ea3689cac77e18ac30… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 85741677df..28d555bbdd 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -571,7 +571,7 @@ int rule_translate(sip_msg_t *msg, str string, dpl_node_t * rule, return -1; } -#define DP_MAX_ATTRS_LEN 128 +#define DP_MAX_ATTRS_LEN 255 static char dp_attrs_buf[DP_MAX_ATTRS_LEN+1]; int translate(sip_msg_t *msg, str input, str *output, dpl_id_p idp, str *attrs)

7 years, 4 months

git:master:c9ff171b: modules: readme files regenerated - sipcapture ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c9ff171b4ce90671eebbef914e12e8d59521e621 URL: https://github.com/kamailio/kamailio/commit/c9ff171b4ce90671eebbef914e12e8d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-25T15:01:20+02:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/c9ff171b4ce90671eebbef914e12e8d… Patch: https://github.com/kamailio/kamailio/commit/c9ff171b4ce90671eebbef914e12e8d… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index 451628d8b3..bc7bc6694f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -49,6 +49,7 @@ Alexandr Dubovikov 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -84,8 +85,9 @@ Alexandr Dubovikov 1.18. Set insert_retry_timeout parameter 1.19. Set callid_aleg_header parameter 1.20. Set topoh_unmask parameter - 1.21. sip_capture() usage - 1.22. report_capture() usage + 1.21. Set nonsip_hook parameter + 1.22. sip_capture() usage + 1.23. report_capture() usage Chapter 1. Admin Guide @@ -119,6 +121,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -186,6 +189,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 3.1. db_url (str) @@ -456,6 +460,18 @@ modparam("sipcapture", "callid_aleg_header", "X-CallIDALeg") modparam("sipcapture", "topoh_unmask", 1) ... +3.21. nonsip_hook (int) + + If set to 1, event route sipcapture:siprequest is run when HEP message + is received. + + Default value is 0. + + Example 1.21. Set nonsip_hook parameter +... +modparam("sipcapture", "nonsip_hook", 1) +... + 4. Functions 4.1. sip_capture([table]) @@ -477,7 +493,7 @@ modparam("sipcapture", "topoh_unmask", 1) ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.21. sip_capture() usage + Example 1.22. sip_capture() usage ... sip_capture(); ... @@ -496,7 +512,7 @@ sip_capture("sip_capture_call_20160124"); ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.22. report_capture() usage + Example 1.23. report_capture() usage ... report_capture(); ...

7 years, 4 months

git:master:2f872dcc: modules/sipcapture: improve nonsip_hook documentation

by Mikko Lehto

Module: kamailio Branch: master Commit: 2f872dcc684a345cff09a437ae4a3767613b5529 URL: https://github.com/kamailio/kamailio/commit/2f872dcc684a345cff09a437ae4a376… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-25T15:54:57+03:00 modules/sipcapture: improve nonsip_hook documentation --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/examples/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/2f872dcc684a345cff09a437ae4a376… Patch: https://github.com/kamailio/kamailio/commit/2f872dcc684a345cff09a437ae4a376… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8916317cb0..d9d47cceda 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -493,6 +493,26 @@ modparam("sipcapture", "topoh_unmask", 1) </programlisting> </example> </section> + + <section id="sipcapture.p.nonsip_hook"> + <title><varname>nonsip_hook</varname> (int)</title> + <para> + If set to 1, event route <emphasis>sipcapture:siprequest</emphasis> is + run when HEP message is received. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>nonsip_hook</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sipcapture", "nonsip_hook", 1) +... + </programlisting> + </example> + </section> + </section> <section> <title>Functions</title> diff --git a/src/modules/sipcapture/examples/kamailio.cfg b/src/modules/sipcapture/examples/kamailio.cfg index 3d42a78f47..14a5641a1c 100644 --- a/src/modules/sipcapture/examples/kamailio.cfg +++ b/src/modules/sipcapture/examples/kamailio.cfg @@ -861,10 +861,6 @@ route[STORE] { sip_capture("$var(a)"); } -event_route[sipcapture:request] { - xlog("received sipcapture request from $si:$sp\r\n"); -} - #!ifdef WITH_HOMER_CUSTOM_STATS event_route[xhttp:request] { set_reply_close(); @@ -908,12 +904,14 @@ event_route[xhttp:request] { event_route[sipcapture:request] { - xlog("HEP Request!\n"); - xlog("received sipcapture request from $si:$sp\r\n"); - xlog("HEP VERSION $hep(version) request from $si:$sp\r\n"); - xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\r\n"); + xlog("HEP Request!\n"); + xlog("received sipcapture request from $si:$sp\n"); + xlog("HEP VERSION $hep(version) request from $si:$sp\n"); + xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\n"); + #Is it SIP ? - if($hep(0x00b) == 1){ + if($hep(0x00b) == 1) + { #Do parsing internal return 1; @@ -921,8 +919,8 @@ event_route[sipcapture:request] { else { #If report lets proceed here with payload - xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\r\n"); - return 0; + xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\n"); + return 0; } }

7 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017