Bladeren bron

rtpengine: replace STR_PARAM with PARAM_STRING

Alekzander Spiridonov 11 jaren geleden
bovenliggende
commit
448202fde6
2 gewijzigde bestanden met toevoegingen van 6 en 12 verwijderingen
  1. 6 9
      modules/rtpengine/rtpengine.c
  2. 0 3
      modules/rtpengine/rtpengine_db.c

+ 6 - 9
modules/rtpengine/rtpengine.c

@@ -404,16 +404,16 @@ static pv_export_t mod_pvs[] = {
 };
 };
 
 
 static param_export_t params[] = {
 static param_export_t params[] = {
-	{"rtpengine_sock",        STR_PARAM|USE_FUNC_PARAM,
+	{"rtpengine_sock",        PARAM_STRING|USE_FUNC_PARAM,
 	                         (void*)rtpengine_set_store          },
 	                         (void*)rtpengine_set_store          },
 	{"rtpengine_disable_tout",INT_PARAM, &rtpengine_disable_tout },
 	{"rtpengine_disable_tout",INT_PARAM, &rtpengine_disable_tout },
 	{"rtpengine_retr",        INT_PARAM, &rtpengine_retr         },
 	{"rtpengine_retr",        INT_PARAM, &rtpengine_retr         },
 	{"rtpengine_tout",        INT_PARAM, &rtpengine_tout         },
 	{"rtpengine_tout",        INT_PARAM, &rtpengine_tout         },
-	{"db_url",                STR_PARAM, &rtpp_db_url.s },
-	{"table_name",            STR_PARAM, &rtpp_table_name.s },
-	{"url_col",               STR_PARAM, &rtpp_url_col.s },
-	{"extra_id_pv",           STR_PARAM, &extra_id_pv_param.s },
-	{"setid_avp",             STR_PARAM, &setid_avp_param },
+	{"db_url",                PARAM_STR, &rtpp_db_url },
+	{"table_name",            PARAM_STR, &rtpp_table_name },
+	{"url_col",               PARAM_STR, &rtpp_url_col },
+	{"extra_id_pv",           PARAM_STR, &extra_id_pv_param },
+	{"setid_avp",             PARAM_STRING, &setid_avp_param },
 	{0, 0, 0}
 	{0, 0, 0}
 };
 };
 
 
@@ -918,9 +918,6 @@ mod_init(void)
 		return -1;
 		return -1;
 	}
 	}
 
 
-	rtpp_table_name.len = strlen(rtpp_table_name.s);
-	rtpp_url_col.len = strlen(rtpp_url_col.s);
-
 	/* any rtpproxy configured? */
 	/* any rtpproxy configured? */
 	if(rtpp_set_list)
 	if(rtpp_set_list)
 		default_rtpp_set = select_rtpp_set(DEFAULT_RTPP_SET_ID);
 		default_rtpp_set = select_rtpp_set(DEFAULT_RTPP_SET_ID);

+ 0 - 3
modules/rtpengine/rtpengine_db.c

@@ -130,9 +130,6 @@ int init_rtpproxy_db(void)
 		/* Database not configured */
 		/* Database not configured */
 		return 0;
 		return 0;
 
 
-	rtpp_db_url.len = strlen(rtpp_db_url.s);
-	rtpp_table_name.len = strlen(rtpp_table_name.s);
-
 	if (db_bind_mod(&rtpp_db_url, &rtpp_dbf) < 0)
 	if (db_bind_mod(&rtpp_db_url, &rtpp_dbf) < 0)
 	{
 	{
 		LM_ERR("Unable to bind to db driver - %.*s\n", rtpp_db_url.len, rtpp_db_url.s);
 		LM_ERR("Unable to bind to db driver - %.*s\n", rtpp_db_url.len, rtpp_db_url.s);