sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:tma0/iptrtpproxy-v2: - added ser module for new version of iptrtpproxy-v2
by Tomas Mandys 03 Mar '11

03 Mar '11

Module: sip-router Branch: tma0/iptrtpproxy-v2 Commit: ffa10596bcfb14d5204f0d268bf1c73857982218 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffa1059… Author: root <root(a)hp07.iptel.org> Committer: root <root(a)hp07.iptel.org> Date: Thu Mar 3 19:58:35 2011 +0100 - added ser module for new version of iptrtpproxy-v2 - modified oob script to simplify patching with RTPPROXY stuff - rtpproxy control rewritten in script - re-INVITE won't proactively create new RTP session, it's not fully RFC3264 compliant but enable working with non-compliant clients (phones) --- etc/sip-router-oob.cfg | 132 +- modules/iptrtpproxy/Makefile | 19 +- modules/iptrtpproxy/doc/iptrtpproxy.xml | 402 +++- modules/iptrtpproxy/examples/ser.cfg | 225 -- modules/iptrtpproxy/iptrtpproxy.c | 2892 ++++++++++++++++---- .../{examples => oob}/clean_rtpproxy_attrs | 127 +- .../{examples => oob}/rtpproxy_attrs.sql | 0 .../oob/sip-router-oob-RTPPROXY.cfg.inc | 428 +++ .../oob/sip-router-oob-RTPPROXY.cfg.patch | 152 + 9 files changed, 3420 insertions(+), 957 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ffa…

1 0

git:tma0/iptrtpproxy-v2: - taken changes from modules_k ( missing pre_auth enums handled in switch)
by Tomas Mandys 03 Mar '11

03 Mar '11

Module: sip-router Branch: tma0/iptrtpproxy-v2 Commit: e0fe362a5c661714bc7b2f16f8f6c6ba1857914e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0fe362… Author: root <root(a)hp07.iptel.org> Committer: root <root(a)hp07.iptel.org> Date: Thu Mar 3 12:36:19 2011 +0100 - taken changes from modules_k (missing pre_auth enums handled in switch) --- modules_s/auth_db/authorize.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_s/auth_db/authorize.c b/modules_s/auth_db/authorize.c index da1d6b4..0668dae 100644 --- a/modules_s/auth_db/authorize.c +++ b/modules_s/auth_db/authorize.c @@ -332,6 +332,18 @@ static inline int authenticate(struct sip_msg* msg, str* realm, authdb_table_inf ret = -1; switch(auth_api.pre_auth(msg, realm, hftype, &h, NULL)) { + case NONCE_REUSED: + LM_DBG("nonce reused"); + ret = AUTH_NONCE_REUSED; + goto end; + case STALE_NONCE: + LM_DBG("stale nonce\n"); + ret = AUTH_STALE_NONCE; + goto end; + case NO_CREDENTIALS: + LM_DBG("no credentials\n"); + ret = AUTH_NO_CREDENTIALS; + goto end; case ERROR: case BAD_CREDENTIALS: ret = -3;

1 0

git:3.1: modules/dialplan: fixed processing of repl_exp
by Juha Heinanen 01 Mar '11

01 Mar '11

Module: sip-router Branch: 3.1 Commit: d0902f41560a3015a19aa8728c9dda37863ec817 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0902f4… 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 (cherry picked from commit c3a1e2ed57337c6db94b01fc794c67631fd847b9) --- 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; }

1 0

git:3.1: modules/dialplan: more repl_exp fixes
by Juha Heinanen 01 Mar '11

01 Mar '11

Module: sip-router Branch: 3.1 Commit: ab12fc81f9861b8192b4f2d50465312782030d28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab12fc8… 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. (cherry picked from commit d8ae33c90851cfca9c956574f3ed1f82fc4da651) --- 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);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011