kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Locking issues dealing with service_lock.

Browse Source 
*  Removed unneeded and uninitialized service_lock.
*  Fixed potential locking imbalance in pri_dchannel():PRI_EVENT_RESTART.
*  Fixed verbose message typo in pri_dchannel():PRI_EVENT_RESTART.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@220672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2009-09-28 15:27:46 +00:00
parent 7eac18b09c
commit 307bf124d2
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
channels/sig_pri.c
View File

@@ -780,6 +780,7 @@ static void apply_plan_to_number(char *buf, size_t size, const struct sig_pri_pr
} }
} }
/*! \note Assumes the pri->lock is already obtained. */
static int pri_check_restart(struct sig_pri_pri *pri) static int pri_check_restart(struct sig_pri_pri *pri)
{ {
#ifdef HAVE_PRI_SERVICE_MESSAGES #ifdef HAVE_PRI_SERVICE_MESSAGES
@@ -797,16 +798,14 @@ tryanotherpos:
int why; int why;
/* check if the channel is out of service */ /* check if the channel is out of service */
ast_mutex_lock(&pri->pvts[pri->resetpos]->service_lock); snprintf(db_chan_name, sizeof(db_chan_name), "%s/%d:%d", dahdi_db, pri->span, pri->pvts[pri->resetpos]->channel);
snprintf(db_chan_name, sizeof(db_chan_name), "%s/%d:%d", dahdi_db, pri->pvts[pri->resetpos]->pri->span, pri->pvts[pri->resetpos]->channel);
ast_mutex_unlock(&pri->pvts[pri->resetpos]->service_lock);
/* if so, try next channel */ /* if so, try next channel */
if (!ast_db_get(db_chan_name, SRVST_DBKEY, db_answer, sizeof(db_answer))) { if (!ast_db_get(db_chan_name, SRVST_DBKEY, db_answer, sizeof(db_answer))) {
sscanf(db_answer, "%1c:%30d", &state, &why); sscanf(db_answer, "%1c:%30d", &state, &why);
if (why) { if (why) {
ast_log(LOG_NOTICE, "span '%d' channel '%d' out-of-service (reason: %s), not sending RESTART\n", pri->span, ast_log(LOG_NOTICE, "span '%d' channel '%d' out-of-service (reason: %s), not sending RESTART\n", pri->span,
pri->pvts[pri->resetpos]->channel, (why & SRVST_FAREND) ? (why & SRVST_NEAREND) ? "both ends" : "far end" : "near end"); pri->pvts[pri->resetpos]->channel, (why & SRVST_FAREND) ? (why & SRVST_NEAREND) ? "both ends" : "far end" : "near end");
goto tryanotherpos; goto tryanotherpos;
} }
} }
@@ -1494,25 +1493,24 @@ static void *pri_dchannel(void *vpri)
char db_chan_name[20], db_answer[5], state; char db_chan_name[20], db_answer[5], state;
int why, skipit = 0; int why, skipit = 0;
ast_mutex_lock(&pri->pvts[chanpos]->service_lock); snprintf(db_chan_name, sizeof(db_chan_name), "%s/%d:%d", dahdi_db, pri->span, pri->pvts[chanpos]->channel);
snprintf(db_chan_name, sizeof(db_chan_name), "%s/%d:%d", dahdi_db, pri->pvts[chanpos]->pri->span, pri->pvts[chanpos]->channel);
ast_mutex_unlock(&pri->pvts[chanpos]->service_lock);
if (!ast_db_get(db_chan_name, SRVST_DBKEY, db_answer, sizeof(db_answer))) { if (!ast_db_get(db_chan_name, SRVST_DBKEY, db_answer, sizeof(db_answer))) {
sscanf(db_answer, "%1c:%30d", &state, &why); sscanf(db_answer, "%1c:%30d", &state, &why);
if (why) { if (why) {
ast_log(LOG_NOTICE, "span '%d' channel '%d' out-of-service (reason: %s), ignoring RESTART\n", pri->span, ast_log(LOG_NOTICE, "span '%d' channel '%d' out-of-service (reason: %s), ignoring RESTART\n", pri->span,
e->restart.channel, (why & SRVST_FAREND) ? (why & SRVST_NEAREND) ? "both ends" : "far end" : "near end"); PRI_CHANNEL(e->restart.channel), (why & SRVST_FAREND) ? (why & SRVST_NEAREND) ? "both ends" : "far end" : "near end");
skipit = 1; skipit = 1;
} else { } else {
ast_db_del(db_chan_name, SRVST_DBKEY); ast_db_del(db_chan_name, SRVST_DBKEY);
} }
} }
#endif
sig_pri_lock_private(pri->pvts[chanpos]);
#ifdef HAVE_PRI_SERVICE_MESSAGES
if (!skipit) { if (!skipit) {
#endif #endif
ast_verb(3, "B-channel %d/%d restarted on span %d\n", ast_verb(3, "B-channel %d/%d restarted on span %d\n",
PRI_SPAN(e->restart.channel), PRI_CHANNEL(e->restart.channel), pri->span); PRI_SPAN(e->restart.channel), PRI_CHANNEL(e->restart.channel), pri->span);
sig_pri_lock_private(pri->pvts[chanpos]);
if (pri->pvts[chanpos]->call) { if (pri->pvts[chanpos]->call) {
pri_destroycall(pri->pri, pri->pvts[chanpos]->call); pri_destroycall(pri->pri, pri->pvts[chanpos]->call);
pri->pvts[chanpos]->call = NULL; pri->pvts[chanpos]->call = NULL;
@@ -1526,7 +1524,7 @@ static void *pri_dchannel(void *vpri)
sig_pri_unlock_private(pri->pvts[chanpos]); sig_pri_unlock_private(pri->pvts[chanpos]);
} }
} else { } else {
ast_verb(3, "Restart on requested on entire span %d\n", pri->span); ast_verb(3, "Restart requested on entire span %d\n", pri->span);
for (x = 0; x < pri->numchans; x++) for (x = 0; x < pri->numchans; x++)
if (pri->pvts[x]) { if (pri->pvts[x]) {
sig_pri_lock_private(pri->pvts[x]); sig_pri_lock_private(pri->pvts[x]);
@@ -1609,11 +1607,8 @@ static void *pri_dchannel(void *vpri)
char db_chan_name[20], db_answer[5], state; char db_chan_name[20], db_answer[5], state;
int ch, why = -1; int ch, why = -1;
ast_mutex_lock(&pri->pvts[chanpos]->service_lock);
ch = pri->pvts[chanpos]->channel; ch = pri->pvts[chanpos]->channel;
ast_mutex_unlock(&pri->pvts[chanpos]->service_lock); snprintf(db_chan_name, sizeof(db_chan_name), "%s/%d:%d", dahdi_db, pri->span, ch);
snprintf(db_chan_name, sizeof(db_chan_name), "%s/%d:%d", dahdi_db, pri->pvts[chanpos]->pri->span, ch);
if (!ast_db_get(db_chan_name, SRVST_DBKEY, db_answer, sizeof(db_answer))) { if (!ast_db_get(db_chan_name, SRVST_DBKEY, db_answer, sizeof(db_answer))) {
sscanf(db_answer, "%1c:%30d", &state, &why); sscanf(db_answer, "%1c:%30d", &state, &why);
ast_db_del(db_chan_name, SRVST_DBKEY); ast_db_del(db_chan_name, SRVST_DBKEY);

1
channels/sig_pri.h
View File

@@ -166,7 +166,6 @@ struct sig_pri_chan {
struct sig_pri_callback *calls; struct sig_pri_callback *calls;
void *chan_pvt; /*!< Private structure of the user of this module. */ void *chan_pvt; /*!< Private structure of the user of this module. */
ast_mutex_t service_lock; /*!< Mutex for service messages */
#if defined(HAVE_PRI_REVERSE_CHARGE) #if defined(HAVE_PRI_REVERSE_CHARGE)
int reverse_charging_indication; int reverse_charging_indication;
#endif #endif