<div dir="ltr"><div>Hello,</div><div>ok, it can be done again over callid.</div><div><br></div><div>Cheers,</div><div>Daniel<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Sep 16, 2019 at 10:06 AM Henning Westerholt <<a href="mailto:hw@skalatan.de">hw@skalatan.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello Daniel,<br>
<br>
good catch. One problem though - the code will now generate a shorter <br>
from-tag if the ruri is not available.<br>
<br>
Suggestion - what about just doubling the call-id hash in this special <br>
case? As mentioned I plan to refactor this in the next development period.<br>
<br>
+       if(ruri) {<br>
+               crcitt_string_array(&from_tag[MD5_LEN + 5], ruri, 1);<br>
+       } else (<br>
+               crcitt_string_array(&from_tag[MD5_LEN + 5], callid, 1);<br>
+       }<br>
<br>
Cheers,<br>
<br>
Henning<br>
<br>
Am 16.09.19 um 09:14 schrieb Daniel-Constantin Mierla:<br>
> Module: kamailio<br>
> Branch: master<br>
> Commit: 38bcfb75d3dfc5492fdee9e9bbb17f44cce37684<br>
> URL: <a href="https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f44cce37684" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f44cce37684</a><br>
><br>
> Author: Daniel-Constantin Mierla <<a href="mailto:miconda@gmail.com" target="_blank">miconda@gmail.com</a>><br>
> Committer: Daniel-Constantin Mierla <<a href="mailto:miconda@gmail.com" target="_blank">miconda@gmail.com</a>><br>
> Date: 2019-09-16T09:13:28+02:00<br>
><br>
> tm: safety check when using r-uri for generating from tag<br>
><br>
> - it can come from functions exported via tm api and the r-uri can be<br>
> optional because there are other checks if it is null or not<br>
><br>
> ---<br>
><br>
> Modified: src/modules/tm/uac.c<br>
><br>
> ---<br>
><br>
> Diff:  <a href="https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f44cce37684.diff" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f44cce37684.diff</a><br>
> Patch: <a href="https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f44cce37684.patch" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/38bcfb75d3dfc5492fdee9e9bbb17f44cce37684.patch</a><br>
><br>
> ---<br>
><br>
> diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c<br>
> index e80b4ad62e..2de8d29f27 100644<br>
> --- a/src/modules/tm/uac.c<br>
> +++ b/src/modules/tm/uac.c<br>
> @@ -110,7 +110,9 @@ void generate_fromtag(str* tag, str* callid, str* ruri)<br>
>   {<br>
>       /* calculate from tag from callid and request uri */<br>
>       crcitt_string_array(&from_tag[MD5_LEN + 1], callid, 1);<br>
> -     crcitt_string_array(&from_tag[MD5_LEN + 5], ruri, 1);<br>
> +     if(ruri) {<br>
> +             crcitt_string_array(&from_tag[MD5_LEN + 5], ruri, 1);<br>
> +     }<br>
>       tag->s = from_tag;<br>
>       tag->len = FROM_TAG_LEN;<br>
>   }<br>
><br>
><br>
> _______________________________________________<br>
> Kamailio (SER) - Development Mailing List<br>
> <a href="mailto:sr-dev@lists.kamailio.org" target="_blank">sr-dev@lists.kamailio.org</a><br>
> <a href="https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev" rel="noreferrer" target="_blank">https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
<br>
-- <br>
Kamailio Merchandising - <a href="https://skalatan.de/merchandising/" rel="noreferrer" target="_blank">https://skalatan.de/merchandising/</a><br>
Kamailio services - <a href="https://skalatan.de/services" rel="noreferrer" target="_blank">https://skalatan.de/services</a><br>
Henning Westerholt - <a href="https://skalatan.de/blog/" rel="noreferrer" target="_blank">https://skalatan.de/blog/</a><br>
<br>
</blockquote></div><br clear="all"><br>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Daniel-Constantin Mierla - <a href="http://www.asipto.com" target="_blank">http://www.asipto.com</a></div><div><a href="http://twitter.com/#!/miconda" target="_blank">http://twitter.com/#!/miconda</a> - <a href="http://www.linkedin.com/in/miconda" target="_blank">http://www.linkedin.com/in/miconda</a></div></div></div></div></div>