sr-dev March 2015

sr-dev@lists.kamailio.org

34 participants
191 discussions

git:master:82a441f1: dialplan: using $(avp("key")[*]) on subst rules
by Victor Seva 19 Mar '15

19 Mar '15

Module: kamailio Branch: master Commit: 82a441f1dd3ff4099d42d42758533fbcf6d7c8de URL: https://github.com/kamailio/kamailio/commit/82a441f1dd3ff4099d42d42758533fb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-03-19T18:01:40+01:00 dialplan: using $(avp("key")[*]) on subst rules --- Modified: modules/dialplan/dialplan.h Modified: modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/82a441f1dd3ff4099d42d42758533fb… Patch: https://github.com/kamailio/kamailio/commit/82a441f1dd3ff4099d42d42758533fb…

1 0

git:master:7d70bad7: dialplan: using $(avp("key")[*]) on match rules
by Victor Seva 19 Mar '15

19 Mar '15

Module: kamailio Branch: master Commit: 7d70bad74e6329dff0d22c3b215be8a56d696f79 URL: https://github.com/kamailio/kamailio/commit/7d70bad74e6329dff0d22c3b215be8a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-03-19T18:01:40+01:00 dialplan: using $(avp("key")[*]) on match rules --- Modified: modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/7d70bad74e6329dff0d22c3b215be8a… Patch: https://github.com/kamailio/kamailio/commit/7d70bad74e6329dff0d22c3b215be8a…

1 0

git:master:e5f8c686: Merge pull request #114 from giavac/master
by Daniel-Constantin Mierla 19 Mar '15

19 Mar '15

Module: kamailio Branch: master Commit: e5f8c686acd2e4d7e7009476699280efbbe7b6d2 URL: https://github.com/kamailio/kamailio/commit/e5f8c686acd2e4d7e7009476699280e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-19T16:42:17+01:00 Merge pull request #114 from giavac/master Minor typos in textops README --- Modified: modules/textops/README Modified: modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e5f8c686acd2e4d7e7009476699280e… Patch: https://github.com/kamailio/kamailio/commit/e5f8c686acd2e4d7e7009476699280e… --- diff --git a/modules/textops/README b/modules/textops/README index 83a9531..711d982 100644 --- a/modules/textops/README +++ b/modules/textops/README @@ -95,7 +95,7 @@ Juha Heinanen 1.1. search usage 1.2. search_body usage - 1.3. search_body usage + 1.3. search_hf usage 1.4. search_append usage 1.5. search_append_body usage 1.6. replace usage @@ -107,7 +107,7 @@ Juha Heinanen 1.12. subst_uri usage 1.13. subst usage 1.14. subst_body usage - 1.15. search_body usage + 1.15. subst_hf usage 1.16. set_body usage 1.17. set_reply_body usage 1.18. filter_body usage @@ -310,7 +310,7 @@ if ( search_body("[Ss][Ii][Pp]") ) { /*....*/ }; This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. - Example 1.3. search_body usage + Example 1.3. search_hf usage ... if ( search_hf("From", ":test@", "a") ) { /*....*/ }; ... @@ -454,8 +454,8 @@ if(has_body() && replace_body_atonce("^.+$", "")) if ( subst('/^To:(.*)sip:[^@]*@[a-zA-Z0-9.]+(.*)$/t:\1\u\2/ig') ) {}; # replace the uri in to: with the value of avp sip_address (just an example) -if ( subst('/^To:(.*)sip:[^@]*@[a-zA-Z0-9.]+(.*)$/t:\1$avp(sip_address)\2/ig') ) - {}; +if ( subst('/^To:(.*)sip:[^@]*@[a-zA-Z0-9.]+(.*)$/t:\1$avp(sip_address)\2/ig') +) {}; ... @@ -483,7 +483,8 @@ if (subst_uri('/^sip:([0-9]+)@(.*)$/sip:3463\1@\2;orig_uri=\0/i')){$ # adds the avp 'uri_prefix' as prefix to numeric uris, and save the original # uri (\0 match) as a parameter: orig_uri (just an example) -if (subst_uri('/^sip:([0-9]+)@(.*)$/sip:$avp(uri_prefix)\1@\2;orig_uri=\0/i')){$ +if (subst_uri('/^sip:([0-9]+)@(.*)$/sip:$avp(uri_prefix)\1@\2;orig_uri=\0/i')){ +$ ... @@ -550,7 +551,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. - Example 1.15. search_body usage + Example 1.15. subst_hf usage ... if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; ... @@ -1029,8 +1030,8 @@ text Example 1.38. append_body_part usage ... $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" -append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling -=required"); +append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handlin +g=required"); ... Will append this the body: ... diff --git a/modules/textops/doc/textops_admin.xml b/modules/textops/doc/textops_admin.xml index af9057a..8024429 100644 --- a/modules/textops/doc/textops_admin.xml +++ b/modules/textops/doc/textops_admin.xml @@ -157,7 +157,7 @@ if ( search_body("[Ss][Ii][Pp]") ) { /*....*/ }; FAILURE_ROUTE, BRANCH_ROUTE. </para> <example> - <title><function>search_body</function> usage</title> + <title><function>search_hf</function> usage</title> <programlisting format="linespecific"> ... if ( search_hf("From", ":test@", "a") ) { /*....*/ }; @@ -604,7 +604,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; FAILURE_ROUTE, BRANCH_ROUTE. </para> <example> - <title><function>search_body</function> usage</title> + <title><function>subst_hf</function> usage</title> <programlisting format="linespecific"> ... if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ };

