XPP tools rename: part 2.

Removed obsolete astribank_hook (not needed) and print_modes (moved to
kernel).


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4416 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 62 insertions, 62 deletions

diff --git a/xpp/dahdi_genconf b/xpp/dahdi_genconf
index 7f94f6b..83fd0d4 100755
--- a/xpp/dahdi_genconf
+++ b/xpp/dahdi_genconf
@@ -9,11 +9,11 @@
 #
 use strict;
 use File::Basename;
-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/zconf"); }
+BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); }
 
-use Zaptel;
-use Zaptel::Xpp;
-use Zaptel::Config::Defaults;
+use Dahdi;
+use Dahdi::Xpp;
+use Dahdi::Config::Defaults;
 
 my %default_context = (
 	FXO	=> 'from-pstn',
@@ -47,14 +47,14 @@ my %default_group = (
 
 my $fxs_default_start = 'ls';
 
-my %default_zaptel_signalling = (
+my %default_dahdi_signalling = (
 	FXO	=> 'fxsks',
 	FXS	=> "fxo{fxs_default_start}",
 	IN	=> "fxo{fxs_default_start}",
 	OUT	=> "fxo{fxs_default_start}",
 	);
 
-my %default_zapata_signalling = (
+my %default_chan_dahdi_signalling = (
 	FXO	=> 'fxs_ks',
 	FXS	=> "fxo_{fxs_default_start}",
 	IN	=> "fxo_{fxs_default_start}",
@@ -69,7 +69,7 @@ my $defaultzone = $lc_country;
 my $bri_sig_style = 'bri_ptmp';
 my $brint_overlap = 'no';
 
-my %zaptel_default_vars = (
+my %dahdi_default_vars = (
 		base_exten		=> \$base_exten,
 		fxs_immediate		=> \$fxs_immediate,
 		fxs_default_start	=> \$fxs_default_start,
@@ -87,15 +87,15 @@ my %zaptel_default_vars = (
 						\$default_group{OUT},
 					],
 		group_lines		=> \$default_group{FXO},
-		ZAPBRI_SIGNALLING	=> \$bri_sig_style,
+		DAHDI_BRI_SIGNALLING	=> \$bri_sig_style,
 		brint_overlap		=> \$brint_overlap,
 		);
 
-sub map_zaptel_defaults {
+sub map_dahdi_defaults {
 	my %defaults = @_;
 	foreach my $name (keys %defaults) {
 		my $val = $defaults{$name};
-		my $ref = $zaptel_default_vars{$name};
+		my $ref = $dahdi_default_vars{$name};
 		my $type = ref $ref;
 		my @vars = ();
 		# Some broken shells (msh) export even variables
@@ -115,21 +115,21 @@ sub map_zaptel_defaults {
 }
 
 
-my $zapconf_file;
-my $zapatachannels_file;
+my $dahdiconf_file;
+my $chan_dahdi_channels_file;
 my $users_file;
-my $zapataconf_file;
+my $chan_dahdi_conf_file;
 
 my %files = (
-	zaptel		=> { file => \$zapconf_file, func => \&gen_zaptelconf },
-	zapata		=> { file => \$zapatachannels_file, func => \&gen_zapatachannelsconf },
+	dahdi		=> { file => \$dahdiconf_file, func => \&gen_dahdiconf },
+	chan_dahdi	=> { file => \$chan_dahdi_channels_file, func => \&gen_chan_dahdi_channelsconf },
 	users		=> { file => \$users_file, func => \&gen_usersconf },
-	zapataconf	=> { file => \$zapataconf_file, func => \&gen_zapataconf },
+	chan_dahdi_full	=> { file => \$chan_dahdi_conf_file, func => \&gen_chan_dahdi_conf },
 );
 
-my @default_files = ("zaptel", "zapata");
+my @default_files = ("dahdi", "chan_dahdi");
 
-my @spans = Zaptel::spans();
+my @spans = Dahdi::spans();
 
 sub bchan_range($) {
 	my $span = shift || die;
@@ -156,7 +156,7 @@ sub bchan_range($) {
 	return join(',', @range);
 }
 
-sub gen_zaptel_signalling($) {
+sub gen_dahdi_signalling($) {
 	my $chan = shift || die;
 	my $type = $chan->type;
 	my $num = $chan->num;
@@ -166,7 +166,7 @@ sub gen_zaptel_signalling($) {
 		printf "# channel %d, %s, no module.\n", $num, $chan->fqn;
 		return;
 	}
-	my $sig = $default_zaptel_signalling{$type} || die "unknown default zaptel signalling for chan $chan type $type";
+	my $sig = $default_dahdi_signalling{$type} || die "unknown default dahdi signalling for chan $chan type $type";
 	if ($type eq 'IN') {
 		printf "# astbanktype: input\n";
 	} elsif ($type eq 'OUT') {
@@ -177,7 +177,7 @@ sub gen_zaptel_signalling($) {
 
 my $bri_te_last_timing = 1;
 
-sub gen_zaptel_digital($) {
+sub gen_dahdi_digital($) {
 	my $span = shift || die;
 	my $num = $span->num() || die;
 	die "Span #$num is analog" unless $span->is_digital();
@@ -206,7 +206,7 @@ sub gen_zaptel_digital($) {
 	printf "dchan=%d\n", $dchan->num();
 }
 
-sub gen_zaptelconf($) {
+sub gen_dahdiconf($) {
 	my $file = shift || die;
 	rename "$file", "$file.bak"
 		or $! == 2	# ENOENT (No dependency on Errno.pm)
@@ -215,15 +215,15 @@ sub gen_zaptelconf($) {
 	my $old = select F;
 	printf "# Autogenerated by %s on %s -- do not hand edit\n", $0, scalar(localtime);
 	print <<"HEAD";
-# Zaptel Configuration File
+# Dahdi Configuration File
 #
-# This file is parsed by the Zaptel Configurator, ztcfg
+# This file is parsed by the Dahdi Configurator, ztcfg
 #
 HEAD
 	foreach my $span (@spans) {
 		printf "# Span %d: %s %s\n", $span->num, $span->name, $span->description;
 		if($span->is_digital()) {
-			gen_zaptel_digital($span);
+			gen_dahdi_digital($span);
 		} else {
 			foreach my $chan ($span->chans()) {
 				if(1 || !defined $chan->type) {
@@ -233,7 +233,7 @@ HEAD
 						unless defined $type;
 					$chan->type($type);
 				}
-				gen_zaptel_signalling($chan);
+				gen_dahdi_signalling($chan);
 			}
 		}
 		print "\n";
@@ -257,7 +257,7 @@ my %DefaultConfigs = (
 	txgain => 0,
 );
 
-sub reset_zapata_values {
+sub reset_chan_dahdi_values {
 	foreach my $arg (@_) {
 		if (exists $DefaultConfigs{$arg}) {
 			print "$arg = $DefaultConfigs{$arg}\n";
@@ -267,7 +267,7 @@ sub reset_zapata_values {
 	}
 }
 
-sub gen_zapata_digital($) {
+sub gen_chan_dahdi_digital($) {
 	my $span = shift || die;
 	my $num = $span->num() || die;
 	die "Span #$num is analog" unless $span->is_digital();
@@ -296,23 +296,23 @@ sub gen_zapata_digital($) {
 	printf "switchtype = %s\n", $span->switchtype;
 	printf "signalling = %s\n", $sig;
 	printf "channel => %s\n", bchan_range($span);
-	reset_zapata_values(@to_reset);
+	reset_chan_dahdi_values(@to_reset);
 }
 
-sub gen_zapata_channel($) {
+sub gen_chan_dahdi_channel($) {
 	my $chan = shift || die;
 	my $type = $chan->type;
 	my $num = $chan->num;
 	die "channel $num type $type is not an analog channel\n" if $chan->span->is_digital();
 	my $exten = $base_exten + $num;
-	my $sig = $default_zapata_signalling{$type};
+	my $sig = $default_chan_dahdi_signalling{$type};
 	my $context = $default_context{$type};
 	my $group = $default_group{$type};
 	my $callerid;
 	my $immediate;
 
 	return if $type eq 'EMPTY';
-	die "missing default_zapata_signalling for chan #$num type $type" unless $sig;
+	die "missing default_chan_dahdi_signalling for chan #$num type $type" unless $sig;
 	$callerid = ($type eq 'FXO')
 			? 'asreceived'
 			: sprintf "\"Channel %d\" <%04d>", $num, $exten;
@@ -347,7 +347,7 @@ sub gen_zapata_channel($) {
 	print "\n";
 }
 
-sub gen_zapatachannelsconf($) {
+sub gen_chan_dahdi_channelsconf($) {
 	my $file = shift || die;
 	rename "$file", "$file.bak"
 		or $! == 2	# ENOENT (No dependency on Errno.pm)
@@ -356,20 +356,20 @@ sub gen_zapatachannelsconf($) {
 	my $old = select F;
 	printf "; Autogenerated by %s on %s -- do not hand edit\n", $0, scalar(localtime);
 	print <<"HEAD";
-; Zaptel Channels Configurations (zapata.conf)
+; Dahdi Channels Configurations (chan_dahdi.conf)
 ;
-; This is not intended to be a complete zapata.conf. Rather, it is intended
-; to be #include-d by /etc/zapata.conf that will include the global settings
+; This is not intended to be a complete chan_dahdi.conf. Rather, it is intended
+; to be #include-d by /etc/asterisk/chan_dahdi.conf that will include the global settings
 ;
 
 HEAD
 	foreach my $span (@spans) {
 		printf "; Span %d: %s %s\n", $span->num, $span->name, $span->description;
 		if($span->is_digital()) {
-			gen_zapata_digital($span);
+			gen_chan_dahdi_digital($span);
 		} else {
 			foreach my $chan ($span->chans()) {
-				gen_zapata_channel($chan);
+				gen_chan_dahdi_channel($chan);
 			}
 		}
 		print "\n";
@@ -384,10 +384,10 @@ sub gen_users_channel($) {
 	my $num = $chan->num;
 	die "channel $num type $type is not an analog channel\n" if $chan->span->is_digital();
 	my $exten = $base_exten + $num;
-	my $sig = $default_zapata_signalling{$type};
+	my $sig = $default_chan_dahdi_signalling{$type};
 	my $full_name = "$type $num";
 
-	die "missing default_zapata_signalling for chan #$num type $type" unless $sig;
+	die "missing default_chan_dahdi_signalling for chan #$num type $type" unless $sig;
 	print << "EOF";
 [$exten]
 callwaiting = yes
@@ -406,7 +406,7 @@ threewaycalling = yes
 vmsecret = 1234
 secret = 1234
 signalling = $sig
-zapchan = $num
+dahdichan = $num
 registeriax = no
 registersip = no
 canreinvite = no
@@ -505,7 +505,7 @@ HEAD
 	select $old;
 }
 
-sub gen_zapataconf($) {
+sub gen_chan_dahdi_conf($) {
 	my $file = shift || die;
 	open(F, ">>$file") || die "$0: Failed to open $file: $!\n";
 	my $old = select F;
@@ -514,8 +514,8 @@ sub gen_zapataconf($) {
 		my $current_sig = "";
 		for my $chan ($span->chans()) {
 			my $chan_num = $chan->num;
-			if ($default_zapata_signalling{$chan->type} ne $current_sig) {
-				$current_sig = $default_zapata_signalling{$chan->type};
+			if ($default_chan_dahdi_signalling{$chan->type} ne $current_sig) {
+				$current_sig = $default_chan_dahdi_signalling{$chan->type};
 				print "\nsignalling = $current_sig";
 				print "\nchannel => $chan_num";
 			} else {
@@ -531,16 +531,16 @@ sub gen_zapataconf($) {
 sub set_defaults {
 	# Source default files
 	my ($default_file, %source_defaults) =
-		Zaptel::Config::Defaults::source_vars(keys(%zaptel_default_vars));
-	map_zaptel_defaults(%source_defaults);
+		Dahdi::Config::Defaults::source_vars(keys(%dahdi_default_vars));
+	map_dahdi_defaults(%source_defaults);
 	# Fixups
-	foreach my $val (values %default_zaptel_signalling, values %default_zapata_signalling) {
+	foreach my $val (values %default_dahdi_signalling, values %default_chan_dahdi_signalling) {
 		$val =~ s/{fxs_default_start}/$fxs_default_start/g;
 	}
-	$zapconf_file = $ENV{ZAPCONF_FILE} || "/etc/zaptel.conf";
-	$zapatachannels_file = $ENV{ZAPATA_FILE} || "/etc/asterisk/zapata-channels.conf";
+	$dahdiconf_file = $ENV{DAHDI_CONF_FILE} || "/etc/dahdi.conf";
+	$chan_dahdi_channels_file = $ENV{CHAN_DAHDI_CHANNELS_FILE} || "/etc/asterisk/dahdi-channels.conf";
 	$users_file = $ENV{USERS_FILE} || "/etc/asterisk/users.conf";
-	$zapataconf_file = $ENV{ZAPATACONF_FILE} || "/etc/asterisk/zapata.conf";
+	$chan_dahdi_conf_file = $ENV{CHAN_DAHDI_CONF_FILE} || "/etc/asterisk/chan_dahdi.conf";
 }
 
 sub parse_args {
@@ -565,39 +565,39 @@ __END__
 
 =head1 NAME
 
-zapconf - Generate configuration for zaptel channels.
+dahdi_genconf - Generate configuration for dahdi channels.
 
 =head1 SYNOPSIS
 
-zapconf [FILES...]
+dahdi_genconf [FILES...]
 
 =head1 DESCRIPTION
 
-This script generate configuration files for Zaptel hardware.
-Currently it can generate three files: zaptel, zapata, users and zapataconf (see below).
-Without arguments, it generates only zaptel and zapata.
+This script generate configuration files for Dahdi hardware.
+Currently it can generate three files: dahdi, chan_dahdi, users and chan_dahdi_full (see below).
+Without arguments, it generates only dahdi and chan_dahdi.
 
 =over 4
 
-=item zaptel - /etc/zaptel.conf
+=item dahdi - /etc/dahdi.conf
 
 Configuration for ztcfg(1). It's location may be overriden by the
-environment variable ZAPCONF_FILE.
+environment variable DAHDI_CONF_FILE.
 
-=item zapata - /etc/asterisk/zapata-channels.conf
+=item chan_dahdi - /etc/asterisk/dahdi-channels.conf
 
-Configuration for asterisk(1). It should be included in the main /etc/asterisk/zapata.conf.
-It's location may be overriden by the environment variable ZAPATA_FILE.
+Configuration for asterisk(1). It should be included in the main /etc/asterisk/chan_dahdi.conf.
+It's location may be overriden by the environment variable CHAN_DAHDI_CHANNELS_FILE.
 
 =item users - /etc/asterisk/users.conf
 
 Configuration for asterisk(1) and AsteriskGUI.
 It's location may be overriden by the environment variable USERS_FILE.
 
-=item zapataconf - /etc/asterisk/zapata.conf
+=item chan_dahdi_full - /etc/asterisk/chan_dahdi.conf
 
 Configuration for asterisk(1) and AsteriskGUI.
-It's location may be overriden by the environment variable ZAPATACONF_FILE.
+It's location may be overriden by the environment variable CHAN_DAHDI_CONF_FILE.
 
 
 =back