kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 130044 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r130044 | kpfleming | 2008-07-11 11:18:01 -0500 (Fri, 11 Jul 2008) | 2 lines

clean up a bunch more Zaptel-related references

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-11 16:18:54 +00:00
parent f95462f418
commit 288369308e
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGES
View File

@@ -201,28 +201,28 @@ Local channel changes
feature is enabled by using the 'j' option in the Dial string to the Local feature is enabled by using the 'j' option in the Dial string to the Local
channel in conjunction with the existing 'n' option for local channels. channel in conjunction with the existing 'n' option for local channels.
Zaptel channel driver (chan_zap) Changes DAHDI channel driver (chan_dahdi) Changes
---------------------------------------- ----------------------------------------
* SS7 support in chan_zap (via libss7 library) * SS7 support (via libss7 library)
* In India, some carriers transmit CID via dtmf. Some code has been added * In India, some carriers transmit CID via dtmf. Some code has been added
that will handle some situations. The cidstart=polarity_IN choice has been added for that will handle some situations. The cidstart=polarity_IN choice has been added for
those carriers that transmit CID via dtmf after a polarity change. those carriers that transmit CID via dtmf after a polarity change.
* CID matching information is now shown when doing 'dialplan show'. * CID matching information is now shown when doing 'dialplan show'.
* Added zap show version CLI command to chan_zap. * Added dahdi show version CLI command.
* Added setvar support to zapata.conf channel entries. * Added setvar support to chan_dahdi.conf channel entries.
* Added two new options: mwimonitor and mwimonitornotify. These options allow * Added two new options: mwimonitor and mwimonitornotify. These options allow
you to enable MWI monitoring on FXO lines. When the MWI state changes, you to enable MWI monitoring on FXO lines. When the MWI state changes,
the script specified in the mwimonitornotify option is executed. An internal the script specified in the mwimonitornotify option is executed. An internal
event indicating the new state of the mailbox is also generated, so that event indicating the new state of the mailbox is also generated, so that
the normal MWI facilities in Asterisk work as usual. the normal MWI facilities in Asterisk work as usual.
* Added signalling type 'auto', which attempts to use the same signalling type * Added signalling type 'auto', which attempts to use the same signalling type
for a channel as configured in Zaptel. This is primarily designed for analog for a channel as configured in DAHDI. This is primarily designed for analog
ports, but will also work for digital ports that are configured for FXS or FXO ports, but will also work for digital ports that are configured for FXS or FXO
signalling types. This mode is also the default now, so if your zapata.conf signalling types. This mode is also the default now, so if your chan_dahdi.conf
does not specify signalling for a channel (which is unlikely as the sample does not specify signalling for a channel (which is unlikely as the sample
configuration file has always recommended specifying it for every channel) then configuration file has always recommended specifying it for every channel) then
the 'auto' mode will be used for that channel if possible. the 'auto' mode will be used for that channel if possible.
* Added a 'zap set dnd' command to allow CLI control of the Do-Not-Disturb * Added a 'dahdi set dnd' command to allow CLI control of the Do-Not-Disturb
state for a channel; also ensured that the DNDState Manager event is state for a channel; also ensured that the DNDState Manager event is
emitted no matter how the DND state is set or cleared. emitted no matter how the DND state is set or cleared.

2
contrib/utils/zones2indications.c
View File

@@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <zaptel/tonezone.h> #include <dahdi/tonezone.h>
#include <unistd.h> #include <unistd.h>
#define PROGRAM "zones2indication" #define PROGRAM "zones2indication"

36
doc/ss7.txt
View File

