diff options
Diffstat (limited to 'xpp/utils/zconf/Zaptel/Chans.pm')
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Chans.pm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xpp/utils/zconf/Zaptel/Chans.pm b/xpp/utils/zconf/Zaptel/Chans.pm index 3364060..eef922f 100644 --- a/xpp/utils/zconf/Zaptel/Chans.pm +++ b/xpp/utils/zconf/Zaptel/Chans.pm @@ -22,25 +22,26 @@ sub AUTOLOAD { } } -sub new($$$$$) { +sub new($$$$$$) { my $pack = shift or die "Wasn't called as a class method\n"; my $span = shift or die "Missing a span parameter\n"; my $num = shift or die "Missing a channel number parameter\n"; my $fqn = shift or die "Missing a channel fqn parameter\n"; - my $info = shift; + my $signalling = shift || ''; + my $info = shift || ''; my $self = {}; bless $self, $pack; $self->span($span); $self->num($num); $self->fqn($fqn); + $self->signalling($signalling); $self->info($info); my $type; if($fqn =~ m|\bXPP_(\w+)/.*$|) { $type = $1; # One of our AB - } elsif(defined $info) { - $type = (split(/\s+/, $info))[0]; - $type = 'FXS' if $type =~ /^FXS/; - $type = 'FXO' if $type =~ /^FXO/; + } elsif(defined $signalling) { + $type = 'FXS' if $signalling =~ /^FXS/; + $type = 'FXO' if $signalling =~ /^FXO/; } else { $type = undef; } |