Commit Graph

14 Commits

Author SHA1 Message Date
Russell Bryant 79a3c3b9e1 Merged revisions 58957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58957 | russell | 2007-03-15 20:42:37 -0500 (Thu, 15 Mar 2007) | 1 line

fix a couple SLA documentation references
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-16 01:43:41 +00:00
Russell Bryant 2ea01c893c Merged revisions 58894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58894 | russell | 2007-03-14 11:33:01 -0500 (Wed, 14 Mar 2007) | 8 lines

By default, don't attempt to do any CallerID handling at all with SLA because
it is known to not work properly in some situations.  However, add an option to
enable it for those that would like to use it anyway.

The short story behind this is that to properly handle CallerID with SLA, we
need the ability to change the CallerID on an existing call, and we are not
ready to handle that.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58895 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-14 16:34:03 +00:00
Russell Bryant 2e2c6e52ee Merged revisions 58870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58870 | russell | 2007-03-13 18:11:08 -0500 (Tue, 13 Mar 2007) | 1 line

fix the reference to the SLA documentation
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-13 23:11:30 +00:00
Russell Bryant 746f3fcdb2 Add the missing configuration template to the sample config file.
Thanks to Lacy Moore on the asterisk-users list for pointing out that this
was missing!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-03 00:01:25 +00:00
Russell Bryant 3d6e6e07ef Merged revisions 57364 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57364 | russell | 2007-03-01 17:42:53 -0600 (Thu, 01 Mar 2007) | 16 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Originally, I put in the documentation that only Zap interfaces would be
  supported on the trunk side.  However, after a discussion with Qwell, we came
  up with a way to make IP trunks work as well, using some things already in
  Asterisk.  So, here it is, this now officially supports IP trunks.
* Update the SLA documentation to reflect how to setup IP trunks.
* Add a section in sla.txt that describes how to set up an SLA system with
  voicemail.
* Simplify the way DTMF passthrough is handled in MeetMe.
* Fix a bug that exposed itself when using a Local channel on the trunk side
  in SLA.  The station's channel needs to be passed to the dial API when
  dialing the trunk.
* Change a WARNING message to DEBUG in channel.h.  This message is of no use
  to users.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-01 23:44:09 +00:00
Russell Bryant ae8c0f3fcb Merged revisions 57207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57207 | russell | 2007-02-28 17:01:52 -0600 (Wed, 28 Feb 2007) | 2 lines

minor tweaks to the sla docs

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 23:02:49 +00:00
Russell Bryant 9c58ead89b Merged revisions 57203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57203 | russell | 2007-02-28 16:07:05 -0600 (Wed, 28 Feb 2007) | 7 lines

Merge more changes from svn/asterisk/team/russell/sla_updates

* Add support for private hold.  By setting "hold=private" for a trunk, only
  the station that put the call on hold will be able to retrieve it from hold.
  Also, by setting "hold=private" for a station, any call that station puts
  on hold can only be retrieved by that station.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 22:09:33 +00:00
Russell Bryant 69b0eb24ed Merged revisions 57144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57144 | russell | 2007-02-28 13:56:20 -0600 (Wed, 28 Feb 2007) | 6 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Add support for the "barge=no" option for trunks.  If this option is set,
  then stations will not be able to join in on a call that is on progress
  on this trunk.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 19:57:41 +00:00
Russell Bryant 4fd59356ef Merged revisions 57089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57089 | russell | 2007-02-28 12:20:05 -0600 (Wed, 28 Feb 2007) | 8 lines

Merge current set of changes from svn/asterisk/team/russell/sla_updates

* Add support for station ring delays.  Ring delays can be set globally for a
  station or for specific trunks on the station.
* Fix a few bugs in existing code.
* Restructure and Reorganize code to improve readability and maintainability.
* Improve formatting of the "sla show (trunks|stations)" CLI commands.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 18:21:47 +00:00
Russell Bryant 9138e53bc9 Merged revisions 56277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r56277 | russell | 2007-02-22 17:08:36 -0600 (Thu, 22 Feb 2007) | 18 lines

Merge changes from team/russell/sla_updates.

This batch of changes to the SLA code does a few different things.

* I made the SLA code event driven instead of having to act in a lot of busy
  loops while dialing things to wait for state changes.  This makes the code
  more efficient and readable at the same time.

* I have implemented a couple of new features.  The first is inbound trunk
  ringing timeouts.  This is an option that defines how long to let an incoming
  call on a trunk to ring.

* I have also implemented ring timeouts for stations.  They may be specified
  for the entire station, meaning it is how long to let the station ring before
  giving up.  You can also specify a ring timeout for a specific trunk on a
  station.  So, you can say that you only want a specific station to ring 5
  seconds if it is line1 ringing, but otherwise, there is no timeout.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-22 23:12:26 +00:00
Russell Bryant 006817c0e7 Merged revisions 55553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55553 | russell | 2007-02-20 10:41:57 -0600 (Tue, 20 Feb 2007) | 3 lines

Change the formatting of sla.conf.sample to make it more readable.  
(issue #9112, blitzrage)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 16:42:33 +00:00
Russell Bryant 5715b49c30 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
2007-02-10 00:40:57 +00:00
Russell Bryant 87ac16847e - unregister SLA apps on module unload and add sample config (issue #7701, junky)
- rename SLAS to SLAStation, and SLAT to SLATrunk


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-14 01:32:46 +00:00
Olle Johansson 2f69bec40e Add placeholder for sla.conf sample in configs/. Please update with
correct information not to overload the switchboard with calls to sales.
 Thank you! ;-)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-07 17:01:40 +00:00