dahdi_genconf: Assume spans with unknown term types are software selectable.
authorShaun Ruffell <sruffell@digium.com>
Thu, 29 Sep 2011 17:00:46 +0000 (17:00 +0000)
committerShaun Ruffell <sruffell@digium.com>
Thu, 29 Sep 2011 17:00:46 +0000 (17:00 +0000)
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

xpp/perl_modules/Dahdi/Span.pm

index cf38c80..beea6af 100644 (file)
@@ -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;