From d6809d60f504a7c93c995156a7861e8b0749df49 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 21 Oct 2011 22:12:45 +0000 Subject: dahdi_genconf: Assume spans with unknown term types are software selectable. 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 Tested-by: David Purdue Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10213 git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/branches/2.5@10255 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- xpp/perl_modules/Dahdi/Span.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xpp/perl_modules/Dahdi/Span.pm b/xpp/perl_modules/Dahdi/Span.pm index cf38c80..beea6af 100644 --- a/xpp/perl_modules/Dahdi/Span.pm +++ b/xpp/perl_modules/Dahdi/Span.pm @@ -191,6 +191,7 @@ sub new($$) { $self->{IS_DIGITAL} = 0; $self->{IS_BRI} = 0; $self->{IS_PRI} = 0; + $self->{TERMTYPE} = "UNKNOWN"; foreach my $cardtype (@bri_strings) { if($head =~ m/$cardtype/) { my $termtype = $1; @@ -230,6 +231,11 @@ sub new($$) { 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->{IS_DAHDI_SYNC_MASTER} = ($self->{DESCRIPTION} =~ /\(MASTER\)/) ? 1 : 0; -- cgit v1.2.3