Kaynağa Gözat

presence: replace STR_PARAM with PARAM_STRING

Alekzander Spiridonov 11 yıl önce
ebeveyn
işleme
4a9c049347
1 değiştirilmiş dosya ile 6 ekleme ve 15 silme
  1. 6 15
      modules/presence/presence.c

+ 6 - 15
modules/presence/presence.c

@@ -181,19 +181,19 @@ static cmd_export_t cmds[]=
 };
 
 static param_export_t params[]={
-	{ "db_url",                 STR_PARAM, &db_url.s},
-	{ "presentity_table",       STR_PARAM, &presentity_table.s},
-	{ "active_watchers_table",  STR_PARAM, &active_watchers_table.s},
-	{ "watchers_table",         STR_PARAM, &watchers_table.s},
+	{ "db_url",                 PARAM_STR, &db_url},
+	{ "presentity_table",       PARAM_STR, &presentity_table},
+	{ "active_watchers_table",  PARAM_STR, &active_watchers_table},
+	{ "watchers_table",         PARAM_STR, &watchers_table},
 	{ "clean_period",           INT_PARAM, &clean_period },
 	{ "db_update_period",       INT_PARAM, &db_update_period },
 	{ "waitn_time",             INT_PARAM, &pres_waitn_time },
 	{ "notifier_poll_rate",     INT_PARAM, &pres_notifier_poll_rate },
 	{ "notifier_processes",     INT_PARAM, &pres_notifier_processes },
-	{ "to_tag_pref",            STR_PARAM, &to_tag_pref },
+	{ "to_tag_pref",            PARAM_STRING, &to_tag_pref },
 	{ "expires_offset",         INT_PARAM, &expires_offset },
 	{ "max_expires",            INT_PARAM, &max_expires },
-	{ "server_address",         STR_PARAM, &server_address.s},
+	{ "server_address",         PARAM_STR, &server_address},
 	{ "subs_htable_size",       INT_PARAM, &shtable_size},
 	{ "pres_htable_size",       INT_PARAM, &phtable_size},
 	{ "subs_db_mode",           INT_PARAM, &subs_dbmode},
@@ -244,11 +244,7 @@ static int mod_init(void)
 		return -1;
 	}
 
-	db_url.len = db_url.s ? strlen(db_url.s) : 0;
 	LM_DBG("db_url=%s/%d/%p\n", ZSW(db_url.s), db_url.len,db_url.s);
-	presentity_table.len = strlen(presentity_table.s);
-	active_watchers_table.len = strlen(active_watchers_table.s);
-	watchers_table.len = strlen(watchers_table.s);
 
 	if(db_url.s== NULL)
 		library_mode= 1;
@@ -276,11 +272,6 @@ static int mod_init(void)
 
 	if(server_address.s== NULL)
 		LM_DBG("server_address parameter not set in configuration file\n");
-	
-	if(server_address.s)
-		server_address.len= strlen(server_address.s);
-	else
-		server_address.len= 0;
 
 	/* bind the SL API */
 	if (sl_load_api(&slb)!=0) {