[nathelper]before trying to remove check if remove_on_timeout flag set

OpenSIPS · Jan 22, 2016 · dfa7787 · dfa7787
1 parent 9f68260
commit dfa7787
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c
@@ -569,7 +569,7 @@ mod_init(void)
 			sipping_method.len = strlen(sipping_method.s);
 			sipping_from.len = strlen(sipping_from.s);
 			exports.response_f = sipping_rpl_filter;
-			init_sip_ping();
+			init_sip_ping(rm_on_to_flag);
 		}
 
 		if (REMOVE_ON_TIMEOUT &&

diff --git a/modules/nathelper/sip_pinger.h b/modules/nathelper/sip_pinger.h
@@ -68,9 +68,10 @@ static int  sipping_callid_cnt = 0;
 static str  sipping_callid = {0,0};
 static str  sipping_from = {0,0};
 static str  sipping_method = {"OPTIONS",7};
+static int  remove_on_timeout=0;
 
 
-static void init_sip_ping(void)
+static void init_sip_ping(int rto)
 {
 	int len;
 	char *p;
@@ -85,6 +86,7 @@ static void init_sip_ping(void)
 	sipping_callid.len = 8-len;
 	/* callid counter part */
 	sipping_callid_cnt = rand();
+	remove_on_timeout=(rto>0?1:0);
 }
 
 
@@ -186,7 +188,7 @@ static int sipping_rpl_filter(struct sip_msg *rpl)
 	LM_DBG("reply for SIP natping filtered\n");
 	/* it's a reply to a SIP NAT ping -> absorb it and stop any
 	 * further processing of it */
-	if (parse_branch(rpl->via1->branch->value))
+	if (remove_on_timeout && parse_branch(rpl->via1->branch->value))
 			goto skip;
 
 	return 0;