This fix is also needed for 13. On Wed, Apr 8, 2015 at 8:02 AM, SVN commits to the Asterisk project <[email protected]> wrote: > Author: mjordan > Date: Wed Apr 8 07:02:37 2015 > New Revision: 434294 > > URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434294 > Log: > chan_iax2: Fix compilation issue due to funky merge > > Don't mix declarations and code! > > Modified: > trunk/channels/chan_iax2.c > > Modified: trunk/channels/chan_iax2.c > URL: > http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=434294&r1=434293&r2=434294 > ============================================================================== > --- trunk/channels/chan_iax2.c (original) > +++ trunk/channels/chan_iax2.c Wed Apr 8 07:02:37 2015 > @@ -12350,14 +12350,15 @@ > /* And send the poke */ > ast_mutex_lock(&iaxsl[callno]); > if (iaxs[callno]) { > - /* Speed up retransmission times for this qualify call */ > - iaxs[callno]->pingtime = peer->maxms / 4 + 1; > - iaxs[callno]->peerpoke = peer; > - > struct iax_ie_data ied = { > .buf = { 0 }, > .pos = 0, > }; > + > + /* Speed up retransmission times for this qualify call */ > + iaxs[callno]->pingtime = peer->maxms / 4 + 1; > + iaxs[callno]->peerpoke = peer; > + > add_empty_calltoken_ie(iaxs[callno], &ied); /* this _MUST_ be > the last ie added */ > send_command(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_POKE, > 0, ied.buf, ied.pos, -1); > } > > > -- > _____________________________________________________________________ > -- Bandwidth and Colocation Provided by http://www.api-digital.com -- > > asterisk-commits mailing list > To UNSUBSCRIBE or update options visit: > http://lists.digium.com/mailman/listinfo/asterisk-commits
-- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
