[sr-dev] git:master:ede95bf3: tsilo: removed use_domain and usrloc bindings

[grumvalski]

Module: kamailio
Branch: master
Commit: ede95bf3b008fa8f2b50e3d6fbc6ea5b2940e721
URL: https://github.com/kamailio/kamailio/commit/ede95bf3b008fa8f2b50e3d6fbc6ea5b2940e721

Author: grumvalski <federico.cabiddu at gmail.com>
Committer: grumvalski <federico.cabiddu at gmail.com>
Date: 2015-09-23T16:20:56+02:00

tsilo: removed use_domain and usrloc bindings

---

Modified: modules/tsilo/ts_store.c
Modified: modules/tsilo/tsilo.c
Modified: modules/tsilo/tsilo.h

---

Diff:  https://github.com/kamailio/kamailio/commit/ede95bf3b008fa8f2b50e3d6fbc6ea5b2940e721.diff
Patch: https://github.com/kamailio/kamailio/commit/ede95bf3b008fa8f2b50e3d6fbc6ea5b2940e721.patch

---

diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c
index e4f11ba..8c10b08 100644
--- a/modules/tsilo/ts_store.c
+++ b/modules/tsilo/ts_store.c
@@ -37,8 +37,6 @@
 #include "ts_hash.h"
 #include "ts_store.h"
 
-extern int use_domain;
-
 int ts_store(struct sip_msg* msg, str *puri) {
 	struct cell		*t;
 	str aor;
diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c
index 411cbc4..84b172e 100644
--- a/modules/tsilo/tsilo.c
+++ b/modules/tsilo/tsilo.c
@@ -30,7 +30,6 @@
 #include "../../script_cb.h"
 #include "../../modules/tm/tm_load.h"
 #include "../../modules/registrar/api.h"
-#include "../../modules/usrloc/usrloc.h"
 #include "../../dset.h"
 #include "../../rpc_lookup.h"
 #include "../../lib/kcore/statistics.h"
@@ -48,10 +47,6 @@ MODULE_VERSION
 struct tm_binds _tmb;
 /** REGISTRAR bind **/
 registrar_api_t _regapi;
-/** USRLOC BIND **/
-usrloc_api_t _ul;
-
-int use_domain = 0;
 
 /** parameters */
 static int hash_size = 2048;
@@ -132,7 +127,6 @@ struct module_exports exports = {
 static int mod_init(void)
 {
 	unsigned int n;
-	bind_usrloc_t bind_usrloc;
 
 	/* register the RPC methods */
 	if(rpc_register_array(rpc_methods)!=0)
@@ -151,20 +145,7 @@ static int mod_init(void)
 		LM_ERR("cannot load REGISTRAR API\n");
 		return -1;
 	}
-	/* load UL-Bindings */
-	bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0);
-
-	if (!bind_usrloc) {
-		LM_ERR("could not load the USRLOC API\n");
-		return -1;
-	}
-
-	if (bind_usrloc(&_ul) < 0) {
-		LM_ERR("could not load the USRLOC API\n");
-		return -1;
-	}
 
-	use_domain = _ul.use_domain;
 	/* sanitize hash_size */
 	if (hash_size < 1){
 		LM_WARN("hash_size is smaller "
diff --git a/modules/tsilo/tsilo.h b/modules/tsilo/tsilo.h
index 90c965c..1daf4d4 100644
--- a/modules/tsilo/tsilo.h
+++ b/modules/tsilo/tsilo.h
@@ -23,15 +23,11 @@
 
 #include "../../modules/tm/tm_load.h"
 #include "../../modules/registrar/api.h"
-#include "../../modules/usrloc/usrloc.h"
 
 /** TM bind */
 extern struct tm_binds _tmb;
 /** REGISTRAR bind */
 extern registrar_api_t _regapi;
 /** USRLOC BIND **/
-extern usrloc_api_t _ul;
-
-extern int use_domain;
 
 #endif