From: Kevin Harwell <kharwell@digium.com>
Date: Fri, 4 Nov 2016 15:57:43 +0000 (-0500)
Subject: Revert "chan_sip: Fix lastrtprx always updated"
X-Git-Tag: 14.2.0-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac82b40bff261c4e35e1f354056dfad4fc20e153;p=thirdparty%2Fasterisk.git

Revert "chan_sip: Fix lastrtprx always updated"

This reverts commit 93332cb1d0eea18021ea6538237297e627d6e2fc.

Unfortunately, the aforementioned commit caused a regression (incoming calls
would eventually disconnect). Thus it is being removed.

ASTERISK-26523 #close
ASTERISK-25270

Change-Id: Ibf5586adc303073a8eac667a4cbfdb6be184a64d
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 260ff0a03c..297981af14 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8633,9 +8633,7 @@ static struct ast_frame *sip_read(struct ast_channel *ast)
 
 	sip_pvt_lock(p);
 	fr = sip_rtp_read(ast, p, &faxdetected);
-	if (fr && fr->frametype != AST_FRAME_NULL) {
-		p->lastrtprx = time(NULL);
-	}
+	p->lastrtprx = time(NULL);
 
 	/* If we detect a CNG tone and fax detection is enabled then send us off to the fax extension */
 	if (faxdetected && ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT_CNG)) {