<div dir="ltr"><div>Hi Daniel,</div>at this point I think we can totally remove use_domain and dependency from usrloc module.<div>Do you agree?<br><div><br></div><div>Regards,</div><div><br></div><div>Federico</div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 23, 2015 at 1:17 AM, 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">Module: kamailio<br>
Branch: master<br>
Commit: cffe67566f206a6c4e76d76a36e0e1783d056369<br>
URL: <a href="https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e1783d056369" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e1783d056369</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-23T01:15:46+02:00<br>
<br>
tsilo: removed check of use_domain for uri parameter in ts_store()<br>
<br>
- ts_append() is using full sip uri and will not match if ts_store()<br>
  with use_domain=0 will store only username<br>
<br>
---<br>
<br>
Modified: modules/tsilo/ts_store.c<br>
Modified: modules/tsilo/tsilo.c<br>
<br>
---<br>
<br>
Diff:  <a href="https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e1783d056369.diff" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e1783d056369.diff</a><br>
Patch: <a href="https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e1783d056369.patch" rel="noreferrer" target="_blank">https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e1783d056369.patch</a><br>
<br>
---<br>
<br>
diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c<br>
index 2cec2ef..e4f11ba 100644<br>
--- a/modules/tsilo/ts_store.c<br>
+++ b/modules/tsilo/ts_store.c<br>
@@ -60,19 +60,14 @@ int ts_store(struct sip_msg* msg, str *puri) {<br>
                }<br>
        }<br>
<br>
-       if (use_domain) {<br>
-               aor = suri;<br>
-       }<br>
-       else {<br>
-               if (parse_uri(suri.s, suri.len, &ruri)!=0)<br>
-               {<br>
-                       LM_ERR("bad uri [%.*s]\n",<br>
-                                       suri.len,<br>
-                                       suri.s);<br>
-                       return -1;<br>
-               }<br>
-               aor = ruri.user;<br>
+       if (parse_uri(suri.s, suri.len, &ruri)!=0)<br>
+       {<br>
+               LM_ERR("bad uri [%.*s]\n",<br>
+                               suri.len,<br>
+                               suri.s);<br>
+               return -1;<br>
        }<br>
+       aor = suri;<br>
<br>
        t = _tmb.t_gett();<br>
        if (!t || t==T_UNDEFINED) {<br>
diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c<br>
index 843804c..411cbc4 100644<br>
--- a/modules/tsilo/tsilo.c<br>
+++ b/modules/tsilo/tsilo.c<br>
@@ -212,10 +212,21 @@ static void destroy(void)<br>
        return;<br>
 }<br>
<br>
+static int ts_check_uri(str *uri)<br>
+{<br>
+       struct sip_uri ruri;<br>
+       if (parse_uri(uri->s, uri->len, &ruri)!=0)<br>
+       {<br>
+               LM_ERR("bad uri [%.*s]\n",<br>
+                               uri->len,<br>
+                               uri->s);<br>
+               return -1;<br>
+       }<br>
+       return 0;<br>
+}<br>
 /**<br>
  *<br>
  */<br>
-<br>
 static int fixup_ts_append_to(void** param, int param_no)<br>
 {<br>
        if (param_no==1 || param_no==2) {<br>
@@ -263,6 +274,8 @@ static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri)<br>
                LM_ERR("invalid ruri parameter\n");<br>
                return -1;<br>
        }<br>
+       if(ts_check_uri(&ruri)<0)<br>
+               return -1;<br>
        return ts_append(_msg, &ruri, _table);<br>
 }<br>
 /**<br>
@@ -309,6 +322,8 @@ static int w_ts_append_to2(struct sip_msg* msg, char *idx, char *lbl, char *tabl<br>
                LM_ERR("failed to conert r-uri parameter\n");<br>
                return -1;<br>
        }<br>
+       if(ts_check_uri(&suri)<0)<br>
+               return -1;<br>
<br>
        return ts_append_to(msg, tindex, tlabel, table, &suri);<br>
 }<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>
</blockquote></div><br></div>