diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-03-01 23:44:09 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-03-01 23:44:09 +0000 |
| commit | 3d6e6e07ef6d20af1d59c58fe86541cf1b82b2ea (patch) | |
| tree | 76b43624a1fb75588685190b618d6f79bef504b3 /configs | |
| parent | b3bc6754028ada39dd198911796414da3ee4f4ef (diff) | |
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
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sla.conf.sample | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configs/sla.conf.sample b/configs/sla.conf.sample index 5e2aeeb90..0018ead65 100644 --- a/configs/sla.conf.sample +++ b/configs/sla.conf.sample @@ -18,7 +18,10 @@ ;type=trunk ; This line is what marks this entry as a trunk. ;device=Zap/3 ; Map this trunk declaration to a specific device. - ; NOTE: At this point, this *must* be a zap channel! + ; NOTE: You can not just put any type of channel here. + ; Zap channels can be directly used. IP trunks + ; require some indirect configuration which is + ; described in doc/sla.txt. ;autocontext=line1 ; This supports automatic generation of the dialplan entries ; if the autocontext option is used. Each trunk should have @@ -52,7 +55,10 @@ ;[line4] ;type=trunk -;device=Zap/4 +;device=Local/disa@line4_outbound ; A Local channel in combination with the Disa + ; application can be used to support IP trunks. + ; See doc/sla.txt on more information on how + ; IP trunks work. ;autocontext=line4 ; -------------------------------------- |