xpp rev. 3814:

  * Protocol no. 2.6: syncing improvements.
  * Support for 8-port Astribank BRI.
  * Firmware unloading now works:
    rmmod xpp_usb; /etc/hotplug/usb/xpp_fxloader reset
  * Defaults of kernel parameters are now part of parameter description.
  * World-readable kernel parameters.
  * No need for extra patch beyond bristuff for Astribank BRI.
  * Default poll intervals changed: 500 in BRI and FXO.
  * Allow changing FXS polls interval at run time.
  * BRI initalization fixed on SUSE (path to logger).
  * When using the SUSE zaptel rpm package, set modules_var=ZAPTEL_MODULES in
    /etc/sysconfig/zaptel .
  * zt_registration not verbose by default.
  * xpp_sync warns if FXO is sync slave.
  * Fixed genzaptelconf -z (zapscan output emulation).
  * PCM fixes.
  * Solves "multiple ticks" bug. No need for pcm_tasklets workaround.


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2478 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 57 insertions, 1 deletions

diff --git a/xpp/utils/zconf/Zaptel/Span.pm b/xpp/utils/zconf/Zaptel/Span.pm
index 08ebae2..c020d2f 100644
--- a/xpp/utils/zconf/Zaptel/Span.pm
+++ b/xpp/utils/zconf/Zaptel/Span.pm
@@ -5,7 +5,9 @@ package Zaptel::Span;
 # This program is free software; you can redistribute and/or
 # modify it under the same terms as Perl itself.
 #
-#use strict;
+# $Id$
+#
+use strict;
 use Zaptel::Chans;
 
 my $proc_base = "/proc/zaptel";
@@ -16,6 +18,7 @@ sub chans($) {
 }
 
 # Accessors (miniperl does not have Class:Accessor)
+our $AUTOLOAD;
 sub AUTOLOAD {
 	my $self = shift;
 	my $name = uc($AUTOLOAD);
@@ -27,6 +30,25 @@ sub AUTOLOAD {
 	}
 }
 
+sub by_number($) {
+	my $span_number = shift;
+	die "Missing span number" unless defined $span_number;
+	my @spans = Zaptel::spans();
+
+	my ($span) = grep { $_->num == $span_number } @spans;
+	return $span;
+}
+
+my @bri_strings = (
+		'BRI_(NT|TE)',
+		'(?:quad|octo)BRI PCI ISDN Card.* \[(NT|TE)\]\ ',
+		'octoBRI \[(NT|TE)\] ',
+		'HFC-S PCI A ISDN.* \[(NT|TE)\] '
+		);
+
+our $ZAPBRI_NET = 'bri_net';
+our $ZAPBRI_CPE = 'bri_cpe';
+
 sub new($$) {
 	my $pack = shift or die "Wasn't called as a class method\n";
 	my $num = shift or die "Missing a span number parameter\n";
@@ -35,6 +57,17 @@ sub new($$) {
 	open(F, "$proc_base/$num") or die "Failed to open '$proc_base/$num\n";
 	my $head = <F>;
 	chomp $head;
+	foreach my $cardtype (@bri_strings) {
+		if($head =~ m/$cardtype/) {
+			$self->{IS_BRI} = 1;
+			$self->{TERMTYPE} = $1;
+			$self->{DCHAN_IDX} = 2;
+			$self->{BCHAN_LIST} = [ 0, 1 ];
+			last;
+		}
+	}
+	die "$0: Unkown TERMTYPE [NT/TE]\n"
+		if $self->is_bri and !defined $self->{TERMTYPE};
 	($self->{NAME}, $self->{DESCRIPTION}) = (split(/\s+/, $head, 4))[2, 3];
 	$self->{CHANS} = [];
 	while(<F>) {
@@ -47,7 +80,30 @@ sub new($$) {
 		push(@{$self->{CHANS}}, $c);
 	}
 	close F;
+	if($self->is_bri()) {
+		$self->{CODING} = 'ami';
+		$self->{YELLOW} = undef;
+		$self->{DCHAN} = ($self->chans())[$self->{DCHAN_IDX}];
+		$self->{BCHANS} = [ ($self->chans())[@{$self->{BCHAN_LIST}}] ];
+		# Infer some info from channel name:
+		my $first_chan = ($self->chans())[0] || die "$0: No channels in span #$num\n";
+		my $chan_fqn = $first_chan->fqn();
+		if($chan_fqn =~ m(ZTHFC.*/|ztqoz.*/|XPP_BRI_.*/)) {		# BRI
+			$self->{FRAMING} = 'ccs';
+			$self->{SWITCHTYPE} = 'euroisdn';
+			$self->{SIGNALLING} = ($self->{TERMTYPE} eq 'NT') ? $ZAPBRI_NET : $ZAPBRI_CPE ;
+		} elsif($chan_fqn =~ m(ztgsm.*/)) {				# Junghanns's GSM cards. 
+			$self->{FRAMING} = 'ccs';
+			$self->{SIGNALLING} = 'gsm';
+		}
+	}
 	return $self;
 }
 
+sub bchans($) {
+	my $self = shift || die;
+
+	return @{$self->{BCHANS}};
+}
+
 1;