Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Do the same thing for pri_hangup_all in terms of releasing the PRI lock

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3761 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Mark Spencer 21 years ago
parent 8283811633
commit ce868ed5f5
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File

20
channels/chan_zap.c
Unescape View File

@ -6874,10 +6874,11 @@ static int pri_check_restart(struct zt_pri *pri)
return 0; return 0;
} }
static int pri_hangup_all(struct zt_pvt *p) static int pri_hangup_all(struct zt_pvt *p, struct zt_pri *pri)
{ {
int x; int x;
int redo; int redo;
ast_mutex_unlock(&pri->lock);
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
do { do {
redo = 0; redo = 0;
@ -6895,6 +6896,7 @@ static int pri_hangup_all(struct zt_pvt *p)
} }
} while (redo); } while (redo);
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
ast_mutex_lock(&pri->lock);
return 0; return 0;
} }
@ -7160,7 +7162,7 @@ static void *pri_dchannel(void *vpri)
ast_log(LOG_WARNING, "The PRI Call have not been destroyed\n"); ast_log(LOG_WARNING, "The PRI Call have not been destroyed\n");
} }
if (p->master) { if (p->master) {
pri_hangup_all(p->master); pri_hangup_all(p->master, pri);
} else if (p->owner) } else if (p->owner)
p->owner->_softhangup |= AST_SOFTHANGUP_DEV; p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
p->inalarm = 1; p->inalarm = 1;
@ -7185,7 +7187,7 @@ static void *pri_dchannel(void *vpri)
} }
/* Force soft hangup if appropriate */ /* Force soft hangup if appropriate */
if (pri->pvts[chanpos]->master) if (pri->pvts[chanpos]->master)
pri_hangup_all(pri->pvts[chanpos]->master); pri_hangup_all(pri->pvts[chanpos]->master, pri);
else if (pri->pvts[chanpos]->owner) else if (pri->pvts[chanpos]->owner)
pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_mutex_unlock(&pri->pvts[chanpos]->lock); ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@ -7201,7 +7203,7 @@ static void *pri_dchannel(void *vpri)
pri->pvts[x]->call = NULL; pri->pvts[x]->call = NULL;
} }
if (pri->pvts[chanpos]->master) if (pri->pvts[chanpos]->master)
pri_hangup_all(pri->pvts[chanpos]->master); pri_hangup_all(pri->pvts[chanpos]->master, pri);
else if (pri->pvts[x]->owner) else if (pri->pvts[x]->owner)
pri->pvts[x]->owner->_softhangup |= AST_SOFTHANGUP_DEV; pri->pvts[x]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_mutex_unlock(&pri->pvts[x]->lock); ast_mutex_unlock(&pri->pvts[x]->lock);
@ -7256,7 +7258,7 @@ static void *pri_dchannel(void *vpri)
ast_log(LOG_WARNING, "Ring requested on channel %d/%d already in use on span %d. Hanging up owner.\n", ast_log(LOG_WARNING, "Ring requested on channel %d/%d already in use on span %d. Hanging up owner.\n",
PRI_SPAN(e->ring.channel), PRI_CHANNEL(e->ring.channel), pri->span); PRI_SPAN(e->ring.channel), PRI_CHANNEL(e->ring.channel), pri->span);
if (pri->pvts[chanpos]->master) if (pri->pvts[chanpos]->master)
pri_hangup_all(pri->pvts[chanpos]->master); pri_hangup_all(pri->pvts[chanpos]->master, pri);
else else
pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_mutex_unlock(&pri->pvts[chanpos]->lock); ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@ -7556,7 +7558,7 @@ static void *pri_dchannel(void *vpri)
/* we're calling here zt_hangup so once we get there we need to clear p->call after calling pri_hangup */ /* we're calling here zt_hangup so once we get there we need to clear p->call after calling pri_hangup */
pri->pvts[chanpos]->alreadyhungup = 1; pri->pvts[chanpos]->alreadyhungup = 1;
if (pri->pvts[chanpos]->master) if (pri->pvts[chanpos]->master)
pri_hangup_all(pri->pvts[chanpos]->master); pri_hangup_all(pri->pvts[chanpos]->master, pri);
else if (pri->pvts[chanpos]->owner) { else if (pri->pvts[chanpos]->owner) {
/* Queue a BUSY instead of a hangup if our cause is appropriate */ /* Queue a BUSY instead of a hangup if our cause is appropriate */
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause; pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
@ -7612,7 +7614,7 @@ static void *pri_dchannel(void *vpri)
if (chanpos > -1) { if (chanpos > -1) {
ast_mutex_lock(&pri->pvts[chanpos]->lock); ast_mutex_lock(&pri->pvts[chanpos]->lock);
if (pri->pvts[chanpos]->master) if (pri->pvts[chanpos]->master)
pri_hangup_all(pri->pvts[chanpos]->master); pri_hangup_all(pri->pvts[chanpos]->master, pri);
else if (pri->pvts[chanpos]->owner) { else if (pri->pvts[chanpos]->owner) {
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause; pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
switch(e->hangup.cause) { switch(e->hangup.cause) {
@ -7686,7 +7688,7 @@ static void *pri_dchannel(void *vpri)
ast_log(LOG_DEBUG, "Assuming restart ack is really for channel %d/%d span %d\n", pri->pvts[chanpos]->logicalspan, ast_log(LOG_DEBUG, "Assuming restart ack is really for channel %d/%d span %d\n", pri->pvts[chanpos]->logicalspan,
pri->pvts[chanpos]->prioffset, pri->span); pri->pvts[chanpos]->prioffset, pri->span);
if (pri->pvts[chanpos]->master) if (pri->pvts[chanpos]->master)
pri_hangup_all(pri->pvts[chanpos]->master); pri_hangup_all(pri->pvts[chanpos]->master, pri);
else if (pri->pvts[chanpos]->owner) { else if (pri->pvts[chanpos]->owner) {
ast_log(LOG_WARNING, "Got restart ack on channel %d/%d with owner on span %d\n", pri->pvts[chanpos]->logicalspan, ast_log(LOG_WARNING, "Got restart ack on channel %d/%d with owner on span %d\n", pri->pvts[chanpos]->logicalspan,
pri->pvts[chanpos]->prioffset, pri->span); pri->pvts[chanpos]->prioffset, pri->span);
@ -7712,7 +7714,7 @@ static void *pri_dchannel(void *vpri)
if (pri->pvts[chanpos]) { if (pri->pvts[chanpos]) {
ast_mutex_lock(&pri->pvts[chanpos]->lock); ast_mutex_lock(&pri->pvts[chanpos]->lock);
if (pri->pvts[chanpos]->master) if (pri->pvts[chanpos]->master)
pri_hangup_all(pri->pvts[chanpos]->master); pri_hangup_all(pri->pvts[chanpos]->master, pri);
else if (pri->pvts[chanpos]->owner) { else if (pri->pvts[chanpos]->owner) {
ast_log(LOG_WARNING, "Got restart ack on channel %d/%d span %d with owner\n", ast_log(LOG_WARNING, "Got restart ack on channel %d/%d span %d with owner\n",
PRI_SPAN(e->restartack.channel), PRI_CHANNEL(e->restartack.channel), pri->span); PRI_SPAN(e->restartack.channel), PRI_CHANNEL(e->restartack.channel), pri->span);

Write Preview
Loading…
Cancel
Save