Merged revisions 339088 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Mon, 3 Oct 2011 18:58:33 +0000 (18:58 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 3 Oct 2011 18:58:33 +0000 (18:58 +0000)
commit2644af39b49a00905eaa23d0cd95d3550ef1613b
treebe91b159b4df7d2216374077b509c5f3dd2fcfe0
parent69ea68a1f5bf287ba9333482dc240d129d35be9d
Merged revisions 339088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339088 | twilson | 2011-10-03 11:44:27 -0700 (Mon, 03 Oct 2011) | 17 lines

  Merged revisions 339086 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339086 | twilson | 2011-10-03 11:40:52 -0700 (Mon, 03 Oct 2011) | 10 lines

    Properly ignore AST_CONTROL_UPDATE_RTP_PEER in more places

    After the change in r336294, the new AST_CONTROL_UPDATE_RTP_PEER frame
    is sent when a re-invite happens. If we receive a re-invite from a device
    the waitstream_core was not aware of the new control frame and would drop
    the call.

    (closes issue ASTERISK-18610)
     Reported by: Kristijan_Vrban
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c
main/file.c