From 469c7d6de937d515e81951d817c27619fc49c386 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sun, 6 Jun 2004 22:22:48 +0000
Subject: [PATCH] Must call spanstat before checking number of channels (bug
#1796)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_zap.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index eea2ab31dc..666dec0fef 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5687,12 +5687,6 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
int offset;
int myswitchtype;
offset = 0;
- pri_resolve_span(&span, channel, (channel - p.chanpos), &si);
- if (span < 0) {
- ast_log(LOG_WARNING, "Channel %d: Unable to find locate channel/trunk group!\n", channel);
- free(tmp);
- return NULL;
- }
if ((signalling == SIG_PRI) && ioctl(tmp->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &offset)) {
ast_log(LOG_ERROR, "Unable to set clear mode on clear channel %d of span %d: %s\n", channel, p.spanno, strerror(errno));
free(tmp);
@@ -5709,6 +5703,12 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
free(tmp);
return NULL;
}
+ pri_resolve_span(&span, channel, (channel - p.chanpos), &si);
+ if (span < 0) {
+ ast_log(LOG_WARNING, "Channel %d: Unable to find locate channel/trunk group!\n", channel);
+ free(tmp);
+ return NULL;
+ }
if (signalling == SIG_PRI)
myswitchtype = switchtype;
else
--
GitLab