diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-07-10 18:49:57 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-07-10 18:49:57 +0000 |
| commit | 5b636c0e2e37264ee7bcc0ddce78e591c1176101 (patch) | |
| tree | e6ee6a270dc5718b73fa43d68fb824c85006a1e6 | |
| parent | 20b4972e6250f1657816bc338a156987ae840938 (diff) | |
Generate the echocanceller=mg2,NNN in system.conf for the user as well.
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4601 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rwxr-xr-x | xpp/dahdi_genconf | 11 | ||||
| -rw-r--r-- | xpp/genconf_parameters | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/xpp/dahdi_genconf b/xpp/dahdi_genconf index 2729427..53f6916 100755 --- a/xpp/dahdi_genconf +++ b/xpp/dahdi_genconf @@ -72,6 +72,7 @@ my $defaultzone = $lc_country; my $bri_sig_style = 'bri_ptmp'; my $brint_overlap = 'no'; my $pri_termtype = 'SPAN/* TE'; +my $echo_can = 'mg2'; my %dahdi_default_vars = ( GENCONF_FILE => \$file, @@ -95,6 +96,7 @@ my %dahdi_default_vars = ( bri_sig_style => \$bri_sig_style, brint_overlap => \$brint_overlap, pri_termtype => \$pri_termtype, + echo_can => \$echo_can, ); sub map_dahdi_defaults { @@ -180,6 +182,14 @@ sub gen_dahdi_signalling($) { printf "# astbanktype: output\n"; } printf "$sig=$num\n"; + print_echo_can($num); +} + +sub print_echo_can($) { + my $chans = shift; # channel or range of channels. + return if ($echo_can eq 'none'); + + print "echocanceller=$echo_can,$chans\n"; } my $bri_te_last_timing = 1; @@ -211,6 +221,7 @@ sub gen_dahdi_digital($) { printf "bchan=%s\n", bchan_range($span); my $dchan = $span->dchan(); printf "dchan=%d\n", $dchan->num(); + print_echo_can(bchan_range($span)); } sub gen_dahdiconf($) { diff --git a/xpp/genconf_parameters b/xpp/genconf_parameters index f8e86e4..b58823f 100644 --- a/xpp/genconf_parameters +++ b/xpp/genconf_parameters @@ -33,6 +33,17 @@ #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. +# +# The default is mg2, but it may change in the future. E.g: a packager +# that bundles a better echo canceller may set it as the default, or +# dahdi_genconf will scan for the "best" echo canceller. +# +#echo_can hpec +#echo_can oslec +#echo_can none # to aboid echo cancellers altogether + # pri_types contains a list of settings: # Currently the only setting is for TE or NT (the default is TE) # |