[Asterisk-code-review] Revert "res_rtp_asterisk: Resolve loop when receive buffer is flushed" (asterisk[certified/16.8])

Joshua Colp asteriskteam at digium.com
Wed Apr 22 13:43:31 CDT 2020


Joshua Colp has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/14293 )

Change subject: Revert "res_rtp_asterisk: Resolve loop when receive buffer is flushed"
......................................................................

Revert "res_rtp_asterisk: Resolve loop when receive buffer is flushed"

This reverts commit 22bc8a71680e4099ffd3ccff7b3fe33d26291c36.

Reason for revert: Waiting for future release.

Change-Id: If924f0b7fa02a72b52c708aa80addc361a87b490
---
M res/res_rtp_asterisk.c
1 file changed, 0 insertions(+), 8 deletions(-)

Approvals:
  Friendly Automation: Verified
  Joshua Colp: Looks good to me, approved; Approved for Submit



diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 134eebc..6c4f408 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -7736,14 +7736,6 @@
 					ast_debug(2, "Inserted just received packet with sequence number '%d' in correct order on RTP instance '%p'\n",
 						seqno, instance);
 				}
-				/* It is possible due to packet retransmission for this packet to also exist in the receive
-				 * buffer so we explicitly remove it in case this occurs, otherwise the receive buffer will
-				 * never be empty.
-				 */
-				payload = (struct ast_rtp_rtcp_nack_payload *)ast_data_buffer_remove(rtp->recv_buffer, seqno);
-				if (payload) {
-					ast_free(payload);
-				}
 				rtp->expectedrxseqno++;
 				if (rtp->expectedrxseqno == SEQNO_CYCLE_OVER) {
 					rtp->expectedrxseqno = 0;

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/14293
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: certified/16.8
Gerrit-Change-Id: If924f0b7fa02a72b52c708aa80addc361a87b490
Gerrit-Change-Number: 14293
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: nappsoft <infos at nappsoft.ch>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200422/556f1d2c/attachment.html>


More information about the asterisk-code-review mailing list