aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authormattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-12 16:22:44 +0000
committermattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-12 16:22:44 +0000
commitab7ee70016abbf7c19b204227c3de99717f55458 (patch)
tree58f6d3618f1c57874a4dc08ef9bd152b7de76cf5 /channels
parentf245073f7b7545a0504cb0be13d1123b84d7c3ce (diff)
Make sure linkset is locked exiting ss7_start_call
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114095 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_zap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 5668b4ad2..ba9ad6ac3 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -9141,6 +9141,7 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
ast_mutex_unlock(&linkset->lock);
c = zt_new(p, AST_STATE_RING, 1, SUB_REAL, law, 0);
+ ast_mutex_lock(&linkset->lock);
if (!c) {
ast_log(LOG_WARNING, "Unable to start PBX on CIC %d\n", p->cic);
@@ -9148,8 +9149,6 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
} else
ast_verb(3, "Accepting call to '%s' on CIC %d\n", p->exten, p->cic);
- ast_mutex_lock(&linkset->lock);
-
zt_enable_ec(p);
if (!ast_strlen_zero(p->charge_number)) {