1 0

git:master:5681e9c6: textops: minor typos in README
by Giacomo Vacca 19 Mar '15

19 Mar '15

Module: kamailio Branch: master Commit: 5681e9c6e9850eedd15e53219ce2bc55fd38dd90 URL: https://github.com/kamailio/kamailio/commit/5681e9c6e9850eedd15e53219ce2bc5… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2015-03-19T11:30:56-04:00 textops: minor typos in README --- Modified: modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/5681e9c6e9850eedd15e53219ce2bc5… Patch: https://github.com/kamailio/kamailio/commit/5681e9c6e9850eedd15e53219ce2bc5… --- diff --git a/modules/textops/README b/modules/textops/README index 83a9531..711d982 100644 --- a/modules/textops/README +++ b/modules/textops/README @@ -95,7 +95,7 @@ Juha Heinanen 1.1. search usage 1.2. search_body usage - 1.3. search_body usage + 1.3. search_hf usage 1.4. search_append usage 1.5. search_append_body usage 1.6. replace usage @@ -107,7 +107,7 @@ Juha Heinanen 1.12. subst_uri usage 1.13. subst usage 1.14. subst_body usage - 1.15. search_body usage + 1.15. subst_hf usage 1.16. set_body usage 1.17. set_reply_body usage 1.18. filter_body usage @@ -310,7 +310,7 @@ if ( search_body("[Ss][Ii][Pp]") ) { /*....*/ }; This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. - Example 1.3. search_body usage + Example 1.3. search_hf usage ... if ( search_hf("From", ":test@", "a") ) { /*....*/ }; ... @@ -454,8 +454,8 @@ if(has_body() && replace_body_atonce("^.+$", "")) if ( subst('/^To:(.*)sip:[^@]*@[a-zA-Z0-9.]+(.*)$/t:\1\u\2/ig') ) {}; # replace the uri in to: with the value of avp sip_address (just an example) -if ( subst('/^To:(.*)sip:[^@]*@[a-zA-Z0-9.]+(.*)$/t:\1$avp(sip_address)\2/ig') ) - {}; +if ( subst('/^To:(.*)sip:[^@]*@[a-zA-Z0-9.]+(.*)$/t:\1$avp(sip_address)\2/ig') +) {}; ... @@ -483,7 +483,8 @@ if (subst_uri('/^sip:([0-9]+)@(.*)$/sip:3463\1@\2;orig_uri=\0/i')){$ # adds the avp 'uri_prefix' as prefix to numeric uris, and save the original # uri (\0 match) as a parameter: orig_uri (just an example) -if (subst_uri('/^sip:([0-9]+)@(.*)$/sip:$avp(uri_prefix)\1@\2;orig_uri=\0/i')){$ +if (subst_uri('/^sip:([0-9]+)@(.*)$/sip:$avp(uri_prefix)\1@\2;orig_uri=\0/i')){ +$ ... @@ -550,7 +551,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. - Example 1.15. search_body usage + Example 1.15. subst_hf usage ... if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; ... @@ -1029,8 +1030,8 @@ text Example 1.38. append_body_part usage ... $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" -append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling -=required"); +append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handlin +g=required"); ... Will append this the body: ...

