FGCOM/dahdi-tools
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi_genconf: Assume spans with unknown term types are software selectable.

Browse Source 
Resolves a regression on the 2.5 branch that would result in:

  $ dahdi_genconf
  dahdi_genconf: missing default group (termtype=UNKNOWN)

E1 / T1 spans use software configuration to set CPE / NET mode. This
patch will just assume that a termtype is software selectable if it was
"UNKNOWN" when first scanning the span.

Internal-Issue-ID: DAHTOOL-55
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Tested-by: David Purdue <support@noojee.com.au>

git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@10213 17933a7a-c749-41c5-a318-cba88f637d49
This commit is contained in:
Shaun Ruffell 2011-09-29 17:00:46 +00:00
parent 2d576dcea0
commit db9b649e03
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xpp/perl_modules/Dahdi/Span.pm
View File

@ -191,6 +191,7 @@ sub new($$) {
$self->{IS_DIGITAL} = 0; $self->{IS_DIGITAL} = 0;
$self->{IS_BRI} = 0; $self->{IS_BRI} = 0;
$self->{IS_PRI} = 0; $self->{IS_PRI} = 0;
$self->{TERMTYPE} = "UNKNOWN";
foreach my $cardtype (@bri_strings) { foreach my $cardtype (@bri_strings) {
if($head =~ m/$cardtype/) { if($head =~ m/$cardtype/) {
my $termtype = $1; my $termtype = $1;
@ -230,6 +231,11 @@ sub new($$) {
last; last;
} }
} }
if (($self->is_soft_term_type == 0) and ($self->termtype eq "UNKNOWN")) {
$self->{IS_SOFT_TERM_TYPE} = 1;
}
($self->{NAME}, $self->{DESCRIPTION}) = (split(/\s+/, $head, 4))[2, 3]; ($self->{NAME}, $self->{DESCRIPTION}) = (split(/\s+/, $head, 4))[2, 3];
$self->{IS_DAHDI_SYNC_MASTER} = $self->{IS_DAHDI_SYNC_MASTER} =
($self->{DESCRIPTION} =~ /\(MASTER\)/) ? 1 : 0; ($self->{DESCRIPTION} =~ /\(MASTER\)/) ? 1 : 0;