kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@122234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2008-06-12 17:27:55 +00:00
parent 6ac8ccaba4
commit ef3b214728
77 changed files with 2424 additions and 6049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/init.d/rc.mandrake.asterisk
View File

@@ -168,12 +168,12 @@ case "$1" in
;;
fullrestart)
$0 stop
service zaptel restart
service dahdi restart
$0 start
;;
fullrestartnow)
$0 stopnow
service zaptel restart
service dahdi restart
$0 start
;;
status)

12
contrib/init.d/rc.mandrake.zaptel
View File

@@ -1,11 +1,11 @@
#!/bin/sh
#
# zaptel: Loads Asterisk modules
# DAHDI: Loads Asterisk modules
#
# Version: @(#) /etc/rc.d/init.d/zaptel 1.0
# Version: @(#) /etc/rc.d/init.d/dahdi 1.0
#
# chkconfig: 2345 90 10
# description: Loads and unloads zaptel modules at boot time and shutdown.
# description: Loads and unloads DAHDI modules at boot time and shutdown.
#
# hide: true
@@ -14,12 +14,12 @@
# Source function library.
. /etc/rc.d/init.d/functions
# Default modules - override in /etc/sysconfig/zaptel
# Default modules - override in /etc/sysconfig/dahdi
######################################
MODULES="usb-uhci zaptel wcfxo wcusb"
MODULES="usb-uhci dahdi wcfxo wcusb"
######################################
# Resolve back to the basename (i.e. zaptel, not S90zaptel)
# Resolve back to the basename (i.e. dahdi, not S90dahdi)
if [ 0`readlink $0` = "0" ]; then
CONFIGFILE=/etc/sysconfig/`basename $0`
else

4
contrib/init.d/rc.suse.asterisk
View File

@@ -22,11 +22,11 @@
### BEGIN INIT INFO
# Provides: asterisk
# Required-Start: +zaptel $network $named
# Required-Start: +dahdi $network $named
# Required-Stop:
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
# Description: zaptel - zaptel modules for Asterisk
# Description: dahdi - dahdi modules for Asterisk
### END INIT INFO
# Source function library.

9
contrib/scripts/autosupport
View File

@@ -101,9 +101,9 @@ if [ "$ans" = "y" ]; then
echo >> $OUTPUT;
echo "------------------" >> $OUTPUT;
echo "ZAPTEL MODULE INFO" >> $OUTPUT;
echo "DAHDI MODULE INFO" >> $OUTPUT;
echo "------------------" >> $OUTPUT;
modinfo /lib/modules/$(uname -r)/misc/*.ko >> $OUTPUT;
modinfo /lib/modules/$(uname -r)/dahdi/*.ko >> $OUTPUT;
echo >> $OUTPUT;
echo >> $OUTPUT;
@@ -149,17 +149,18 @@ if [ "$ans" = "y" ]; then
echo >> $OUTPUT;
echo >> $OUTPUT;
#jpeeler: REVISIT
echo "------------------" >> $OUTPUT;
echo "ZAPTEL CONFIG" >> $OUTPUT;
echo "------------------" >> $OUTPUT;
grep -v '^#' /etc/zaptel.conf >> $OUTPUT;
grep -v '^#' /etc/dahdi.conf >> $OUTPUT;
echo >> $OUTPUT;
echo >> $OUTPUT;
echo "------------------" >> $OUTPUT;
echo "ZAPATA CONFIG" >> $OUTPUT;
echo "------------------" >> $OUTPUT;
grep -v '^;' /etc/asterisk/zapata.conf >> $OUTPUT;
grep -v '^;' /etc/asterisk/chan_dahdi.conf >> $OUTPUT;
echo >> $OUTPUT;
echo >> $OUTPUT;

6
contrib/scripts/loadtest.tcl
View File

@@ -8,7 +8,7 @@
#
# Create a (huge) bunch of call files to dial via pbx_spool.
# Defaults are selected with 'Enter' and, if all defaults
# are selected, you'll dial Zap/1/s into default|s|1
# are selected, you'll dial DAHDI/1/s into default|s|1
#
@@ -98,8 +98,8 @@ Account: $::account
}
# prompt the user for some info
get technology "Zap" "\nEnter technology type
Zap, IAX, SIP, etc."
get technology "DAHDI" "\nEnter technology type
DAHDI, IAX, SIP, etc."
get chans "1" "\nEnter channel(s) or group to test in formats like
2\n1-4\n3 5 7 9\n1-23,25-47,49-71,73-95\ng4\ng2,g1"
set channels [splitchans $chans]

20
contrib/utils/zones2indications.c
View File

@@ -30,7 +30,7 @@
void print_tone_zone_sound(struct ind_tone_zone *zone_data, const char* name,
int toneid) {
int i;
for (i=0; i<ZT_TONE_MAX; i++) {
for (i=0; i<DAHDI_TONE_MAX; i++) {
if (zone_data->tones[i].toneid == toneid){
printf("%s = %s\n", name, zone_data->tones[i].data);
break;
@@ -61,15 +61,15 @@ void print_indications(struct ind_tone_zone *zone_data) {
}
putchar('\n');
print_tone_zone_sound(zone_data, "dial", ZT_TONE_DIALTONE);
print_tone_zone_sound(zone_data, "busy", ZT_TONE_BUSY);
print_tone_zone_sound(zone_data, "ring", ZT_TONE_RINGTONE);
print_tone_zone_sound(zone_data, "congestion", ZT_TONE_CONGESTION);
print_tone_zone_sound(zone_data, "callwaiting", ZT_TONE_CALLWAIT);
print_tone_zone_sound(zone_data, "dialrecall", ZT_TONE_DIALRECALL);
print_tone_zone_sound(zone_data, "record", ZT_TONE_RECORDTONE);
print_tone_zone_sound(zone_data, "info", ZT_TONE_INFO);
print_tone_zone_sound(zone_data, "stutter", ZT_TONE_STUTTER);
print_tone_zone_sound(zone_data, "dial", DAHDI_TONE_DIALTONE);
print_tone_zone_sound(zone_data, "busy", DAHDI_TONE_BUSY);
print_tone_zone_sound(zone_data, "ring", DAHDI_TONE_RINGTONE);
print_tone_zone_sound(zone_data, "congestion", DAHDI_TONE_CONGESTION);
print_tone_zone_sound(zone_data, "callwaiting", DAHDI_TONE_CALLWAIT);
print_tone_zone_sound(zone_data, "dialrecall", DAHDI_TONE_DIALRECALL);
print_tone_zone_sound(zone_data, "record", DAHDI_TONE_RECORDTONE);
print_tone_zone_sound(zone_data, "info", DAHDI_TONE_INFO);
print_tone_zone_sound(zone_data, "stutter", DAHDI_TONE_STUTTER);
printf("\n\n");
}