summaryrefslogtreecommitdiff
path: root/channels/chan_iax2.c
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2010-08-17 20:09:30 +0000
committerDavid Vossel <dvossel@digium.com>2010-08-17 20:09:30 +0000
commit06c6b2c7ebb6972afe7dab9205825e20cba697ef (patch)
tree6ee92d32e641083ea07800e4e8a9f5ec3c871c91 /channels/chan_iax2.c
parent5729763b8934dbe19ee21287f5b92b4e10a2e304 (diff)
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
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r--channels/chan_iax2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 7bcb9f860..f038f205e 100644
--- 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);