1 0

git:master:6c866c12: textops: minor typos in doc
by Giacomo Vacca 19 Mar '15

19 Mar '15

Module: kamailio Branch: master Commit: 6c866c1296a34e0733bf33a1feac57ca8bfc64d7 URL: https://github.com/kamailio/kamailio/commit/6c866c1296a34e0733bf33a1feac57c… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2015-03-19T11:28:58-04:00 textops: minor typos in doc --- Modified: modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c866c1296a34e0733bf33a1feac57c… Patch: https://github.com/kamailio/kamailio/commit/6c866c1296a34e0733bf33a1feac57c… --- diff --git a/modules/textops/doc/textops_admin.xml b/modules/textops/doc/textops_admin.xml index af9057a..8024429 100644 --- a/modules/textops/doc/textops_admin.xml +++ b/modules/textops/doc/textops_admin.xml @@ -157,7 +157,7 @@ if ( search_body("[Ss][Ii][Pp]") ) { /*....*/ }; FAILURE_ROUTE, BRANCH_ROUTE. </para> <example> - <title><function>search_body</function> usage</title> + <title><function>search_hf</function> usage</title> <programlisting format="linespecific"> ... if ( search_hf("From", ":test@", "a") ) { /*....*/ }; @@ -604,7 +604,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; FAILURE_ROUTE, BRANCH_ROUTE. </para> <example> - <title><function>search_body</function> usage</title> + <title><function>subst_hf</function> usage</title> <programlisting format="linespecific"> ... if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ };

1 0

