[dahdi-commits] tzafrir: tools/trunk r4463 - in /tools/trunk/xpp: ./ perl_modules/Dahdi/ perl...

SVN commits to the DAHDI project dahdi-commits at lists.digium.com
Wed Jun 25 05:01:30 CDT 2008 

Author: tzafrir
Date: Wed Jun 25 05:01:11 2008
New Revision: 4463

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4463
Log:
* Rename Dahdi::Config::Defaults to Dahdi::Config::GenconfDefaults .
* Reads from the new /etc/dahdi/genconf_parameters .
* Do installl xpp_fxloader (the firmware loading wrapper script).
* Even more /etc/dahdi/system.conf string fixes.

Added:
    tools/trunk/xpp/genconf_parameters   (with props)
    tools/trunk/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm
      - copied, changed from r4459, tools/trunk/xpp/perl_modules/Dahdi/Config/Defaults.pm
Removed:
    tools/trunk/xpp/perl_modules/Dahdi/Config/Defaults.pm
Modified:
    tools/trunk/xpp/Makefile
    tools/trunk/xpp/dahdi_genconf
    tools/trunk/xpp/perl_modules/Dahdi/Chans.pm
    tools/trunk/xpp/perl_modules/Dahdi/Span.pm

Modified: tools/trunk/xpp/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/Makefile?view=diff&rev=4463&r1=4462&r2=4463
==============================================================================
--- tools/trunk/xpp/Makefile (original)
+++ tools/trunk/xpp/Makefile Wed Jun 25 05:01:11 2008
@@ -75,6 +75,7 @@
 	$(INSTALL) -d $(DESTDIR)$(SBINDIR)
 	$(INSTALL) $(PROG_INSTALL) $(DESTDIR)$(SBINDIR)/
 	$(INSTALL) -d $(DESTDIR)$(DATADIR)
+	$(INSTALL) xpp_fxloader $(DESTDIR)$(DATADIR)/
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)
 	$(INSTALL_DATA) $(MAN_INSTALL) $(DESTDIR)$(MANDIR)/
 	$(INSTALL) -d $(DESTDIR)$(HOTPLUG_USB_DIR)

Modified: tools/trunk/xpp/dahdi_genconf
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/dahdi_genconf?view=diff&rev=4463&r1=4462&r2=4463
==============================================================================
--- tools/trunk/xpp/dahdi_genconf (original)
+++ tools/trunk/xpp/dahdi_genconf Wed Jun 25 05:01:11 2008
@@ -13,7 +13,7 @@
 
 use Dahdi;
 use Dahdi::Xpp;
