From 2ea971f4cf39077650106884c090ab1e51f4920e Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 26 Sep 2011 12:18:11 -0500 Subject: [PATCH 1/2] 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 --- xpp/perl_modules/Dahdi/Span.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xpp/perl_modules/Dahdi/Span.pm b/xpp/perl_modules/Dahdi/Span.pm index cf38c80..ea08961 100644 --- a/xpp/perl_modules/Dahdi/Span.pm +++ b/xpp/perl_modules/Dahdi/Span.pm @@ -230,6 +230,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; -- 1.7.6.2