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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282546 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 7bcb9f8603ce306c7035b27eb48770d086a9d240..f038f205e3e633273248c1883368c72d1fdd6f9e 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -10489,6 +10489,7 @@ retryowner:
                                                        /* 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 @@ retryowner2:
                                                /* 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);