2
0
Эх сурвалжийг харах

modules_k:nathelper - restore nortpproxy_str parameter

Ovidiu Sas 15 жил өмнө
parent
commit
f8ae37321f

+ 13 - 0
modules_k/nathelper/nathelper.c

@@ -389,6 +389,7 @@ static pv_export_t mod_pvs[] = {
 static param_export_t params[] = {
 static param_export_t params[] = {
 	{"natping_interval",      INT_PARAM, &natping_interval      },
 	{"natping_interval",      INT_PARAM, &natping_interval      },
 	{"ping_nated_only",       INT_PARAM, &ping_nated_only       },
 	{"ping_nated_only",       INT_PARAM, &ping_nated_only       },
+	{"nortpproxy_str",        STR_PARAM, &nortpproxy_str.s      },
 	{"received_avp",          STR_PARAM, &rcv_avp_param         },
 	{"received_avp",          STR_PARAM, &rcv_avp_param         },
 	{"force_socket",          STR_PARAM, &force_socket_str      },
 	{"force_socket",          STR_PARAM, &force_socket_str      },
 	{"sipping_from",          STR_PARAM, &sipping_from.s        },
 	{"sipping_from",          STR_PARAM, &sipping_from.s        },
@@ -586,6 +587,18 @@ mod_init(void)
 			return -1;
 			return -1;
 	}
 	}
 
 
+	if (nortpproxy_str.s==NULL || nortpproxy_str.s[0]==0) {
+		nortpproxy_str.len = 0;
+		nortpproxy_str.s = NULL;
+	} else {
+		nortpproxy_str.len = strlen(nortpproxy_str.s);
+		while (nortpproxy_str.len > 0 && (nortpproxy_str.s[nortpproxy_str.len - 1] == '\r' ||
+			nortpproxy_str.s[nortpproxy_str.len - 1] == '\n'))
+				nortpproxy_str.len--;
+		if (nortpproxy_str.len == 0)
+			nortpproxy_str.s = NULL;
+	}
+
 	if (natping_interval > 0) {
 	if (natping_interval > 0) {
 		bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0);
 		bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0);
 		if (!bind_usrloc) {
 		if (!bind_usrloc) {