Merged revisions 323370 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Tue, 14 Jun 2011 17:03:37 +0000 (17:03 +0000)
committerTerry Wilson <twilson@digium.com>
Tue, 14 Jun 2011 17:03:37 +0000 (17:03 +0000)
commitabd7ef817eb96193486f61848313d2e267c2b503
tree9656c5e9abe9c471c0e64801869675d13c4a603e
parent00181729b4c4a62e6baccf3b91b452d61af116b2
Merged revisions 323370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323370 | twilson | 2011-06-14 09:33:55 -0700 (Tue, 14 Jun 2011) | 10 lines

  Add rtpkeepalives back to 1.8

  The RTP-engine conversion left out support for handling rtpkeepalives.
  This patch adds them back.

  (closes issue ASTERISK-17304)
  Reported by: lmadsen

  Review: https://reviewboard.asterisk.org/r/1226/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c
include/asterisk/rtp_engine.h
main/rtp_engine.c
res/res_rtp_asterisk.c