Merged revisions 53810 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Sat, 10 Feb 2007 00:40:57 +0000 (00:40 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 10 Feb 2007 00:40:57 +0000 (00:40 +0000)
commit5715b49c30e42da5849034b3254e25519edd5122
treee653620c20f6cc81ee92da1a177d905223e42f59
parentac4090fce0d6b8ce9f4188de132fa4a66e3c07b1
Merged revisions 53810 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53810 | russell | 2007-02-09 18:35:09 -0600 (Fri, 09 Feb 2007) | 24 lines

Merge team/russell/sla_rewrite

This is a completely new implementation of the SLA functionality introduced in
Asterisk 1.4.  It is now functional and ready for testing.  However, I will be
adding some additional features over the next week, as well.

For information on how to set this up, see configs/sla.conf.sample
and doc/sla.txt.

In addition to the changes in app_meetme.c for the SLA implementation itself,
this merge brings in various other changes:

chan_sip:
 - Add the ability to indicate HOLD state in NOTIFY messages.
 - Queue HOLD and UNHOLD control frames even if the channel is not bridged to
   another channel.

linkedlists.h:
 - Add support for rwlock based linked lists.

dial.c:
 - Add the ability to run ast_dial_start() without a reference channel to
   inherit information from.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c
channels/chan_sip.c
configs/sla.conf.sample
doc/sla.txt [new file with mode: 0644]
include/asterisk/app.h
include/asterisk/dial.h
include/asterisk/utils.h
main/dial.c