summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-10-18 20:32:18 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-10-18 20:32:18 +0000
commite36fbd70f076bcdfa8eda7fa6d7da4b178fff316 (patch)
treea0153b21187da85d6cf1fa2abb24f2c9440fb1e7
parent946d9fa846a7ef9aa681185f08add7903a1fbeda (diff)
Fix zaptel_hardware's behaviour for unknown span types.
Merged revisions 3157 via svnmerge from http://svn.digium.com/svn/zaptel/branches/1.2 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3158 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--xpp/utils/zconf/Zaptel/Chans.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/xpp/utils/zconf/Zaptel/Chans.pm b/xpp/utils/zconf/Zaptel/Chans.pm
index cd25bbb..c364dd5 100644
--- a/xpp/utils/zconf/Zaptel/Chans.pm
+++ b/xpp/utils/zconf/Zaptel/Chans.pm
@@ -61,7 +61,9 @@ sub new($$$$$$) {
$type = undef;
}
$self->type($type);
- $self->span()->type($type) if $self->span()->type() eq 'UNKNOWN';
+ $self->span()->type($type)
+ if ! defined($self->span()->type()) ||
+ $self->span()->type() eq 'UNKNOWN';
return $self;
}