Prechádzať zdrojové kódy

* modules/utils: xcap table used already in child_init function

* Optimization: moved use of xcap table from get_rules_doc function to
  child_init function.
Juha Heinanen 16 rokov pred
rodič
commit
a9529ef436

+ 4 - 0
modules/utils/utils.c

@@ -205,6 +205,10 @@ static int pres_db_open(void) {
 	LM_ERR("can't connect to database\n");
 	LM_ERR("can't connect to database\n");
 	return -1;
 	return -1;
     }
     }
+    if (pres_dbf.use_table(pres_dbh, &xcap_table) < 0) {
+	LM_ERR("in use_table: %.*s\n", xcap_table.len, xcap_table.s);
+	return -1;
+    }
     return 0;
     return 0;
 }
 }
 
 

+ 0 - 1
modules/utils/utils.h

@@ -29,7 +29,6 @@
 #include "../../lib/srdb1/db.h"
 #include "../../lib/srdb1/db.h"
 
 
 extern int http_query_timeout;
 extern int http_query_timeout;
-extern str xcap_table;
 extern db1_con_t *pres_dbh;
 extern db1_con_t *pres_dbh;
 extern db_func_t pres_dbf;
 extern db_func_t pres_dbf;
 
 

+ 0 - 5
modules/utils/xcap_auth.c

@@ -366,11 +366,6 @@ int get_rules_doc(str* user, str* domain, int type, str** rules_doc)
     n_query_cols++;
     n_query_cols++;
 
 
     result_cols[xcap_doc_col= n_result_cols++] = &tmp4;
     result_cols[xcap_doc_col= n_result_cols++] = &tmp4;
-	
-    if (pres_dbf.use_table(pres_dbh, &xcap_table) < 0) {
-	LM_ERR("in use_table-[table]= %.*s\n", xcap_table.len, xcap_table.s);
-	return -1;
-    }
 
 
     if (pres_dbf.query(pres_dbh, query_cols, 0 , query_vals, result_cols, 
     if (pres_dbf.query(pres_dbh, query_cols, 0 , query_vals, result_cols, 
 		       n_query_cols, 1, 0, &result) < 0) {
 		       n_query_cols, 1, 0, &result) < 0) {