@@ -18,24 +18,27 @@ done for ANSI switches.
To Use: To Use:
======= =======
In order to use libss7, you must get at least the following versions of Zaptel and Asterisk: In order to use libss7, you must get at least the following versions of DAHDI and Asterisk:
Zaptel: 1.4.x DAHDI: 2.0.x
libss7: trunk (currently, there *only* is a trunk release). libss7: trunk (currently, there *only* is a trunk release).
Asterisk: trunk Asterisk: 1.6.x
You must then do a `make; make install` in each of the directories that you installed You must then do a `make; make install` in each of the directories that you installed
in the given order (Zaptel first, libss7 second, and Asterisk last). in the given order (DAHDI first, libss7 second, and Asterisk last).
NOTE: In order to check out the code, you must have the subversion client installed. This NOTE: In order to check out the code, you must have the subversion client installed. This
is how to check them out from the public subversion server. is how to check them out from the public subversion server.
These are the commands you would type to install them: These are the commands you would type to install them:
#jpeeler: REVISIT `svn co http://svn.digium.com/svn/dahdi/linux/trunk dahdi-trunk`
`svn co http://svn.digium.com/svn/zaptel/branches/1.4 zaptel-1.4` `cd dahdi-trunk`
`cd zaptel-1.4`
`make; make install` `make; make install`
`svn co http://svn.digium.com/svn/dahdi/tools/trunk dahdi-tools`
`cd dahdi-tools`
`./configure; make; make install`
`svn co http://svn.digium.com/svn/libss7/trunk libss7-trunk` `svn co http://svn.digium.com/svn/libss7/trunk libss7-trunk`
`cd libss7-trunk` `cd libss7-trunk`
`make; make install` `make; make install`
@@ -44,7 +47,7 @@ These are the commands you would type to install them:
`cd asterisk-trunk` `cd asterisk-trunk`
`./configure; make; make install;` `./configure; make; make install;`
This should build Zaptel, libss7, and Asterisk with SS7 support. This should build DAHDI, libss7, and Asterisk with SS7 support.
In the past, there was a special asterisk-ss7 branch to use which contained the SS7 code. In the past, there was a special asterisk-ss7 branch to use which contained the SS7 code.
That code has been merged back into the trunk version of Asterisk, and the old asterisk-ss7 That code has been merged back into the trunk version of Asterisk, and the old asterisk-ss7
@@ -53,18 +56,17 @@ will not work against the current version of libss7, and you should switch to as
instead. instead.
CONFIGURATION: CONFIGURATION:
In zaptel.conf, your signalling channel(s) should be a "dchan" and your bearers should In /etc/dahdi/system.conf, your signalling channel(s) should be a "dchan" and your bearers should
be set as "bchan". be set as "bchan".
In the asterisk-ss7 branch, there is a sample zapata.conf that is installed which The sample chan_dahdi.conf contains sample configuration for setting up an E1 link.
contains sample configuration for setting up an E1 link.
In brief, here is a simple ss7 linkset setup: In brief, here is a simple ss7 linkset setup:
signalling = ss7 signalling = ss7
ss7type = itu ; or ansi if you are using an ANSI link ss7type = itu ; or ansi if you are using an ANSI link
linkset = 1 ; Pick a number for your linkset identifier in zapata.conf linkset = 1 ; Pick a number for your linkset identifier in chan_dahdi.conf
pointcode = 28 ; The decimal form of your point code. If you are using an pointcode = 28 ; The decimal form of your point code. If you are using an
; ANSI linkset, you can use the xxx-xxx-xxx notation for ; ANSI linkset, you can use the xxx-xxx-xxx notation for
@@ -98,15 +100,15 @@ sigchan = 48 ; This would put two signalling channels in our linkset, one at
; Zap/16 and one at Zap/48 which both would be used to send/receive ; Zap/16 and one at Zap/48 which both would be used to send/receive
; ISUP traffic. ; ISUP traffic.
; End of zapata.conf ; End of chan_dahdi.conf
This is how a basic linkset is setup. For more detailed zapata.conf SS7 config information This is how a basic linkset is setup. For more detailed chan_dahdi.conf SS7 config information
as well as other options available for that file, see the default zapata.conf that comes as well as other options available for that file, see the default chan_dahdi.conf that comes
with the samples in asterisk. If you would like, you can do a `make samples` in your with the samples in asterisk. If you would like, you can do a `make samples` in your
asterisk-trunk directory and it will install a sample zapata.conf for you that contains asterisk-trunk directory and it will install a sample chan_dahdi.conf for you that contains
more information about SS7 setup. more information about SS7 setup.
For more information, please use the Asterisk-ss7 or Asterisk-dev mailing For more information, please use the asterisk-ss7 or asterisk-dev mailing
lists (I monitor them regularly) or email me directly. lists (I monitor them regularly) or email me directly.
Matthew Fredrickson Matthew Fredrickson