-use Dahdi::Config::Defaults;
+use Dahdi::Config::GenconfDefaults;
 
 my %default_context = (
 	FXO	=> 'from-pstn',
@@ -531,13 +531,13 @@
 sub set_defaults {
 	# Source default files
 	my ($default_file, %source_defaults) =
-		Dahdi::Config::Defaults::source_vars(keys(%dahdi_default_vars));
+		Dahdi::Config::GenconfDefaults::source_vars(keys(%dahdi_default_vars));
 	map_dahdi_defaults(%source_defaults);
 	# Fixups
 	foreach my $val (values %default_dahdi_signalling, values %default_chan_dahdi_signalling) {
 		$val =~ s/{fxs_default_start}/$fxs_default_start/g;
 	}
-	$dahdiconf_file = $ENV{DAHDI_CONF_FILE} || "/etc/dahdi.conf";
+	$dahdiconf_file = $ENV{DAHDI_CONF_FILE} || "/etc/dahdi/system.conf";
 	$chan_dahdi_channels_file = $ENV{CHAN_DAHDI_CHANNELS_FILE} || "/etc/asterisk/dahdi-channels.conf";
 	$users_file = $ENV{USERS_FILE} || "/etc/asterisk/users.conf";
 	$chan_dahdi_conf_file = $ENV{CHAN_DAHDI_CONF_FILE} || "/etc/asterisk/chan_dahdi.conf";
@@ -579,7 +579,7 @@
 
 =over 4
 
-=item dahdi - /etc/dahdi.conf
+=item dahdi - /etc/dahdi/system.conf
 
 Configuration for ztcfg(1). It's location may be overriden by the
 environment variable DAHDI_CONF_FILE.

Added: tools/trunk/xpp/genconf_parameters
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/genconf_parameters?view=auto&rev=4463
==============================================================================
--- tools/trunk/xpp/genconf_parameters (added)
+++ tools/trunk/xpp/genconf_parameters Wed Jun 25 05:01:11 2008
@@ -1,0 +1,21 @@
+#
+# /etc/dahdi/genconf_parameters
+#
+# This file contains parameters that affect the
+# dahdi_genconf configurator generator.
+#
+base_exten=4000
+fxs_immediate=no
+fxs_default_start=ks
+lc_country=il
+
+#context_lines=
+#context_phones=
+#context_input=
+#context_output=
+
+#group_phones=
+#group_lines=
+
+#brint_overlap=
+bri_sig_style=bri_ptmp

Propchange: tools/trunk/xpp/genconf_parameters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tools/trunk/xpp/genconf_parameters
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: tools/trunk/xpp/genconf_parameters
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: tools/trunk/xpp/perl_modules/Dahdi/Chans.pm
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/perl_modules/Dahdi/Chans.pm?view=diff&rev=4463&r1=4462&r2=4463
==============================================================================
--- tools/trunk/xpp/perl_modules/Dahdi/Chans.pm (original)
+++ tools/trunk/xpp/perl_modules/Dahdi/Chans.pm Wed Jun 25 05:01:11 2008
@@ -40,7 +40,7 @@
 
 =head signalling()
 
-Returns the signalling set for this channel through /etc/dahdi.conf .
+Returns the signalling set for this channel through /etc/dahdi/system.conf .
 This is always empty before dahdi_cfg was run. And shows the "other" type
 for FXS and for FXO.
 

Copied: tools/trunk/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm (from r4459, tools/trunk/xpp/perl_modules/Dahdi/Config/Defaults.pm)
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm?view=diff&rev=4463&p1=tools/trunk/xpp/perl_modules/Dahdi/Config/Defaults.pm&r1=4459&p2=tools/trunk/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm&r2=4463
==============================================================================
--- tools/trunk/xpp/perl_modules/Dahdi/Config/Defaults.pm (original)
+++ tools/trunk/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm Wed Jun 25 05:01:11 2008
@@ -1,4 +1,4 @@
-package Dahdi::Config::Defaults;
+package Dahdi::Config::GenconfDefaults;
 #
 # Written by Oron Peled <oron at actcom.co.il>
 # Copyright (C) 2007, Xorcom
@@ -28,29 +28,11 @@
 
 sub source_vars {
 	my @vars = @_;
-	my $default_file;
-	my %system_files = (
-			"/etc/default/zaptel"	=> 'Debian and friends',
-			"/etc/sysconfig/zaptel"	=> 'Red Hat and friends',
-			"/etc/dahdi/defaults"	=> 'Dahdi generic',
-		);
-
-	if(defined $ENV{DAHDI_DEFAULTS}) {
-		$default_file = $ENV{DAHDI_DEFAULTS};
-	} else {
-		foreach my $f (keys %system_files) {
-			if(-r $f) {
-				if(defined $default_file) {
-					die "An '$f' collides with '$default_file'";
-				}
-				$default_file = $f;
-			}
-		}
-	}
-	if (! $default_file) {
+	my $default_file = $ENV{GENCONF_PARAMETERS} || "/etc/dahdi/genconf_parameters";
+	if (! -r $default_file) {
 		return ("", ());
 	}
-	my %vars = Dahdi::Config::Defaults::do_source($default_file, @vars);
+	my %vars = do_source($default_file, @vars);
 	return ($default_file, %vars);
 }
 

Modified: tools/trunk/xpp/perl_modules/Dahdi/Span.pm
URL: http://svn.digium.com/view/dahdi/tools/trunk/xpp/perl_modules/Dahdi/Span.pm?view=diff&rev=4463&r1=4462&r2=4463
==============================================================================
--- tools/trunk/xpp/perl_modules/Dahdi/Span.pm (original)
+++ tools/trunk/xpp/perl_modules/Dahdi/Span.pm Wed Jun 25 05:01:11 2008
@@ -95,7 +95,7 @@
 =head2 yellow(), crc4()
 
 Likewise, suggestions ofr the respective fields in the span= line in
-dahdi.conf for this span.
+/etc/dahdi/system.conf for this span.
 
 =head2 signalling()

More information about the dahdi-commits mailing list