Use autotagged externals

git-svn-id: http://svn.astersk.org/svn/dahdi/tools/tags/2.5.0.2@10261 17933a7a-c749-41c5-a318-cba88f637d49

.version

@@ -1 +1 @@
-2.5.0.1
+2.5.0.2

ChangeLog

@@ -1,3 +1,37 @@
+2011-10-21  Shaun Ruffell <sruffell@digium.com> 
+
+	* dahdi-tools version 2.5.0.2 released.
+
+2011-10-21 22:12 +0000 [r10255-10256]  Shaun Ruffell <sruffell@digium.com>
+
+	* xpp/perl_modules/Dahdi/Span.pm: dahdi_genconf: Use 'dahdi_scan'
+	  to determine span_type for B410P cards. The wcb4xxp driver does
+	  not put enough information in the proc filesystem to determine if
+	  the ports are in TE or NT mode. Previously the ports would always
+	  just setup the dahdi-channels.conf file in TE mode. After this
+	  change the dahdi_scan utility is used to detect if the ports are
+	  in TE or NT mode and setup dahdi-channels.conf appropriately.
+	  Internal-Issue-ID: DAHTOOL-54 Signed-off-by: Shaun Ruffell
+	  <sruffell@digium.com> Origin:
+	  http://svnview.digium.com/svn/dahdi?view=rev&rev=10214
+
+	* xpp/perl_modules/Dahdi/Span.pm: 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@digium.com>
+	  Tested-by: David Purdue <support@noojee.com.au> Origin:
+	  http://svnview.digium.com/svn/dahdi?view=rev&rev=10213
+
+2011-09-07 07:11 +0000 [r10188]  Tzafrir Cohen <tzafrir.cohen@xorcom.com>
+
+	* xpp/waitfor_xpds: xpp: waitfor_xpds: higher and configurable
+	  timeout On several pathological cases we may need to wait more
+	  than 40 seconds. Make that timeout configurable.
+
 2011-09-07  Shaun Ruffell <sruffell@digium.com> 
 
 	* dahdi-tools version 2.5.0.1 released.

xpp/perl_modules/Dahdi/Span.pm

@@ -131,7 +131,7 @@ my @bri_strings = (
 		'(?:quad|octo)BRI PCI ISDN Card.* \[(NT|TE)\]',
 		'octoBRI \[(NT|TE)\] ',
 		'HFC-S PCI A ISDN.* \[(NT|TE)\] ',
-		'(B4XXP) \(PCI\) Card', # Does not expose NT/TE type
+		'(B4XXP) \(PCI\) Card', # Use dahdi_scan to determine TE/NT mode
 		'(WCBRI)', # has selectable NT/TE modes via dahdi_cfg
 		);
 
@@ -177,6 +177,28 @@ sub init_proto($$) {
 	$self->{TYPE} = "${proto}_$self->{TERMTYPE}";
 }
 
+sub get_digital_spantype {
+	my $span_no = shift;
+	my @lines = split /\n/, `dahdi_scan`;
+	my $found_span = 0;
+	foreach my $line (@lines) {
+		if (! $found_span) {
+			if ($line =~ m/\[$span_no\]/) {
+				$found_span = 1;
+			}
+		} else {
+			if ($line !~ m/^\[/) {
+				if ($line =~ m/digital-(TE|NT)/ ){
+					return $1;
+				}
+			} else {
+				$found_span = 0;
+			}
+		}
+	}
+	die "Cannot determine digital spantype";
+}
+
 sub new($$) {
 	my $pack = shift or die "Wasn't called as a class method\n";
 	my $proc_file = shift or die "Missing a proc file parameter\n";
@@ -191,10 +213,16 @@ 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;
-			$termtype = 'TE' if ( $1 eq 'B4XXP' or $1 eq 'WCBRI' );
+			if ($1 eq 'B4XXP') {
+				$termtype = get_digital_spantype($num);
+			}
+			if ($1 eq 'WCBRI') {
+				$termtype = 'TE';
+			}
 			$self->{IS_DIGITAL} = 1;
 			$self->{IS_BRI} = 1;
 			$self->{TERMTYPE} = $termtype;
@@ -230,6 +258,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;