mirror of https://github.com/sipwise/kamailio.git
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
305 lines
9.5 KiB
305 lines
9.5 KiB
Index: modules/dialplan/dialplan.c
|
|
===================================================================
|
|
--- modules/dialplan/dialplan.c (revisión: 9230)
|
|
+++ modules/dialplan/dialplan.c (revisión: 9231)
|
|
@@ -277,7 +277,7 @@
|
|
int no_change;
|
|
pv_value_t val;
|
|
|
|
- no_change = (dest->type == PVT_NONE) || (!repl->s) || (!repl->len);
|
|
+ no_change = (dest->type == PVT_NONE) || (!repl->s);
|
|
|
|
if (no_change)
|
|
goto set_attr_pvar;
|
|
Index: modules/dialplan/dp_repl.c
|
|
===================================================================
|
|
--- modules/dialplan/dp_repl.c (revisión: 9230)
|
|
+++ modules/dialplan/dp_repl.c (revisión: 9231)
|
|
@@ -147,41 +147,9 @@
|
|
subst_comp = rule->subst_comp;
|
|
repl_comp = rule->repl_comp;
|
|
|
|
- if(!repl_comp){
|
|
- LM_DBG("null replacement\n");
|
|
- return 0;
|
|
- }
|
|
-
|
|
- if(subst_comp){
|
|
- /*just in case something went wrong at load time*/
|
|
- rc = pcre_fullinfo(subst_comp, NULL, PCRE_INFO_CAPTURECOUNT,
|
|
- &cap_cnt);
|
|
- if (rc != 0) {
|
|
- LM_ERR("pcre_fullinfo on compiled pattern yielded error: %d\n",
|
|
- rc);
|
|
- return -1;;
|
|
- }
|
|
- if(repl_comp->max_pmatch > cap_cnt){
|
|
- LM_ERR("illegal access to the %i-th subexpr of the subst expr\n",
|
|
- repl_comp->max_pmatch);
|
|
- return -1;
|
|
- }
|
|
-
|
|
- /*search for the pattern from the compiled subst_exp*/
|
|
- if (pcre_exec(rule->subst_comp, NULL, string.s, string.len,
|
|
- 0, 0, ovector, 3 * (MAX_REPLACE_WITH + 1)) <= 0) {
|
|
- LM_ERR("the string %.*s matched "
|
|
- "the match_exp %.*s but not the subst_exp %.*s!\n",
|
|
- string.len, string.s,
|
|
- rule->match_exp.len, rule->match_exp.s,
|
|
- rule->subst_exp.len, rule->subst_exp.s);
|
|
- return -1;
|
|
- }
|
|
- }
|
|
-
|
|
- /*simply copy from the replacing string*/
|
|
- if(!subst_comp || (repl_comp->n_escapes <=0)){
|
|
- if(!repl_comp->replacement.s || repl_comp->replacement.len == 0){
|
|
+ if (!subst_comp) {
|
|
+ /*simply copy from the replacing string*/
|
|
+ if(!repl_comp || !repl_comp->replacement.s || repl_comp->replacement.len == 0){
|
|
LM_ERR("invalid replacing string\n");
|
|
goto error;
|
|
}
|
|
@@ -194,108 +162,156 @@
|
|
return 0;
|
|
}
|
|
|
|
- /* offset- offset in the replacement string */
|
|
- result->len = repl_nb = offset = 0;
|
|
- p=repl_comp->replacement.s;
|
|
+ /*just in case something went wrong at load time*/
|
|
+ rc = pcre_fullinfo(subst_comp, NULL, PCRE_INFO_CAPTURECOUNT,
|
|
+ &cap_cnt);
|
|
+ if (rc != 0) {
|
|
+ LM_ERR("pcre_fullinfo on compiled pattern yielded error: %d\n",
|
|
+ rc);
|
|
+ return -1;;
|
|
+ }
|
|
+ if(repl_comp && repl_comp->max_pmatch > cap_cnt){
|
|
+ LM_ERR("illegal access to the %i-th subexpr of the subst expr\n",
|
|
+ repl_comp->max_pmatch);
|
|
+ return -1;
|
|
+ }
|
|
|
|
- while( repl_nb < repl_comp->n_escapes){
|
|
+ /*search for the pattern from the compiled subst_exp*/
|
|
+ if (pcre_exec(rule->subst_comp, NULL, string.s, string.len,
|
|
+ 0, 0, ovector, 3 * (MAX_REPLACE_WITH + 1)) <= 0) {
|
|
+ LM_ERR("the string %.*s matched "
|
|
+ "the match_exp %.*s but not the subst_exp %.*s!\n",
|
|
+ string.len, string.s,
|
|
+ rule->match_exp.len, rule->match_exp.s,
|
|
+ rule->subst_exp.len, rule->subst_exp.s);
|
|
+ return -1;
|
|
+ }
|
|
|
|
- token = repl_comp->replace[repl_nb];
|
|
+ /* copy non-matched prefix of string to output */
|
|
+ if (ovector[0] > 0) {
|
|
+ if (ovector[0] >= MAX_PHONE_NB_DIGITS) {
|
|
+ LM_ERR("overflow\n");
|
|
+ goto error;
|
|
+ }
|
|
+ memcpy(result->s, string.s, ovector[0]);
|
|
+ result->len += ovector[0];
|
|
+ }
|
|
|
|
- if(offset< token.offset){
|
|
- if((repl_comp->replacement.len < offset)||
|
|
+ if (repl_comp) {
|
|
+ /* offset- offset in the replacement string */
|
|
+ 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){
|
|
+ if((repl_comp->replacement.len < offset)||
|
|
(result->len + token.offset -offset >= MAX_PHONE_NB_DIGITS)){
|
|
- LM_ERR("invalid length\n");
|
|
- goto error;
|
|
- }
|
|
- /*copy from the replacing string*/
|
|
- 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;
|
|
- offset = token.offset;
|
|
- }
|
|
-
|
|
- switch(token.type) {
|
|
- case REPLACE_NMATCH:
|
|
- /*copy from the match subexpression*/
|
|
- match_nb = token.u.nmatch * 2;
|
|
- match.s = string.s + ovector[match_nb];
|
|
- match.len = ovector[match_nb + 1] - ovector[match_nb];
|
|
- if(result->len + match.len >= MAX_PHONE_NB_DIGITS){
|
|
- LM_ERR("overflow\n");
|
|
+ LM_ERR("invalid length\n");
|
|
goto error;
|
|
}
|
|
+ /*copy from the replacing string*/
|
|
+ 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;
|
|
+ offset = token.offset;
|
|
+ }
|
|
|
|
- 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;
|
|
+ switch(token.type) {
|
|
+ case REPLACE_NMATCH:
|
|
+ /*copy from the match subexpression*/
|
|
+ match_nb = token.u.nmatch * 2;
|
|
+ match.s = string.s + ovector[match_nb];
|
|
+ match.len = ovector[match_nb + 1] - ovector[match_nb];
|
|
+ if(result->len + match.len >= MAX_PHONE_NB_DIGITS){
|
|
+ LM_ERR("overflow\n");
|
|
+ goto error;
|
|
+ }
|
|
+
|
|
+ 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;
|
|
break;
|
|
- case REPLACE_CHAR:
|
|
- if(result->len + 1>= MAX_PHONE_NB_DIGITS){
|
|
- LM_ERR("overflow\n");
|
|
- goto error;
|
|
- }
|
|
- *(result->s + result->len) = token.u.c;
|
|
- LM_DBG("copying char <%c> token size %d\n",
|
|
+ case REPLACE_CHAR:
|
|
+ if(result->len + 1>= MAX_PHONE_NB_DIGITS){
|
|
+ LM_ERR("overflow\n");
|
|
+ goto error;
|
|
+ }
|
|
+ *(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;
|
|
+ result->len++;
|
|
+ offset += token.size;
|
|
break;
|
|
- case REPLACE_URI:
|
|
- if ( msg== NULL || msg->first_line.type!=SIP_REQUEST){
|
|
- LM_CRIT("uri substitution attempt on no request"
|
|
+ case REPLACE_URI:
|
|
+ if ( msg== NULL || msg->first_line.type!=SIP_REQUEST){
|
|
+ LM_CRIT("uri substitution attempt on no request"
|
|
" message\n");
|
|
- break; /* ignore, we can continue */
|
|
- }
|
|
- uri= (msg->new_uri.s)?(&msg->new_uri):
|
|
- (&msg->first_line.u.request.uri);
|
|
- if(result->len+uri->len>=MAX_PHONE_NB_DIGITS){
|
|
- LM_ERR("overflow\n");
|
|
- goto error;
|
|
- }
|
|
- memcpy(result->s + result->len, uri->s, uri->len);
|
|
- LM_DBG("copying uri <%.*s> token size %d\n",
|
|
+ break; /* ignore, we can continue */
|
|
+ }
|
|
+ uri= (msg->new_uri.s)?(&msg->new_uri):
|
|
+ (&msg->first_line.u.request.uri);
|
|
+ if(result->len+uri->len>=MAX_PHONE_NB_DIGITS){
|
|
+ LM_ERR("overflow\n");
|
|
+ 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;
|
|
+ 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, &token.u.spec, &sv) != 0) {
|
|
- LM_CRIT("item substitution returned error\n");
|
|
- break; /* ignore, we can continue */
|
|
- }
|
|
- if(result->len+sv.rs.len>=MAX_PHONE_NB_DIGITS){
|
|
- LM_ERR("rule_translate: overflow\n");
|
|
- goto error;
|
|
- }
|
|
- memcpy(result->s + result->len, sv.rs.s,
|
|
- sv.rs.len);
|
|
- LM_DBG("copying pvar value <%.*s> token size %d\n",
|
|
+ case REPLACE_SPEC:
|
|
+ if (msg== NULL) {
|
|
+ LM_DBG("replace spec attempted on no message\n");
|
|
+ break;
|
|
+ }
|
|
+ if (pv_get_spec_value(msg, &token.u.spec, &sv) != 0) {
|
|
+ LM_CRIT("item substitution returned error\n");
|
|
+ break; /* ignore, we can continue */
|
|
+ }
|
|
+ if(result->len+sv.rs.len>=MAX_PHONE_NB_DIGITS){
|
|
+ LM_ERR("rule_translate: overflow\n");
|
|
+ goto error;
|
|
+ }
|
|
+ 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;
|
|
+ result->len+=sv.rs.len;
|
|
+ offset += token.size;
|
|
break;
|
|
- default:
|
|
- LM_CRIT("unknown type %d\n", repl_comp->replace[repl_nb].type);
|
|
- /* ignore it */
|
|
+ default:
|
|
+ LM_CRIT("unknown type %d\n", repl_comp->replace[repl_nb].type);
|
|
+ /* ignore it */
|
|
+ }
|
|
+ repl_nb++;
|
|
}
|
|
- repl_nb++;
|
|
+ /* anything left? */
|
|
+ if(offset < repl_comp->replacement.len){
|
|
+ /*copy from the replacing string*/
|
|
+ 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;
|
|
+ }
|
|
}
|
|
- /* anything left? */
|
|
- if( repl_nb && offset < repl_comp->replacement.len){
|
|
- /*copy from the replacing string*/
|
|
- 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);
|
|
+
|
|
+ /* copy non-matched suffix of string to output */
|
|
+ size = string.len - ovector[1];
|
|
+ if (size > 0) {
|
|
+ if (result->len + size >= MAX_PHONE_NB_DIGITS) {
|
|
+ LM_ERR("overflow\n");
|
|
+ goto error;
|
|
+ }
|
|
+ memcpy(result->s + result->len, string.s + ovector[1], size);
|
|
result->len += size;
|
|
}
|
|
|