genconf_parameters: Add option fxo_default_start; Document genconf_parameters

* Add a dqahdi_genconf option fxo_default_start, equivalent of
  fxs_default_start.
* Set all trunks in group 'group_lines' rather than hard-coded
  0 (for TE) and 6 (for NT).
* Document all parameters in genconf_parameters.


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

3 files changed, 84 insertions, 19 deletions

diff --git a/xpp/genconf_parameters b/xpp/genconf_parameters
index e6d9aa1..2dcd69b 100644
--- a/xpp/genconf_parameters
+++ b/xpp/genconf_parameters
@@ -17,21 +17,66 @@
 # 	     ...
 #
 
+# When generating extensions for chan_dahdi.conf or users.conf etc: the 
+# extension number will be channel_number+base_exten . The default is:
 #base_exten		4000
-#fxs_immediate		no
-#fxs_default_start	ks
+#
+# Make FXS (analog phones) extentions answer immediately (sets
+# 'immediate = yes' for them in chan_dahdi.conf). Don't enable this before 
+# you're read documentation about this option.
+#fxs_immediate		yes
+#
+# For FXS (analog phones) - use KS or LS? ks is the only method for
+# Asterisk to provide disconnect supervision and thus it would normally
+# be preffered and is the default.
+#fxs_default_start	ls
+#
+# For FXO (analog lines) - use KS or LS? KS is the default and is
+# normally the better choice as it allows detecting handups on many
+# lines.
+#fxo_default_start	ls
+
+# Set tone zone values. This is used for playing tones (busy, dialtone
+# and such). The default is 'us'. This sets the value for both loadzone
+# and defaultzone in system.conf .
 #lc_country		il
 
+# The dialplan contenxt into which to send trunks in chan_dahdi.conf or
+# users.conf. The default value is:
 #context_lines		from-pstn
+#
+# The dialplan context into which to send extensions in chan_dahdi.conf or
+# users.conf. The default value is:
 #context_phones		from-internal
+#
+# Two extea contexts for the input ports and output ports of an
+# Astribank. Default values are:
 #context_input		astbank-input
 #context_output		astbank-output
 
-#group_phones		0
-#group_lines		5
+# A group to put all analog phones in. By default 0, so you can dial to
+# the 'first phone available' using Dahdi/g5 .
+#group_phones		5
+#
+# A group in which to put all the channels belonging to some trunk.
+# Thus you can dial through "some trunk" using Dahdi/G0/NUMBER
+#group_lines		0
 
+# Channels of digital trunk of span N are also added to group 10+N (that 
+# is: 14 for channels of span 4).
+
+# Do we want to use PtP ('bri') or PtMP ('bri_ptmp') for BRI? PtMP 
+# allows connecting several CPE devices on the same network device 
+# (several BRI phones on the same line, kind of like several analog 
+# phones on the same analog line). However it is generally brings 
+# unnecessary complexity for a pbx-pbx connection. It is still the 
+# default as this is normally what you get for a BRI PSTN connection.
+#bri_sig_style		bri
+#
+# If this option is set (that is: not remmed-out), BRI NT ports will 
+# also be set as overlap. This is useful if you want to connect ISDN 
+# phones.
 #brint_overlap
-#bri_sig_style		bri_ptmp
 
 # The echo canceller to use. If you have a hardware echo canceller, just 
 # leave it be, as this one won't be used anyway.
@@ -47,16 +92,34 @@
 # bri_hardhdlc: If this parameter is set to 'yes', in the entries for
 # BRI cards 'hardhdlc' will be used instead of 'dchan' (an alias for
 # 'fcshdlc').
-#
 #bri_hardhdlc		yes
 
-# For MFC/R2 Support
+# For MFC/R2 Support: 'R2' will make E1 spans CAS and with the
+# 'r2_idle_bits' bit in system.conf . It will also make dahdi_genconf default
+# to generating the channels of this card in unicall.conf rather than in
+# chan_dahdi.conf . The meaning of this may be extended somehow to support
+# R2 through openr2/chan_dahdi later on.
 #pri_connection_type	R2
 #r2_idle_bits		1101
 
