<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10816">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua C. Colp: Looks good to me, but someone else must approve
Benjamin Keith Ford: Looks good to me, but someone else must approve
Corey Farrell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_rtp_asterisk: Remove some unused structure fields.<br><br>All of the fields that were removed were no longer referenced except for<br>'lastrxts' and 'rxseqno' which were only ever written to.<br><br>Change-Id: I5a5d31eb33e97663843698f58d0d97f22a76627c<br>---<br>M res/res_rtp_asterisk.c<br>1 file changed, 0 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c</span><br><span>index 1901c10..a13725a 100644</span><br><span>--- a/res/res_rtp_asterisk.c</span><br><span>+++ b/res/res_rtp_asterisk.c</span><br><span>@@ -323,12 +323,10 @@</span><br><span> unsigned int themssrc; /*!< Their SSRC */</span><br><span> unsigned int themssrc_valid; /*!< True if their SSRC is available. */</span><br><span> unsigned int lastts;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int lastrxts;</span><br><span> unsigned int lastividtimestamp;</span><br><span> unsigned int lastovidtimestamp;</span><br><span> unsigned int lastitexttimestamp;</span><br><span> unsigned int lastotexttimestamp;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int lasteventseqn;</span><br><span> int lastrxseqno; /*!< Last received sequence number, from the network */</span><br><span> int expectedrxseqno; /*!< Next expected sequence number, from the network */</span><br><span> AST_VECTOR(, int) missing_seqno; /*!< A vector of sequence numbers we never received */</span><br><span>@@ -345,10 +343,6 @@</span><br><span> struct ast_format *lasttxformat;</span><br><span> struct ast_format *lastrxformat;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int rtptimeout; /*!< RTP timeout time (negative or zero means disabled, negative value means temporarily disabled) */</span><br><span style="color: hsl(0, 100%, 40%);">- int rtpholdtimeout; /*!< RTP timeout when on hold (negative or zero means disabled, negative value means temporarily disabled). */</span><br><span style="color: hsl(0, 100%, 40%);">- int rtpkeepalive; /*!< Send RTP comfort noice packets for keepalive */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* DTMF Reception Variables */</span><br><span> char resp; /*!< The current digit being processed */</span><br><span> unsigned int last_seqno; /*!< The last known sequence number for any DTMF packet */</span><br><span>@@ -367,17 +361,11 @@</span><br><span> struct timeval rxcore;</span><br><span> struct timeval txcore;</span><br><span> double drxcore; /*!< The double representation of the first received packet */</span><br><span style="color: hsl(0, 100%, 40%);">- struct timeval lastrx; /*!< timeval when we last received a packet */</span><br><span> struct timeval dtmfmute;</span><br><span> struct ast_smoother *smoother;</span><br><span style="color: hsl(0, 100%, 40%);">- int *ioid;</span><br><span> unsigned short seqno; /*!< Sequence number, RFC 3550, page 13. */</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned short rxseqno;</span><br><span> struct ast_sched_context *sched;</span><br><span style="color: hsl(0, 100%, 40%);">- struct io_context *io;</span><br><span style="color: hsl(0, 100%, 40%);">- void *data;</span><br><span> struct ast_rtcp *rtcp;</span><br><span style="color: hsl(0, 100%, 40%);">- struct ast_rtp *bridged; /*!< Who we are Packet bridged to */</span><br><span> unsigned int asymmetric_codec; /*!< Indicate if asymmetric send/receive codecs are allowed */</span><br><span> </span><br><span> struct ast_rtp_instance *bundled; /*!< The RTP instance we are bundled to */</span><br><span>@@ -6456,7 +6444,6 @@</span><br><span> ast_codec_media_type2str(ast_format_get_type(rtp->f.subclass.format)));</span><br><span> return &ast_null_frame;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rtp->rxseqno = seqno;</span><br><span> </span><br><span> if (rtp->dtmf_timeout && rtp->dtmf_timeout < timestamp) {</span><br><span> rtp->dtmf_timeout = 0;</span><br><span>@@ -6472,8 +6459,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rtp->lastrxts = timestamp;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> rtp->f.src = "RTP";</span><br><span> rtp->f.mallocd = 0;</span><br><span> rtp->f.datalen = res - hdrlen;</span><br><span>@@ -6863,7 +6848,6 @@</span><br><span> ast_sockaddr_copy(&rtp->rtcp->them, &addr);</span><br><span> ast_sockaddr_set_port(&rtp->rtcp->them, ast_sockaddr_port(&addr) + 1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rtp->rxseqno = 0;</span><br><span> ast_set_flag(rtp, FLAG_NAT_ACTIVE);</span><br><span> if (rtpdebug)</span><br><span> ast_debug(0, "RTP NAT: Got audio from other end. Now sending to address %s\n",</span><br><span>@@ -7385,8 +7369,6 @@</span><br><span> ast_rtp_instance_set_remote_address(mapping->instance, addr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rtp->rxseqno = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (strictrtp && rtp->strict_rtp_state != STRICT_RTP_OPEN</span><br><span> && !ast_sockaddr_isnull(addr) && ast_sockaddr_cmp(addr, &rtp->strict_rtp_address)) {</span><br><span> /* We only need to learn a new strict source address if we've been told the source is</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10816">change 10816</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10816"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5a5d31eb33e97663843698f58d0d97f22a76627c </div>
<div style="display:none"> Gerrit-Change-Number: 10816 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua C. Colp <jcolp@digium.com> </div>