<div dir="ltr">Hi Daniel,<div>I saw it and I'm fine with it. Thank you for the contribution :)</div><div><br></div><div>Regards,</div><div><br></div><div>Federico</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Sep 18, 2015 at 3:29 PM, Daniel-Constantin Mierla <span dir="ltr"><<a href="mailto:miconda@gmail.com" target="_blank">miconda@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Federico,<br>
<br>
I just pushed a patch to tsilo module to use the current r-uri instead<br>
of the incoming one. As written in the commit message, using incoming<br>
uri always makes it not work in quite common cases. I am considering to<br>
backport as well if you find that the change is ok.<br>
<br>
Cheers,<br>
Daniel<br>
<div class="HOEnZb"><div class="h5"><br>
On 18/09/15 13:40, Daniel-Constantin Mierla wrote:<br>
> Module: kamailio<br>
> Branch: master<br>
> Commit: 1e5bad019c450a003e812ee051d84134aad6c5f0<br>
> URL: <a href="https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d84134aad6c5f0" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d84134aad6c5f0</a><br>
><br>
> Author: Daniel-Constantin Mierla <<a href="mailto:miconda@gmail.com">miconda@gmail.com</a>><br>
> Committer: Daniel-Constantin Mierla <<a href="mailto:miconda@gmail.com">miconda@gmail.com</a>><br>
> Date: 2015-09-18T13:36:03+02:00<br>
><br>
> tsilo: use current r-uri for ts_store()<br>
><br>
> - msg->first_line.u.request.uri is always the incoming r-uri (never<br>
>   updated inside the msg structure)<br>
> - if $ru was updated, msg->new_uri is set with the new value<br>
> - if incoming r-uri is wanted back after $ru was updated, revert_uri()<br>
>   can be used<br>
> - if only incoming r-uri is allowed, then the function doesn't work when<br>
>   dialing an alias or a short number<br>
><br>
> ---<br>
><br>
> Modified: modules/tsilo/ts_store.c<br>
><br>
> ---<br>
><br>
> Diff:  <a href="https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d84134aad6c5f0.diff" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d84134aad6c5f0.diff</a><br>
> Patch: <a href="https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d84134aad6c5f0.patch" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d84134aad6c5f0.patch</a><br>
><br>
> ---<br>
><br>
> diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c<br>
> index 67dc2d6..a05a4ef 100644<br>
> --- a/modules/tsilo/ts_store.c<br>
> +++ b/modules/tsilo/ts_store.c<br>
> @@ -43,21 +43,28 @@ int ts_store(struct sip_msg* msg) {<br>
>       struct cell             *t;<br>
>       str aor;<br>
>       struct sip_uri ruri;<br>
> +     str suri;<br>
><br>
>       ts_urecord_t* r;<br>
>       int res;<br>
><br>
> -<br>
> +     if (msg->new_uri.s!=NULL) {<br>
> +             /* incoming r-uri was chaged by cfg or other component */<br>
> +             suri = msg->new_uri;<br>
> +     } else {<br>
> +             /* no changes to incoming r-uri */<br>
> +             suri = msg->first_line.u.request.uri;<br>
> +     }<br>
><br>
>       if (use_domain) {<br>
> -             aor = msg->first_line.u.request.uri;<br>
> +             aor = suri;<br>
>       }<br>
>       else {<br>
> -             if (parse_uri(msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len, &ruri)!=0)<br>
> +             if (parse_uri(suri.s, suri.len, &ruri)!=0)<br>
>               {<br>
>                       LM_ERR("bad uri [%.*s]\n",<br>
> -                                     msg->first_line.u.request.uri.len,<br>
> -                                     msg->first_line.u.request.uri.s);<br>
> +                                     suri.len,<br>
> +                                     suri.s);<br>
>                       return -1;<br>
>               }<br>
>               aor = ruri.user;<br>
><br>
><br>
> _______________________________________________<br>
> sr-dev mailing list<br>
> <a href="mailto:sr-dev@lists.sip-router.org">sr-dev@lists.sip-router.org</a><br>
> <a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" rel="noreferrer" target="_blank">http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Daniel-Constantin Mierla<br>
<a href="http://twitter.com/#!/miconda" rel="noreferrer" target="_blank">http://twitter.com/#!/miconda</a> - <a href="http://www.linkedin.com/in/miconda" rel="noreferrer" target="_blank">http://www.linkedin.com/in/miconda</a><br>
Book: SIP Routing With Kamailio - <a href="http://www.asipto.com" rel="noreferrer" target="_blank">http://www.asipto.com</a><br>
Kamailio Advanced Training, Sep 28-30, 2015, in Berlin - <a href="http://asipto.com/u/kat" rel="noreferrer" target="_blank">http://asipto.com/u/kat</a><br>
<br>
</font></span></blockquote></div><br></div>