-# pri_types contains a list of settings:
-# Currently the only setting is for TE or NT (the default is TE)
+# pri_termtype contains a list of settings:
+# Currently the only setting is for TE or NT (the default is TE). This
+# sets two different but normally related configuration items:
+# 
+# A TE span will have *_cpe signalling in Asterisk and will also get
+# timing from the remote party.
+# 
+# A NT span will have *_new signalling in Asterisk and will provide
+# timing to the remote party.
 #
+# pri_termtype is a list if span specs and configuration (TE/NT) for
+# them. The first spec that matches is used. The matching is of perl
+# regular expressions, but with '*' and '?' have their meaning from
+# basic regular expressions.
 #pri_termtype
 #	SPAN/2		NT
 #	SPAN/4		NT
+#
+#pri_termtype
+#	SPAN/*		NT
+#
diff --git a/xpp/perl_modules/Dahdi/Config/Gen.pm b/xpp/perl_modules/Dahdi/Config/Gen.pm
index b68fa28..80e1e31 100644
--- a/xpp/perl_modules/Dahdi/Config/Gen.pm
+++ b/xpp/perl_modules/Dahdi/Config/Gen.pm
@@ -88,6 +88,7 @@ sub new($) {
 
 	# Set defaults
 	my $fxs_default_start = $p->item('fxs_default_start');
+	my $fxo_default_start = $p->item('fxo_default_start');
 
 	my %default_context = (
 		FXO	=> $p->item('context_lines'),
@@ -108,23 +109,23 @@ sub new($) {
 		FXS	=> $p->item('group_phones'),
 		IN	=> '',
 		OUT	=> '',
-		BRI_TE	=> 0,
-		BRI_NT	=> 6,
-		E1_TE	=> 0,
-		T1_TE	=> 0,
-		J1_TE	=> 0,
-		E1_NT	=> 6,
-		T1_NT	=> 6,
-		J1_NT	=> 6,
+		BRI_TE	=> $p->item('group_lines'),
+		BRI_NT	=> $p->item('group_lines'),
+		E1_TE	=> $p->item('group_lines'),
+		T1_TE	=> $p->item('group_lines'),
+		J1_TE	=> $p->item('group_lines'),
+		E1_NT	=> $p->item('group_lines'),
+		T1_NT	=> $p->item('group_lines'),
+		J1_NT	=> $p->item('group_lines'),
 		);
 	my %default_dahdi_signalling = (
-		FXO	=> 'fxsks',
+		FXO	=> "fxs$fxo_default_start",
 		FXS	=> "fxo$fxs_default_start",
 		IN	=> "fxo$fxs_default_start",
 		OUT	=> "fxo$fxs_default_start",
 		);
 	my %default_chan_dahdi_signalling = (
-		FXO	=> 'fxs_ks',
+		FXO	=> "fxs_$fxo_default_start",
 		FXS	=> "fxo_$fxs_default_start",
 		IN	=> "fxo_$fxs_default_start",
 		OUT	=> "fxo_$fxs_default_start",
diff --git a/xpp/perl_modules/Dahdi/Config/Params.pm b/xpp/perl_modules/Dahdi/Config/Params.pm
index b6d9cdc..2ff2a0e 100644
--- a/xpp/perl_modules/Dahdi/Config/Params.pm
+++ b/xpp/perl_modules/Dahdi/Config/Params.pm
@@ -95,6 +95,7 @@ sub item($$) {
 			freepbx			=> 'no',	# Better via -F command line
 			fxs_immediate		=> 'no',
 			fxs_default_start	=> 'ks',
+			fxo_default_start	=> 'ks',
 			lc_country		=> 'us',
 			context_lines		=> 'from-pstn',
 			context_phones		=> 'from-internal',