[asterisk-commits] dvossel: trunk r282546 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Aug 17 15:09:30 2010
New Revision: 282546

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282546
Log:
Merged revisions 282545 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282545 | dvossel | 2010-08-17 15:08:56 -0500 (Tue, 17 Aug 2010) | 6 lines
  
  ACCEPT message should respond with the new FORMAT2 ie
  
  (closes issue #17804)
  Reported by: tpanton
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=282546&r1=282545&r2=282546
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Aug 17 15:09:30 2010
@@ -10489,6 +10489,7 @@
 							/* No authentication required, let them in */
 							memset(&ied1, 0, sizeof(ied1));
 							iax_ie_append_int(&ied1, IAX_IE_FORMAT, format);
+							iax_ie_append_versioned_uint64(&ied1, IAX_IE_FORMAT2, 0, format);
 							send_command(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_ACCEPT, 0, ied1.buf, ied1.pos, -1);
 							if (strcmp(iaxs[fr->callno]->exten, "TBD")) {
 								ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED);
@@ -10954,6 +10955,7 @@
 						/* Authentication received */
 						memset(&ied1, 0, sizeof(ied1));
 						iax_ie_append_int(&ied1, IAX_IE_FORMAT, format);
+						iax_ie_append_versioned_uint64(&ied1, IAX_IE_FORMAT2, 0, format);
 						send_command(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_ACCEPT, 0, ied1.buf, ied1.pos, -1);
 						if (strcmp(iaxs[fr->callno]->exten, "TBD")) {
 							ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_STARTED);