@@ -276,22 +276,22 @@ static void acc_db_init_keys(void)

 	/* init the static db keys */

 	n = 0;

 	/* caution: keys need to be aligned to core format */

-	db_keys[n++] = acc_method_col;

-	db_keys[n++] = acc_fromtag_col;

-	db_keys[n++] = acc_totag_col;

-	db_keys[n++] = acc_callid_col;

-	db_keys[n++] = acc_sipcode_col;

-	db_keys[n++] = acc_sipreason_col;

-	db_keys[n++] = acc_time_col;

+	db_keys[n++] = &acc_method_col;

+	db_keys[n++] = &acc_fromtag_col;

+	db_keys[n++] = &acc_totag_col;

+	db_keys[n++] = &acc_callid_col;

+	db_keys[n++] = &acc_sipcode_col;

+	db_keys[n++] = &acc_sipreason_col;

+	db_keys[n++] = &acc_time_col;

 	time_idx = n-1;

 	/* init the extra db keys */

 	for(extra=db_extra; extra ; extra=extra->next)

-		db_keys[n++] = extra->name.s;

+		db_keys[n++] = &extra->name;

 	/* multi leg call columns */

 	for( extra=leg_info ; extra ; extra=extra->next)

-		db_keys[n++] = extra->name.s;

+		db_keys[n++] = &extra->name;

 	/* init the values */

 	for(i=0; i<n; i++) {

@@ -304,9 +304,9 @@ static void acc_db_init_keys(void)

 /* binds to the corresponding database module

  * returns 0 on success, -1 on error */

-int acc_db_init(char* db_url)

+int acc_db_init(const str* db_url)

 {

-	if (bind_dbmod(db_url, &acc_dbf)<0){

+	if (db_bind_mod(db_url, &acc_dbf)<0){

 		LM_ERR("bind_db failed\n");

 		return -1;

 	}

@@ -325,7 +325,7 @@ int acc_db_init(char* db_url)

 /* initialize the database connection

  * returns 0 on success, -1 on error */

-int acc_db_init_child(char *db_url)

+int acc_db_init_child(const str *db_url)

 {

 	db_handle=acc_dbf.init(db_url);

 	if (db_handle==0){

@@ -364,7 +364,7 @@ int acc_db_request( struct sip_msg *rq)

 	for( i++ ; i<m; i++)

 		VAL_STR(db_vals+i) = val_arr[i];

-	if (acc_dbf.use_table(db_handle, acc_env.text.s/*table*/) < 0) {

+	if (acc_dbf.use_table(db_handle, &acc_env.text/*table*/) < 0) {

 		LM_ERR("error in use_table\n");

 		return -1;

 	}

@@ -69,8 +69,8 @@ void acc_log_init();

 int  acc_log_request( struct sip_msg *req);

 #ifdef SQL_ACC

-int  acc_db_init(char* db_url);

-int  acc_db_init_child(char* db_url);

+int  acc_db_init(const str* db_url);

+int  acc_db_init_child(const str* db_url);

 void acc_db_close();

 int  acc_db_request( struct sip_msg *req);

 #endif

@@ -306,7 +306,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req,

 	}

 #ifdef SQL_ACC

 	if (is_db_mc_on(req)) {

-		env_set_text( db_table_mc, 0);

+		env_set_text(db_table_mc.s, 0);

 		acc_db_request( req );

 		flags_to_reset |= db_missed_flag;

 	}

@@ -371,7 +371,7 @@ static inline void acc_onreply( struct cell* t, struct sip_msg *req,

 	}

 #ifdef SQL_ACC

 	if (is_db_acc_on(req)) {

-		env_set_text( db_table_acc, 0);

+		env_set_text( db_table_acc.s, 0);

 		acc_db_request(req);

 	}

 #endif

@@ -409,7 +409,7 @@ static inline void acc_onack( struct cell* t, struct sip_msg *req,

 	}

 #ifdef SQL_ACC

 	if (is_db_acc_on(req)) {

-		env_set_text( db_table_acc, 0);

+		env_set_text( db_table_acc.s, 0);

 		acc_db_request( ack );

 	}

 #endif

@@ -71,7 +71,7 @@ MODULE_VERSION

 struct tm_binds tmb;

 struct rr_binds rrb;

-static int mod_init( void );

+static int mod_init(void);

 static void destroy(void);

 static int child_init(int rank);

@@ -143,18 +143,18 @@ int db_missed_flag = -1;

 static char *db_extra_str = 0;

 struct acc_extra *db_extra = 0;

 /* Database url */

-static char *db_url = 0;

+static str db_url = {NULL, 0};

 /* name of database tables */

-char *db_table_acc = "acc";

-char *db_table_mc = "missed_calls";

+str db_table_acc = str_init("acc");

+str db_table_mc = str_init("missed_calls");

 /* names of columns in tables acc/missed calls*/

-char* acc_method_col     = "method";

-char* acc_fromtag_col    = "from_tag";

-char* acc_totag_col      = "to_tag";

-char* acc_callid_col     = "callid";

-char* acc_sipcode_col    = "sip_code";

-char* acc_sipreason_col  = "sip_reason";

-char* acc_time_col       = "time";

+str acc_method_col     = str_init("method");

+str acc_fromtag_col    = str_init("from_tag");

+str acc_totag_col      = str_init("to_tag");

+str acc_callid_col     = str_init("callid");

+str acc_sipcode_col    = str_init("sip_code");

+str acc_sipreason_col  = str_init("sip_reason");

+str acc_time_col       = str_init("time");

 #endif

 /* ------------- fixup function --------------- */

@@ -214,16 +214,16 @@ static param_export_t params[] = {

 	{"db_flag",              INT_PARAM, &db_flag              },

 	{"db_missed_flag",       INT_PARAM, &db_missed_flag       },

 	{"db_extra",             STR_PARAM, &db_extra_str         },

-	{"db_url",               STR_PARAM, &db_url               },

-	{"db_table_acc",         STR_PARAM, &db_table_acc         },

-	{"db_table_missed_calls",STR_PARAM, &db_table_mc          },

-	{"acc_method_column",    STR_PARAM, &acc_method_col       },

-	{"acc_from_tag_column",  STR_PARAM, &acc_fromtag_col      },

-	{"acc_to_tag_column",    STR_PARAM, &acc_totag_col        },

-	{"acc_callid_column",    STR_PARAM, &acc_callid_col       },

-	{"acc_sip_code_column",  STR_PARAM, &acc_sipcode_col      },

-	{"acc_sip_reason_column",STR_PARAM, &acc_sipreason_col    },

-	{"acc_time_column",      STR_PARAM, &acc_time_col         },

+	{"db_url",               STR_PARAM, &db_url.s             },

+	{"db_table_acc",         STR_PARAM, &db_table_acc.s       },

+	{"db_table_missed_calls",STR_PARAM, &db_table_mc.s        },

+	{"acc_method_column",    STR_PARAM, &acc_method_col.s     },

+	{"acc_from_tag_column",  STR_PARAM, &acc_fromtag_col.s    },

+	{"acc_to_tag_column",    STR_PARAM, &acc_totag_col.s      },

+	{"acc_callid_column",    STR_PARAM, &acc_callid_col.s     },

+	{"acc_sip_code_column",  STR_PARAM, &acc_sipcode_col.s    },

+	{"acc_sip_reason_column",STR_PARAM, &acc_sipreason_col.s  },

+	{"acc_time_column",      STR_PARAM, &acc_time_col.s       },

 #endif

 	{0,0,0}

 };

@@ -283,7 +283,7 @@ static int acc_fixup(void** param, int param_no)

 #ifdef SQL_ACC

 	} else if (param_no == 2) {

 		/* only for db acc - the table name */

-		if (db_url==0) {

+		if (db_url.s==0) {

 			pkg_free(p);

 			*param = 0;

 		}

@@ -310,6 +310,18 @@ static int mod_init( void )

 {

 	LM_INFO("initializing...\n");

+	if (db_url.s)

+		db_url.len = strlen(db_url.s);

+	db_table_acc.len = strlen(db_table_acc.s);

+	db_table_mc.len = strlen(db_table_mc.s);

+	acc_method_col.len = strlen(acc_method_col.s);

+	acc_fromtag_col.len = strlen(acc_fromtag_col.s);

+	acc_totag_col.len = strlen(acc_totag_col.s);

+	acc_callid_col.len = strlen(acc_callid_col.s);

+	acc_sipcode_col.len = strlen(acc_sipcode_col.s);

+	acc_sipreason_col.len = strlen(acc_sipreason_col.s);

+	acc_time_col.len = strlen(acc_time_col.s);

+

 	/* ----------- GENERIC INIT SECTION  ----------- */

 	if (flag_idx2mask(&failed_transaction_flag)<0)

@@ -369,13 +381,13 @@ static int mod_init( void )

 	/* ------------ SQL INIT SECTION ----------- */

 #ifdef SQL_ACC

-	if (db_url && db_url[0]) {

+	if (db_url.s && db_url.len > 0) {

 		/* parse the extra string, if any */

 		if (db_extra_str && (db_extra=parse_acc_extra(db_extra_str))==0 ) {

 			LM_ERR("failed to parse db_extra param\n");

 			return -1;

 		}

-		if (acc_db_init(db_url)<0){

+		if (acc_db_init(&db_url)<0){

 			LM_ERR("failed...did you load a database module?\n");

 			return -1;

 		}

@@ -385,7 +397,6 @@ static int mod_init( void )

 		if (flag_idx2mask(&db_missed_flag)<0)

 			return -1;

 	} else {

-		db_url = 0;

 		db_flag = 0;

 		db_missed_flag = 0;

 	}

@@ -445,8 +456,11 @@ static int mod_init( void )

 static int child_init(int rank)

 {

 #ifdef SQL_ACC

-	if (db_url && acc_db_init_child(db_url)<0)

+	if(db_url.s && acc_db_init_child(&db_url)<0) {

+		LM_ERR("could not open database connection");

 		return -1;

+	}

+

 #endif

 	/* DIAMETER */

@@ -64,19 +64,19 @@ extern int diameter_missed_flag;

 extern int db_flag;

 extern int db_missed_flag;

-extern char *db_table_acc;

-extern char *db_table_mc;

+extern str db_table_acc;

+extern str db_table_mc;

-extern char* acc_method_col;

-extern char* acc_fromuri_col;

-extern char* acc_fromtag_col;

-extern char* acc_touri_col;

-extern char* acc_totag_col;

-extern char* acc_callid_col;

-extern char* acc_cseqno_col;

-extern char* acc_sipcode_col;

-extern char* acc_sipreason_col;

-extern char* acc_time_col;

+extern str acc_method_col;

+extern str acc_fromuri_col;

+extern str acc_fromtag_col;

+extern str acc_touri_col;

+extern str acc_totag_col;

+extern str acc_callid_col;

+extern str acc_cseqno_col;

+extern str acc_sipcode_col;

+extern str acc_sipreason_col;

+extern str acc_time_col;

 #endif /* SQL_ACC */

@@ -34,6 +34,7 @@

 #include "../../dprint.h"

 #include "../../error.h"

 #include "../../mem/mem.h"

+#include "../../ut.h"

 #include "alookup.h"

@@ -53,16 +54,13 @@ static int mod_init(void);

 /* Module parameter variables */

-char* db_url           = DEFAULT_RODB_URL;

-char* user_column      = "username";

-char* domain_column    = "domain";

-char* alias_user_column      = "alias_username";

-char* alias_domain_column    = "alias_domain";

-int   use_domain       = 0;

-char* domain_prefix    = NULL;

-

-str   dstrip_s;

-

+static str db_url       = str_init(DEFAULT_RODB_URL);

+str user_column         = str_init("username");

+str domain_column       = str_init("domain");

+str alias_user_column   = str_init("alias_username");

+str alias_domain_column = str_init("alias_domain");

+str domain_prefix       = {NULL, 0};

+int use_domain          = 0;

 db_con_t* db_handle;   /* Database connection handle */

 db_func_t adbf;  /* DB functions */

@@ -77,20 +75,20 @@ static cmd_export_t cmds[] = {

 /* Exported parameters */

 static param_export_t params[] = {

-	{"db_url",           STR_PARAM, &db_url          },

-	{"user_column",      STR_PARAM, &user_column     },

-	{"domain_column",    STR_PARAM, &domain_column   },

-	{"alias_user_column",      STR_PARAM, &alias_user_column     },

-	{"alias_domain_column",    STR_PARAM, &alias_domain_column   },

+	{"db_url",           STR_PARAM, &db_url.s        },

+	{"user_column",      STR_PARAM, &user_column.s   },

+	{"domain_column",    STR_PARAM, &domain_column.s },

+	{"alias_user_column",      STR_PARAM, &alias_user_column.s   },

+	{"alias_domain_column",    STR_PARAM, &alias_domain_column.s },

 	{"use_domain",       INT_PARAM, &use_domain      },

-	{"domain_prefix",    STR_PARAM, &domain_prefix   },

+	{"domain_prefix",    STR_PARAM, &domain_prefix.s },

 	{0, 0, 0}

 };

 /* Module interface */

 struct module_exports exports = {

-	"alias_db", 

+	"alias_db",

 	DEFAULT_DLFLAGS, /* dlopen flags */

 	cmds,       /* Exported functions */

 	params,     /* Exported parameters */

@@ -110,7 +108,7 @@ struct module_exports exports = {

  */

 static int child_init(int rank)

 {

-	db_handle = adbf.init(db_url);

+	db_handle = adbf.init(&db_url);

 	if (!db_handle)

 	{

 		LM_ERR("unable to connect database\n");

@@ -127,31 +125,26 @@ static int child_init(int rank)

 static int mod_init(void)

 {

 	LM_INFO("initializing...\n");

+	db_url.len = strlen(db_url.s);

+	user_column.len = strlen(user_column.s);

+	domain_column.len = strlen(domain_column.s);

+	alias_domain_column.len = strlen(domain_column.s);

+	alias_user_column.len = strlen(alias_user_column.s);

+	if (domain_prefix.s)

+		domain_prefix.len = strlen(domain_prefix.s);

     /* Find a database module */

-	if (bind_dbmod(db_url, &adbf))

+	if (db_bind_mod(&db_url, &adbf))

 	{

 		LM_ERR("unable to bind database module\n");

 		return -1;

 	}

-	if (!DB_CAPABILITY( adbf, DB_CAP_QUERY))

+	if (!DB_CAPABILITY(adbf, DB_CAP_QUERY))

 	{

 		LM_CRIT("database modules does not "

 			"provide all functions needed by avpops module\n");

 		return -1;

 	}

-		

-

-	if(domain_prefix==NULL || strlen(domain_prefix)==0)

-	{

-		dstrip_s.s   = 0;

-		dstrip_s.len = 0;

-	}

-	else

-	{

-		dstrip_s.s   = domain_prefix;

-		dstrip_s.len = strlen(domain_prefix);

-	}

 	return 0;

 }

@@ -36,12 +36,12 @@

 /* Module parameters variables */

-extern char* user_column;     /* 'username' column name */

-extern char* domain_column;   /* 'domain' column name */

-extern char* alias_user_column;     /* 'alias_username' column name */

-extern char* alias_domain_column;   /* 'alias_domain' column name */

-extern int   use_domain;      /* use or not the domain for alias lookup */

-extern str   dstrip_s;

+extern str user_column;     /* 'username' column name */

+extern str domain_column;   /* 'domain' column name */

+extern str alias_user_column;     /* 'alias_username' column name */

+extern str alias_domain_column;   /* 'alias_domain' column name */

+extern str domain_prefix;

+extern int use_domain;      /* use or not the domain for alias lookup */

 extern db_con_t* db_handle;   /* Database connection handle */

@@ -69,12 +69,19 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s)

  */

 int alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2)

 {

-	str user_s;

-	db_key_t db_keys[2] = { alias_user_column, alias_domain_column };

+	str user_s, table_s;

+	db_key_t db_keys[2] = {&alias_user_column, &alias_domain_column};

 	db_val_t db_vals[2];

-	db_key_t db_cols[] = { user_column, domain_column };

+	db_key_t db_cols[] = {&user_column, &domain_column};

 	db_res_t* db_res = NULL;

+	if(!_table) {

+		LM_ERR("invalid parameter");

+		return -1;

+	}

+	table_s.s = _table;

+	table_s.len = strlen(_table);	

+

 	if (parse_sip_msg_uri(_msg) < 0)

 		return -1;

@@ -90,16 +97,16 @@ int alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2)

 		db_vals[1].val.str_val.s = _msg->parsed_uri.host.s;

 		db_vals[1].val.str_val.len = _msg->parsed_uri.host.len;

-		if (dstrip_s.s!=NULL && dstrip_s.len>0

-			&& dstrip_s.len<_msg->parsed_uri.host.len

-			&& strncasecmp(_msg->parsed_uri.host.s,dstrip_s.s,dstrip_s.len)==0)

+		if (domain_prefix.s && domain_prefix.len>0

+			&& domain_prefix.len<_msg->parsed_uri.host.len

+			&& strncasecmp(_msg->parsed_uri.host.s,domain_prefix.s,domain_prefix.len)==0)

 		{

-			db_vals[1].val.str_val.s   += dstrip_s.len;

-			db_vals[1].val.str_val.len -= dstrip_s.len;

+			db_vals[1].val.str_val.s   += domain_prefix.len;

+			db_vals[1].val.str_val.len -= domain_prefix.len;

 		}

 	}

-	adbf.use_table(db_handle, _table);

+	adbf.use_table(db_handle, &table_s);

 	if(adbf.query(db_handle, db_keys, NULL, db_vals, db_cols,

 		(use_domain)?2:1 /*no keys*/, 2 /*no cols*/, NULL, &db_res)!=0)

 	{

@@ -200,4 +207,3 @@ int alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2)

 err_server:

 	return -1;

 }

-

@@ -91,7 +91,7 @@ struct sl_binds slb;

 /*

  * Module parameter variables

  */

-static char* db_url         = DEFAULT_RODB_URL;

+static str db_url           = {DEFAULT_RODB_URL, DEFAULT_RODB_URL_LEN};

 str user_column             = {USER_COL, USER_COL_LEN};

 str domain_column           = {DOMAIN_COL, DOMAIN_COL_LEN};

 str pass_column             = {PASS_COL, PASS_COL_LEN};

@@ -123,7 +123,7 @@ static cmd_export_t cmds[] = {

  * Exported parameters

  */

 static param_export_t params[] = {

-	{"db_url",            STR_PARAM, &db_url             },

+	{"db_url",            STR_PARAM, &db_url.s           },

 	{"user_column",       STR_PARAM, &user_column.s      },

 	{"domain_column",     STR_PARAM, &domain_column.s    },

 	{"password_column",   STR_PARAM, &pass_column.s      },

@@ -156,7 +156,7 @@ struct module_exports exports = {

 static int child_init(int rank)

 {

-	auth_db_handle = auth_dbf.init(db_url);

+	auth_db_handle = auth_dbf.init(&db_url);

 	if (auth_db_handle == 0){

 		LM_ERR("unable to connect to the database\n");

 		return -1;

@@ -172,13 +172,14 @@ static int mod_init(void)

 	LM_INFO("initializing...\n");

+	db_url.len = strlen(db_url.s);

 	user_column.len = strlen(user_column.s);

 	domain_column.len = strlen(domain_column.s);

 	pass_column.len = strlen(pass_column.s);

 	pass_column_2.len = strlen(pass_column.s);

 	/* Find a database module */

-	if (bind_dbmod(db_url, &auth_dbf) < 0){

+	if (db_bind_mod(&db_url, &auth_dbf) < 0){

 		LM_ERR("unable to bind to a database driver\n");

 		return -1;

 	}

@@ -252,12 +253,12 @@ static int auth_fixup(void** param, int param_no)

 		name.s = (char*)*param;

 		name.len = strlen(name.s);

-		dbh = auth_dbf.init(db_url);

+		dbh = auth_dbf.init(&db_url);

 		if (!dbh) {

 			LM_ERR("unable to open database connection\n");

 			return -1;

 		}

-		ver = table_version(&auth_dbf, dbh, &name);

+		ver = db_table_version(&auth_dbf, dbh, &name);

 		auth_dbf.close(dbh);

 		if (ver < 0) {

 			LM_ERR("failed to query table version\n");

@@ -52,13 +52,14 @@ static str auth_500_err = str_init("Server Internal Error");

 static inline int get_ha1(struct username* _username, str* _domain,

-			  char* _table, char* _ha1, db_res_t** res)

+			  const str* _table, char* _ha1, db_res_t** res)

 {

 	struct aaa_avp *cred;

 	db_key_t keys[2];

 	db_val_t vals[2];

 	db_key_t *col;

 	str result;

+

 	int n, nc;

 	col = pkg_malloc(sizeof(*col) * (credentials_n + 1));

@@ -67,14 +68,14 @@ static inline int get_ha1(struct username* _username, str* _domain,

 		return -1;

 	}

-	keys[0] = user_column.s;

-	keys[1] = domain_column.s;

+	keys[0] = &user_column;

+	keys[1] = &domain_column;

 	/* should we calculate the HA1, and is it calculated with domain? */

 	col[0] = (_username->domain.len && !calc_ha1) ?

-		(pass_column_2.s) : (pass_column.s);

+		(&pass_column_2) : (&pass_column);

 	for (n = 0, cred=credentials; cred ; n++, cred=cred->next) {

-		col[1 + n] = cred->attr_name.s;

+		col[1 + n] = &cred->attr_name;

 	}

 	VAL_TYPE(vals) = VAL_TYPE(vals + 1) = DB_STR;

@@ -191,9 +192,9 @@ static int generate_avps(db_res_t* result)

 				ivalue.n);

 			break;

 		default:

-			LM_ERR("subscriber table column `%s' has unsuported type. "

+			LM_ERR("subscriber table column `%.*s' has unsuported type. "

 				"Only string/str or int columns are supported by"

-				"load_credentials.\n", result->col.names[i]);

+				"load_credentials.\n", result->col.names[i]->len, result->col.names[i]->s);

 			break;

 		}

 	}

@@ -206,16 +207,24 @@ static int generate_avps(db_res_t* result)

  * Authorize digest credentials

  */

 static inline int authorize(struct sip_msg* _m, pv_elem_t* _realm,

-										char* _table, hdr_types_t _hftype)

+									char* _table, hdr_types_t _hftype)

 {

 	char ha1[256];

 	int res;

 	struct hdr_field* h;

 	auth_body_t* cred;

 	auth_result_t ret;

-	str domain;

+	str domain, table;

 	db_res_t* result = NULL;

+	if(!_table) {

+		LM_ERR("invalid parameter");

+		return -1;

+	}

+

+	table.s = _table;

+	table.len = strlen(_table);

+

 	if (_realm) {

 		if (pv_printf_s(_m, _realm, &domain)!=0) {

 			LM_ERR("pv_printf_s failed\n");

@@ -233,7 +242,7 @@ static inline int authorize(struct sip_msg* _m, pv_elem_t* _realm,

 	cred = (auth_body_t*)h->parsed;

-	res = get_ha1(&cred->digest.username, &domain, _table, ha1, &result);

+	res = get_ha1(&cred->digest.username, &domain, &table, ha1, &result);

 	if (res < 0) {

 		/* Error while accessing the database */

 		if (slb.reply(_m, 500, &auth_500_err) == -1) {

@@ -29,8 +29,8 @@

 #include "../../parser/msg_parser.h"

-int auth_db_init(char* db_url);

-int auth_db_bind(char* db_url);

+int auth_db_init(const str* db_url);

+int auth_db_bind(const str* db_url);

 void auth_db_close();

 /*

@@ -51,11 +51,16 @@

 MODULE_VERSION

 /* modules param variables */

-static char *DB_URL        = 0;  /* database url */

-static char *DB_TABLE      = 0;  /* table */

-static int  use_domain     = 0;  /* if domain should be use for avp matching */

-static char *db_columns[6] = {"uuid","attribute","value",

-                              "type","username","domain"};

+static str db_url          = {NULL, 0};  /* database url */

+static str db_table        = {NULL, 0};  /* table */

+static int use_domain      = 0;  /* if domain should be use for avp matching */

+static str uuid_col        = str_init("uuid");

+static str attribute_col   = str_init("attribute");

+static str value_col       = str_init("value");

+static str type_col        = str_init("type");

+static str username_col    = str_init("username");

+static str domain_col      = str_init("domain");

+static str* db_columns[6] = {&uuid_col, &attribute_col, &value_col, &type_col, &username_col, &domain_col};

 static int avpops_init(void);

@@ -125,16 +130,16 @@ static cmd_export_t cmds[] = {

  * Exported parameters

  */

 static param_export_t params[] = {

-	{"db_url",            STR_PARAM, &DB_URL         },

-	{"avp_url",           STR_PARAM, &DB_URL         },

-	{"avp_table",         STR_PARAM, &DB_TABLE       },

-	{"use_domain",        INT_PARAM, &use_domain     },

-	{"uuid_column",       STR_PARAM, &db_columns[0]  },

-	{"attribute_column",  STR_PARAM, &db_columns[1]  },

-	{"value_column",      STR_PARAM, &db_columns[2]  },

-	{"type_column",       STR_PARAM, &db_columns[3]  },

-	{"username_column",   STR_PARAM, &db_columns[4]  },

-	{"domain_column",     STR_PARAM, &db_columns[5]  },

+	{"db_url",            STR_PARAM, &db_url.s        },

+	{"avp_url",           STR_PARAM, &db_url.s        },

+	{"avp_table",         STR_PARAM, &db_table.s      },

+	{"use_domain",        INT_PARAM, &use_domain      },

+	{"uuid_column",       STR_PARAM, &uuid_col.s      },

+	{"attribute_column",  STR_PARAM, &attribute_col.s },

+	{"value_column",      STR_PARAM, &value_col.s     },

+	{"type_column",       STR_PARAM, &type_col.s      },

+	{"username_column",   STR_PARAM, &username_col.s  },

+	{"domain_column",     STR_PARAM, &domain_col.s    },

 	{"db_scheme",         STR_PARAM|USE_FUNC_PARAM, (void*)avp_add_db_scheme },

 	{0, 0, 0}

 };

@@ -160,21 +165,32 @@ static int avpops_init(void)

 {

 	LM_INFO("initializing...\n");

+	if (db_url.s)

+		db_url.len = strlen(db_url.s);

+	if (db_table.s)

+		db_table.len = strlen(db_table.s);

+	uuid_col.len = strlen(uuid_col.s);

+	attribute_col.len = strlen(attribute_col.s);

+	value_col.len = strlen(value_col.s);

+	type_col.len = strlen(type_col.s);

+	username_col.len = strlen(username_col.s);

+	domain_col.len = strlen(domain_col.s);

+

 	/* if DB_URL defined -> bind to a DB module */

-	if (DB_URL!=0)

+	if (db_url.s!=0)

 	{

 		/* check AVP_TABLE param */

-		if (DB_TABLE==0)

+		if (db_table.s==0)

 		{

 			LM_CRIT("\"AVP_DB\" present but \"AVP_TABLE\" found empty\n");

 			goto error;

 		}

 		/* bind to the DB module */

-		if (avpops_db_bind(DB_URL)<0)

+		if (avpops_db_bind(&db_url)<0)

 			goto error;

 	}

-	init_store_avps( db_columns );

+	init_store_avps(db_columns);

 	return 0;

 error:

@@ -185,13 +201,13 @@ error:

 static int avpops_child_init(int rank)

 {

 	/* init DB only if enabled */

-	if (DB_URL==0)

+	if (db_url.s==0)

 		return 0;

 	/* skip main process and TCP manager process */

 	if (rank==PROC_MAIN || rank==PROC_TCP_MAIN)

 		return 0;

 	/* init DB connection */

-	return avpops_db_init(DB_URL, DB_TABLE, db_columns);

+	return avpops_db_init(&db_url, &db_table, db_columns);

 }

@@ -206,7 +222,7 @@ static int fixup_db_avp(void** param, int param_no, int allow_scheme)

 	flags=0;

 	flags0=0;

-	if (DB_URL==0)

+	if (db_url.s==0)

 	{

 		LM_ERR("you have to config a db url for using avp_db_xxx functions\n");

 		return E_UNSPEC;

@@ -315,7 +331,7 @@ static int fixup_db_query_avp(void** param, int param_no)

 	pvname_list_t *anlist = NULL;

 	str s;

-	if (DB_URL==0)

+	if (db_url.s==0)

 	{

 		LM_ERR("you have to config a db url for using avp_db_query function\n");

 		return E_UNSPEC;

@@ -39,8 +39,8 @@

 static db_con_t  *db_hdl=0;     /* DB handler */

 static db_func_t avpops_dbf;    /* DB functions */

-static char      *def_table;    /* default DB table */

-static char      **db_columns;  /* array with names of DB columns */

+static str       def_table;    /* default DB table */

+static str      **db_columns;  /* array with names of DB columns */

 static db_key_t   keys_cmp[3]; /* array of keys and values used in selection */

 static db_val_t   vals_cmp[3]; /* statement as in "select" and "delete" */

@@ -49,9 +49,9 @@ static db_val_t   vals_cmp[3]; /* statement as in "select" and "delete" */

 static struct db_scheme  *db_scheme_list=0;

-int avpops_db_bind(char* db_url)

+int avpops_db_bind(const str* db_url)

 {

-	if (bind_dbmod(db_url, &avpops_dbf ))

+	if (db_bind_mod(db_url, &avpops_dbf ))

 	{

 		LM_CRIT("cannot bind to database module! "

 			"Did you load a database module ?\n");

@@ -70,8 +70,9 @@ int avpops_db_bind(char* db_url)

 }

-int avpops_db_init(char* db_url, char* db_table, char **db_cols)

+int avpops_db_init(const str* db_url, const str* db_table, str** db_cols)

 {

+	

 	db_hdl = avpops_dbf.init(db_url);

 	if (db_hdl==0)

 	{

@@ -80,10 +81,11 @@ int avpops_db_init(char* db_url, char* db_table, char **db_cols)

 	}

 	if (avpops_dbf.use_table(db_hdl, db_table)<0)

 	{

-		LM_ERR("cannot select table \"%s\"\n", db_table);

+		LM_ERR("cannot select table \"%.*s\"\n", db_table->len, db_table->s);

 		goto error;

 	}

-	def_table = db_table;

+	def_table.s = db_table->s;

+	def_table.len = db_table->len;

 	db_columns = db_cols;

 	return 0;

@@ -125,13 +127,14 @@ int avp_add_db_scheme( modparam_t type, void* val)

 	/* print scheme */

 	LM_DBG("new scheme <%s> added\n"

-		"\t\tuuid_col=<%s>\n\t\tusername_col=<%s>\n"

-		"\t\tdomain_col=<%s>\n\t\tvalue_col=<%s>\n"

-		"\t\tdb_flags=%d\n\t\ttable=<%s>\n",

+		"\t\tuuid_col=<%.*s>\n\t\tusername_col=<%.*s>\n"

+		"\t\tdomain_col=<%.*s>\n\t\tvalue_col=<%.*s>\n"

+		"\t\tdb_flags=%d\n\t\ttable=<%.*s>\n",

 		scheme->name,

-		scheme->uuid_col, scheme->username_col,

-		scheme->domain_col, scheme->value_col,

-		scheme->db_flags, scheme->table	);

+		scheme->uuid_col->len, scheme->uuid_col->s, scheme->username_col->len,

+		scheme->username_col->s, scheme->domain_col->len, scheme->domain_col->s,

+		scheme->value_col->len, scheme->value_col->s, scheme->db_flags,

+		scheme->table->len, scheme->table->s);

 	scheme->next = db_scheme_list;

 	db_scheme_list = scheme;

@@ -153,22 +156,21 @@ struct db_scheme *avp_get_db_scheme (char *name)

 }

-static inline int set_table( char *table, char *func)

+static inline int set_table( const str *table, char *func)

 {

 	static int default_set = 1;

-

-	if (table)

+	if (table->s)

 	{

 		if ( avpops_dbf.use_table( db_hdl, table)<0 )

 		{

-			LM_ERR("db-%s: cannot set table \"%s\"\n", func, table);

+			LM_ERR("db-%s: cannot set table \"%.*s\"\n", func, table->len, table->s);

 			return -1;

 		}

 		default_set = 0;

 	} else if (!default_set){

-		if ( avpops_dbf.use_table( db_hdl, def_table)<0 )

+		if ( avpops_dbf.use_table( db_hdl, &def_table)<0 )

 		{

-			LM_ERR("db-%s: cannot set table \"%s\"\n", func, def_table);

+			LM_ERR("db-%s: cannot set table \"%.*s\"\n", func, def_table.len, def_table.s);

 			return -1;

 		}

 		default_set = 1;

@@ -229,7 +231,7 @@ static inline int prepare_selection( str *uuid, str *username, str *domain,

 db_res_t *db_load_avp( str *uuid, str *username, str *domain,

-							char *attr, char *table, struct db_scheme *scheme)

+							char *attr, const str *table, struct db_scheme *scheme)

 {

 	static db_key_t   keys_ret[3];

 	unsigned int      nr_keys_cmp;

@@ -272,10 +274,9 @@ void db_close_query( db_res_t *res )

 }

-int db_store_avp( db_key_t *keys, db_val_t *vals, int n, char *table)

+int db_store_avp( db_key_t *keys, db_val_t *vals, int n, const str *table)

 {

 	int r;

-

 	if (set_table( table ,"store")!=0)

 		return -1;

@@ -291,7 +292,7 @@ int db_store_avp( db_key_t *keys, db_val_t *vals, int n, char *table)