[asterisk-commits] Revert "chan sip: Fix lastrtprx always updated" (asterisk[13.12])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/4338 )

Change subject: Revert "chan_sip: Fix lastrtprx always updated"
......................................................................


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
---
M channels/chan_sip.c
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Mark Michelson: Looks good to me, approved
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 63bfd19..afb94b7 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8628,9 +8628,7 @@
 
 	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)) {

-- 
To view, visit https://gerrit.asterisk.org/4338
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf5586adc303073a8eac667a4cbfdb6be184a64d
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 13.12
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>