registrar: replace STR_PARAM with PARAM_STRING

modules/registrar/reg_mod.c

@@ -219,19 +219,19 @@ static param_export_t params[] = {
 	{"realm_prefix",       PARAM_STR, &default_registrar_cfg.realm_pref          		},
 	{"min_expires",        INT_PARAM, &default_registrar_cfg.min_expires			},
 	{"max_expires",        INT_PARAM, &default_registrar_cfg.max_expires			},
-	{"received_param",     STR_PARAM, &rcv_param           					},
-	{"received_avp",       STR_PARAM, &rcv_avp_param       					},
-	{"reg_callid_avp",     STR_PARAM, &reg_callid_avp_param					},
+	{"received_param",     PARAM_STR, &rcv_param           					},
+	{"received_avp",       PARAM_STRING, &rcv_avp_param       					},
+	{"reg_callid_avp",     PARAM_STRING, &reg_callid_avp_param					},
 	{"max_contacts",       INT_PARAM, &default_registrar_cfg.max_contacts			},
 	{"retry_after",        INT_PARAM, &default_registrar_cfg.retry_after			},
 	{"sock_flag",          INT_PARAM, &sock_flag           					},
-	{"sock_hdr_name",      STR_PARAM, &sock_hdr_name.s     					},
+	{"sock_hdr_name",      PARAM_STR, &sock_hdr_name     					},
 	{"method_filtering",   INT_PARAM, &method_filtering    					},
 	{"use_path",           INT_PARAM, &path_enabled        					},
 	{"path_mode",          INT_PARAM, &path_mode           					},
 	{"path_use_received",  INT_PARAM, &path_use_params     					},
-	{"xavp_cfg",           STR_PARAM, &reg_xavp_cfg.s     					},
-	{"xavp_rcd",           STR_PARAM, &reg_xavp_rcd.s     					},
+	{"xavp_cfg",           PARAM_STR, &reg_xavp_cfg     					},
+	{"xavp_rcd",           PARAM_STR, &reg_xavp_rcd     					},
 	{"gruu_enabled",       INT_PARAM, &reg_gruu_enabled    					},
 	{"outbound_mode",      INT_PARAM, &reg_outbound_mode					},
 	{"regid_mode",         INT_PARAM, &reg_regid_mode					},
@@ -300,8 +300,6 @@ static int mod_init(void)
 		LM_ERR("cannot bind to SL API\n");
 		return -1;
 	}
-
-	rcv_param.len = strlen(rcv_param.s);
 	
 	if(cfg_declare("registrar", registrar_cfg_def, &default_registrar_cfg, cfg_sizeof(registrar), &registrar_cfg)){
 		LM_ERR("Fail to declare the configuration\n");
@@ -389,11 +387,8 @@ static int mod_init(void)
 	reg_use_domain = ul.use_domain;
 
 	if (sock_hdr_name.s) {
-		sock_hdr_name.len = strlen(sock_hdr_name.s);
 		if (sock_hdr_name.len==0 || sock_flag==-1) {
 			LM_WARN("empty sock_hdr_name or sock_flag no set -> reseting\n");
-			pkg_free(sock_hdr_name.s);
-			sock_hdr_name.s = 0;
 			sock_hdr_name.len = 0;
 			sock_flag = -1;
 		}
@@ -422,12 +417,6 @@ static int mod_init(void)
 	sock_flag = (sock_flag!=-1)?(1<<sock_flag):0;
 	tcp_persistent_flag = (tcp_persistent_flag!=-1)?(1<<tcp_persistent_flag):0;
 
-	if (reg_xavp_cfg.s) {
-		reg_xavp_cfg.len = strlen(reg_xavp_cfg.s);
-	}
-	if (reg_xavp_rcd.s) {
-		reg_xavp_rcd.len = strlen(reg_xavp_rcd.s);
-	}
 	return 0;
 }