[kamailio] Minor typos in textops README (#114)
by Giacomo Vacca 19 Mar '15

19 Mar '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/114 -- Commit Summary -- * textops: minor typos in doc * textops: minor typos in README -- File Changes -- M modules/textops/README (19) M modules/textops/doc/textops_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/114.patch https://github.com/kamailio/kamailio/pull/114.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/114

2 1

git:tmp/interconnectroute_module:296913c3: tmp/interconnectroute_module: added service code and leg info to inner query
by jaybeepee 19 Mar '15

19 Mar '15

Module: kamailio Branch: tmp/interconnectroute_module Commit: 296913c336259d769eb4135b459482d87d1d9fe5 URL: https://github.com/kamailio/kamailio/commit/296913c336259d769eb4135b459482d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-03-19T15:02:20+02:00 tmp/interconnectroute_module: added service code and leg info to inner query --- Modified: modules/interconnectroute/db.c --- Diff: https://github.com/kamailio/kamailio/commit/296913c336259d769eb4135b459482d… Patch: https://github.com/kamailio/kamailio/commit/296913c336259d769eb4135b459482d… --- diff --git a/modules/interconnectroute/db.c b/modules/interconnectroute/db.c index 4a8fd99..7a2f78e 100644 --- a/modules/interconnectroute/db.c +++ b/modules/interconnectroute/db.c @@ -25,6 +25,7 @@ static char *orig_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "SELECT FROM_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " "FROM service_rate " "WHERE '%.*s' like concat(FROM_PREFIX,'%') " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "ORDER BY length(FROM_PREFIX) desc limit 1 " ") " ") " @@ -45,6 +46,7 @@ static char *orig_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "UNION " "( " "SELECT TO_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "FROM service_rate " "WHERE '%.*s' like concat(TO_PREFIX,'%') " "ORDER BY length(TO_PREFIX) desc limit 1 " @@ -78,6 +80,7 @@ static char *term_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "SELECT FROM_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " "FROM service_rate " "WHERE '%.*s' like concat(FROM_PREFIX,'%') " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "ORDER BY length(FROM_PREFIX) desc limit 1 " ") " ") " @@ -100,6 +103,7 @@ static char *term_route_data_query = "select TFROM.INTERNAL_ID as FROM_TRUNK_ID, "SELECT TO_INTERCONNECT_PARTNER_ID AS IPID, PRIORITY " "FROM service_rate " "WHERE '%.*s' like concat(TO_PREFIX,'%') " +" AND SERVICE_CODE = '%.*s' AND LEG='%.*s' " "ORDER BY length(TO_PREFIX) desc limit 1 " ") " ") " @@ -171,13 +175,16 @@ int get_orig_route_data(str* a_number, str* b_number, str* leg, str* sc, ix_rout int num_rows; - if (strlen(orig_route_data_query) + a_number->len + a_number->len + b_number->len + b_number->len + leg->len + sc->len > QUERY_LEN) { + if (strlen(orig_route_data_query) + a_number->len + a_number->len + b_number->len + b_number->len + (3*leg->len) + (3*sc->len) > QUERY_LEN) { LM_ERR("query too big\n"); return -1; } - snprintf(query, QUERY_LEN, orig_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, b_number->len, b_number->s, - b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s); + snprintf(query, QUERY_LEN, orig_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, + sc->len, sc->s, leg->len, leg->s, + b_number->len, b_number->s, + sc->len, sc->s, leg->len, leg->s, + b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s); query_s.s = query; query_s.len = strlen(query); @@ -265,13 +272,16 @@ int get_term_route_data(str* a_number, str* b_number, str* leg, str* sc, str* ex int num_rows; - if (strlen(term_route_data_query) + a_number->len + a_number->len + b_number->len + a_number->len + leg->len + sc->len + ext_trunk_id->len > QUERY_LEN) { + if (strlen(term_route_data_query) + a_number->len + a_number->len + b_number->len + a_number->len + (3*leg->len) + (3*sc->len) + ext_trunk_id->len > QUERY_LEN) { LM_ERR("query too big\n"); return -1; } - snprintf(query, QUERY_LEN, term_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, b_number->len, b_number->s, - b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s, ext_trunk_id->len, ext_trunk_id->s); + snprintf(query, QUERY_LEN, term_route_data_query, a_number->len, a_number->s, a_number->len, a_number->s, + sc->len, sc->s, leg->len, leg->s, + b_number->len, b_number->s, + b_number->len, b_number->s, sc->len, sc->s, leg->len, leg->s, + sc->len, sc->s, leg->len, leg->s, ext_trunk_id->len, ext_trunk_id->s); query_s.s = query; query_s.len = strlen(query);

1 0

video conference in private network failure
by alandalus 19 Mar '15

19 Mar '15

Dear Kamailio Developer, we faces problem testing video conference between 3 user (more than 2 user) sip server - jitsi. We cannot traces due to no error logs found on kamailio server, as attached below. Could you help investigate the root cause? How could you perform video conferences by default is running on jitsi-sip server/kamailio ? We have succesfully testing video call on between 2 user sip. Thanks in advance , Best Regards,

1 1

[kamailio] Add kamailio-evapi-modules (#112)
by Eloy Coto 18 Mar '15

18 Mar '15

Hi, These changes create the kamailio-evapi-modules in debian wheezy + debian jessie. Before we don't have this module in the deb list. Could you check if I did all ok? It works in jessie but I want to know If I did 100% compliant Regards. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/112 -- Commit Summary -- * pkg/kamailio/deb/jessie: Add kamailio-evapi-modules -- File Changes -- M pkg/kamailio/deb/debian/control (12) M pkg/kamailio/deb/debian/rules (3) M pkg/kamailio/deb/jessie/control (12) M pkg/kamailio/deb/jessie/rules (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/112.patch https://github.com/kamailio/kamailio/pull/112.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/112

4 5

git:master:6484b199: tm: propagate the on_failure value in to the branch for t_suspend()
by Daniel-Constantin Mierla 18 Mar '15

18 Mar '15

Module: kamailio Branch: master Commit: 6484b199fb48acc2c55f318812f2c968b845ca80 URL: https://github.com/kamailio/kamailio/commit/6484b199fb48acc2c55f318812f2c96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-18T19:50:09+01:00 tm: propagate the on_failure value in to the branch for t_suspend() - likely lost when on_failure was added to each branch structure - reported by Mickael Marrache --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/6484b199fb48acc2c55f318812f2c96… Patch: https://github.com/kamailio/kamailio/commit/6484b199fb48acc2c55f318812f2c96… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 4b12dcf..4abfe72 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -93,6 +93,10 @@ int t_suspend(struct sip_msg *msg, LM_ERR("failed to add the blind UAC\n"); return -1; } + /* propagate failure route to new branch + * - failure route to be executed if the branch is not continued + * before timeout */ + t->uac[t->async_backup.blind_uac].on_failure = t->on_failure; } else { LM_DBG("this is a suspend on reply - setting msg flag to SUSPEND\n"); msg->msg_flags |= FL_RPL_SUSPENDED;

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2015