sr-dev February 2011

sr-dev@lists.kamailio.org

22 participants
124 discussions

git:master: modules/dialplan: more repl_exp fixes

by Juha Heinanen

Module: sip-router Branch: master Commit: d8ae33c90851cfca9c956574f3ed1f82fc4da651 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8ae33c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Feb 27 05:59:16 2011 +0200 modules/dialplan: more repl_exp fixes - Now also REPLACE_CHAR, REPLACE_URI, and REPLACE_SPEC repl_exp tokens should work. --- modules/dialplan/dp_repl.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 1fe11ad..1e4e7d4 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -72,7 +72,7 @@ struct subst_expr* repl_exp_parse(str subst) repl = p; if((rw_no = parse_repl(rw, &p, end, &max_pmatch, WITHOUT_SEP))< 0) goto error; - + repl_end=p; /* construct the subst_expr structure */ @@ -179,6 +179,7 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, result->s[result->len] = '\0'; return 0; } + /* offset- offset in the replacement string */ result->len = repl_nb = offset = 0; p=repl_comp->replacement.s; @@ -199,7 +200,7 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, LM_DBG("copying <%.*s> from replacing string\n", size, p + offset); result->len += size; - offset = token.offset; /*update the offset*/ + offset = token.offset; } switch(token.type) { @@ -217,15 +218,18 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, LM_DBG("copying match <%.*s> token size %d\n", match.len, match.s, token.size); result->len += match.len; - offset += token.size; /*update the offset*/ + offset += token.size; break; case REPLACE_CHAR: if(result->len + 1>= MAX_PHONE_NB_DIGITS){ LM_ERR("overflow\n"); goto error; } - *result->s=repl_comp->replace[repl_nb].u.c; + *(result->s + result->len) = token.u.c; + LM_DBG("copying char <%c> token size %d\n", + token.u.c, token.size); result->len++; + offset += token.size; break; case REPLACE_URI: if ( msg== NULL || msg->first_line.type!=SIP_REQUEST){ @@ -240,15 +244,17 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, goto error; } memcpy(result->s + result->len, uri->s, uri->len); + LM_DBG("copying uri <%.*s> token size %d\n", + uri->len, uri->s, token.size); result->len+=uri->len; + offset += token.size; break; case REPLACE_SPEC: if (msg== NULL) { LM_DBG("replace spec attempted on no message\n"); break; } - if(pv_get_spec_value(msg, - &repl_comp->replace[repl_nb].u.spec, &sv)!=0){ + if (pv_get_spec_value(msg, &token.u.spec, &sv) != 0) { LM_CRIT("item substitution returned error\n"); break; /* ignore, we can continue */ } @@ -256,8 +262,12 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, LM_ERR("rule_translate: overflow\n"); goto error; } - memcpy(result->s + result->len, sv.rs.s, sv.rs.len); + memcpy(result->s + result->len, sv.rs.s, + sv.rs.len); + LM_DBG("copying pvar value <%.*s> token size %d\n", + sv.rs.len, sv.rs.s, token.size); result->len+=sv.rs.len; + offset += token.size; break; default: LM_CRIT("unknown type %d\n", repl_comp->replace[repl_nb].type);

13 years, 8 months

[tracker] Task closed: bug in dialplan or core re.c

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#115 - bug in dialplan or core re.c User who did this - Juha Heinanen (jh) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=115 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 8 months

[tracker] Comment added: bug in dialplan or core re.c

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#115 - bug in dialplan or core re.c User who did this - Juha Heinanen (jh) ---------- i have made the tests with latest 3.1 from git. here is what happens with subst_exp ^(.+:)\+358(.+) and input uri sip:+35892345674@test.fi using various repl_exps: - if repl_exp is \1\2, i get what is expected, i.e., both \1 and \2 are replaced and consumed: Feb 22 09:40:39 sip /usr/sbin/sip-proxy[7323]: INFO: uri <sip:92345674@test.fi> - if repl_exp is \1X\2, \1 is replaced but not consumed and i get: Feb 22 09:42:48 sip /usr/sbin/sip-proxy[7484]: INFO: uri <sip:\1X92345674@test.fi> - if repl_exp is \1X\2Y, i get Feb 22 09:44:50 sip /usr/sbin/sip-proxy[7642]: INFO: uri <sip:\1X92345674@test.fiY> i.e., \2 is correctly replaced and consumed, but again \1 is replaced, but not consumed. -- juha Feb 22 09:44:16 sip /usr/sbin/sip-proxy[7481]: INFO: pai_uri <sip:\1X92345674@test.fi> Feb 22 09:44:51 sip /usr/sbin/sip-proxy[7640]: NOTICE: Discarding unmatched CANCEL to <sip:032345670@test.fi> ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=115#comment166 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 8 months

git:master: siputils: readme updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1147c09665a05d4af5f1b48764a78fb47649a930 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1147c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 20:26:54 2011 +0100 siputils: readme updated - updated the description of the functions that can be used in ANY_ROUTE --- modules_k/siputils/README | 12 +++++++----- modules_k/siputils/doc/siputils_admin.xml | 8 +++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index e37d933..23ccd30 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -24,6 +24,10 @@ Gabriel Vasile FhG FOKUS +Juha Heinanen + + TutPro Inc. + Edited by Jan Janak @@ -424,7 +428,7 @@ if (is_user("john")) { Check if To header field uri contains tag parameter. - This function can be used from REQUEST_ROUTE. + This function can be used from ANY_ROUTE. Example 1.13. has_totag usage ... @@ -613,8 +617,7 @@ reply_route[2] { The function returns true if the two parameters matches as SIP URI. - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. Example 1.23. cmp_uri usage ... @@ -629,8 +632,7 @@ if(cmp_uri("$ru", "sip:kamailio@kamailio.org")) The function returns true if the two parameters matches as AoR. The parameters have to be SIP URIs. - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. Example 1.24. cmp_aor usage ... diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index 8511da9..fd8ec1d 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -375,7 +375,7 @@ if (is_user("john")) { Check if To header field uri contains tag parameter. </para> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>has_totag</function> usage</title> @@ -684,8 +684,7 @@ reply_route[2] { the two parameters matches as SIP URI. </para> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>cmp_uri</function> usage</title> @@ -710,8 +709,7 @@ if(cmp_uri("$ru", "sip:kamailio@kamailio.org")) URIs. </para> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>cmp_aor</function> usage</title>

13 years, 8 months

git:master: siputils: several functions updated to ANY_ROUTE

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3a1be374d4575e91ba7196db77813df836d98f99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a1be37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 20:25:29 2011 +0100 siputils: several functions updated to ANY_ROUTE - has_totag() and comparison of uri or aor can work for requests and reply routes --- modules_k/siputils/siputils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 1eace83..3b31ad0 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -116,7 +116,7 @@ static cmd_export_t cmds[]={ {"ring_insert_callid", (cmd_function)ring_insert_callid, 0, ring_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"options_reply", (cmd_function)opt_reply, 0, 0, 0, REQUEST_ROUTE}, {"is_user", (cmd_function)is_user, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"has_totag", (cmd_function)has_totag, 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"has_totag", (cmd_function)has_totag, 0, 0, 0, ANY_ROUTE}, {"uri_param", (cmd_function)uri_param_1, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, {"uri_param", (cmd_function)uri_param_2, 2, fixup_str_str, 0, REQUEST_ROUTE|LOCAL_ROUTE}, {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, @@ -128,10 +128,10 @@ static cmd_export_t cmds[]={ {"decode_contact_header", (cmd_function)decode_contact_header,0,0,0,REQUEST_ROUTE|ONREPLY_ROUTE}, {"cmp_uri", (cmd_function)w_cmp_uri, 2, fixup_spve_spve, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, 0, REQUEST_ROUTE}, {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0,

13 years, 8 months

git:master: version set to 3.2.0-dev3

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fe40de5b32ae44df06b97b25016caec1f8666894 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe40de5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 15:24:30 2011 +0100 version set to 3.2.0-dev3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 9d7fd99..008316c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -160,7 +160,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory debugger switcher # 0 - off (release mode)

13 years, 8 months

git:master: modules/dialplan: fixed processing of repl_exp

by Juha Heinanen

Module: sip-router Branch: master Commit: c3a1e2ed57337c6db94b01fc794c67631fd847b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3a1e2e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Feb 26 05:12:58 2011 +0200 modules/dialplan: fixed processing of repl_exp --- modules/dialplan/dp_repl.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 265b507..1fe11ad 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -179,12 +179,12 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, result->s[result->len] = '\0'; return 0; } - /* offset- offset in the replacement string */ result->len = repl_nb = offset = 0; p=repl_comp->replacement.s; - + while( repl_nb < repl_comp->n_escapes){ + token = repl_comp->replace[repl_nb]; if(offset< token.offset){ @@ -194,12 +194,12 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, goto error; } /*copy from the replacing string*/ - size=repl_comp->replacement.s+repl_comp->replace[repl_nb].offset-p; - memcpy(result->s + result->len, p, size); + size = token.offset - offset; + memcpy(result->s + result->len, p + offset, size); + LM_DBG("copying <%.*s> from replacing string\n", + size, p + offset); result->len += size; - p+=size+repl_comp->replace[repl_nb].size; - - offset += token.offset-offset; /*update the offset*/ + offset = token.offset; /*update the offset*/ } switch(token.type) { @@ -214,6 +214,8 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, } memcpy(result->s + result->len, match.s, match.len); + LM_DBG("copying match <%.*s> token size %d\n", + match.len, match.s, token.size); result->len += match.len; offset += token.size; /*update the offset*/ break; @@ -264,10 +266,12 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, repl_nb++; } /* anything left? */ - if( repl_nb && token.offset+token.size < repl_comp->replacement.len){ + if( repl_nb && offset < repl_comp->replacement.len){ /*copy from the replacing string*/ - size = repl_comp->replacement.s+repl_comp->replacement.len-p; - memcpy(result->s + result->len, p, size); + size = repl_comp->replacement.len - offset; + memcpy(result->s + result->len, p + offset, size); + LM_DBG("copying leftover <%.*s> from replacing string\n", + size, p + offset); result->len += size; }

13 years, 8 months

git:3.1: htable: fix typo in readme example

by Elena-Ramona Modroiu

Module: sip-router Branch: 3.1 Commit: e3556ac9a50589700305e56e638b25c53d5b2ef1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3556ac… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Fri Feb 25 12:24:46 2011 +0100 htable: fix typo in readme example - $null missing the $ - reported by Ricardo Martinez --- modules_k/htable/README | 8 ++++---- modules_k/htable/doc/htable.xml | 6 +++--- modules_k/htable/doc/htable_admin.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules_k/htable/README b/modules_k/htable/README index facb147..c5a0326 100644 --- a/modules_k/htable/README +++ b/modules_k/htable/README @@ -3,15 +3,15 @@ HTable Module Elena-Ramona Modroiu asipto.com - <ramona(a)rosdev.ro> + <ramona(a)asipto.com> Edited by Elena-Ramona Modroiu - <ramona(a)rosdev.ro> + <ramona(a)asipto.com> - Copyright © 2008 http://www.asipto.com + Copyright © 2008-2011 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -179,7 +179,7 @@ if(is_present_hf("Authorization")) sl_send_reply("403", "Forbidden"); exit; case -2: - if($sht(a=>$au::auth_count) == null) + if($sht(a=>$au::auth_count) == $null) $sht(a=>$au::auth_count) = 0; $sht(a=>$au::auth_count) = $sht(a=>$au::auth_count) + 1; if($sht(a=>$au::auth_count) == 3) diff --git a/modules_k/htable/doc/htable.xml b/modules_k/htable/doc/htable.xml index f4d31b2..1ef596c 100644 --- a/modules_k/htable/doc/htable.xml +++ b/modules_k/htable/doc/htable.xml @@ -17,7 +17,7 @@ <firstname>Elena-Ramona</firstname> <surname>Modroiu</surname> <affiliation><orgname>asipto.com</orgname></affiliation> - <email>ramona(a)rosdev.ro</email> + <email>ramona(a)asipto.com</email> <address> <otheraddr> <ulink url="http://www.asipto.com">http://www.asipto.com</ulink> @@ -27,11 +27,11 @@ <editor> <firstname>Elena-Ramona</firstname> <surname>Modroiu</surname> - <email>ramona(a)rosdev.ro</email> + <email>ramona(a)asipto.com</email> </editor> </authorgroup> <copyright> - <year>2008</year> + <year>2008-2011</year> <holder>http://www.asipto.com</holder> </copyright> </bookinfo> diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index e2c2be6..79c477b 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -91,7 +91,7 @@ if(is_present_hf("Authorization")) sl_send_reply("403", "Forbidden"); exit; case -2: - if($sht(a=>$au::auth_count) == null) + if($sht(a=>$au::auth_count) == $null) $sht(a=>$au::auth_count) = 0; $sht(a=>$au::auth_count) = $sht(a=>$au::auth_count) + 1; if($sht(a=>$au::auth_count) == 3)

13 years, 8 months

git:master: htable: fixed typo in example

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 62c8fbb721c1432466a529ab960f9ed5b7463826 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62c8fbb… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Fri Feb 25 12:09:04 2011 +0100 htable: fixed typo in example - $null was using 1.x format (missing $) - reported by Ricardo Martinez --- modules_k/htable/README | 4 ++-- modules_k/htable/doc/htable_admin.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/htable/README b/modules_k/htable/README index 7cd7da8..83f2cec 100644 --- a/modules_k/htable/README +++ b/modules_k/htable/README @@ -11,7 +11,7 @@ Elena-Ramona Modroiu <ramona(a)rosdev.ro> - Copyright © 2008 http://www.asipto.com + Copyright © 2008-2011 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -179,7 +179,7 @@ if(is_present_hf("Authorization")) sl_send_reply("403", "Forbidden"); exit; case -2: - if($sht(a=>$au::auth_count) == null) + if($sht(a=>$au::auth_count) == $null) $sht(a=>$au::auth_count) = 0; $sht(a=>$au::auth_count) = $sht(a=>$au::auth_count) + 1; if($sht(a=>$au::auth_count) == 3) diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index 56e921b..dc27cb8 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -91,7 +91,7 @@ if(is_present_hf("Authorization")) sl_send_reply("403", "Forbidden"); exit; case -2: - if($sht(a=>$au::auth_count) == null) + if($sht(a=>$au::auth_count) == $null) $sht(a=>$au::auth_count) = 0; $sht(a=>$au::auth_count) = $sht(a=>$au::auth_count) + 1; if($sht(a=>$au::auth_count) == 3)

13 years, 8 months

Help with Git for commiting changes in a module

by Iñaki Baz Castillo

Hi, I've coded some modifications to regex module in my local branch ibc/regex. I've also commited the branch to the server with same name ibc/regex. Now my question is: how to commit such changes into remote master? Some options I've in mind: a) Commit from my local ibc/regex branch to remote branch, and later update my local master branch: ~# git branch ibc/regex ~# git push origin ibc/regex:master ~# git fetch origin ~# git pull --rebase origin master b) Merging my local ibc/regex module into my local master branch and commit to remote master: ~# git checkout master ~# git merge --log --no-ff ibc/regex ~# git push origin master:master Suggestions please? thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

13 years, 9 months

← Newer
1
2
3
4
5
6
7
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2011