[svn-commits] sruffell: branch tools/2.5 r10255 - /tools/branches/2.5/xpp/perl_modules/Dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Oct 21 17:12:45 2011
New Revision: 10255

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10255
Log:
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 <sruffell at digium.com>
Tested-by: David Purdue <support at noojee.com.au>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10213

Modified:
    tools/branches/2.5/xpp/perl_modules/Dahdi/Span.pm

Modified: tools/branches/2.5/xpp/perl_modules/Dahdi/Span.pm
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.5/xpp/perl_modules/Dahdi/Span.pm?view=diff&rev=10255&r1=10254&r2=10255
==============================================================================
--- tools/branches/2.5/xpp/perl_modules/Dahdi/Span.pm (original)
+++ tools/branches/2.5/xpp/perl_modules/Dahdi/Span.pm Fri Oct 21 17:12:45 2011
@@ -191,6 +191,7 @@
 	$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 @@
 			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;