diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-19 17:15:29 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-19 17:15:29 +0000 |
commit | b6a61a7d6b46d8da70a737f3a2e45adbd281756a (patch) | |
tree | e75123c2d834d4e1aa1f224ff1124fedccafb961 /channels/chan_zap.c | |
parent | dd3f2de8359b7674c5d3bb54cf9bc2bc823fe702 (diff) |
Clean up some chan_zap code to make it more readable. (issue #6834 reported by ppyy)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@28704 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r-- | channels/chan_zap.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index d83f6ae0a..dfaf4882b 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -7802,7 +7802,6 @@ static int pri_find_principle(struct zt_pri *pri, int channel) ZT_PARAMS param; int principle = -1; int explicit = PRI_EXPLICIT(channel); - span = PRI_SPAN(channel); channel = PRI_CHANNEL(channel); if (!explicit) { @@ -8724,14 +8723,11 @@ static void *pri_dchannel(void *vpri) if (chanpos < 0) { ast_log(LOG_WARNING, "Ringing requested on unconfigured channel %d/%d span %d\n", PRI_SPAN(e->ringing.channel), PRI_CHANNEL(e->ringing.channel), pri->span); - chanpos = -1; - } - if (chanpos > -1) { + } else { chanpos = pri_fixup_principle(pri, chanpos, e->ringing.call); if (chanpos < 0) { ast_log(LOG_WARNING, "Ringing requested on channel %d/%d not in use on span %d\n", PRI_SPAN(e->ringing.channel), PRI_CHANNEL(e->ringing.channel), pri->span); - chanpos = -1; } else { ast_mutex_lock(&pri->pvts[chanpos]->lock); if (ast_strlen_zero(pri->pvts[chanpos]->dop.dialstr)) { @@ -8844,14 +8840,11 @@ static void *pri_dchannel(void *vpri) if (chanpos < 0) { ast_log(LOG_WARNING, "Facility Name requested on unconfigured channel %d/%d span %d\n", PRI_SPAN(e->facname.channel), PRI_CHANNEL(e->facname.channel), pri->span); - chanpos = -1; - } - if (chanpos > -1) { + } else { chanpos = pri_fixup_principle(pri, chanpos, e->facname.call); if (chanpos < 0) { ast_log(LOG_WARNING, "Facility Name requested on channel %d/%d not in use on span %d\n", PRI_SPAN(e->facname.channel), PRI_CHANNEL(e->facname.channel), pri->span); - chanpos = -1; } else { /* Re-use *69 field for PRI */ ast_mutex_lock(&pri->pvts[chanpos]->lock); @@ -8868,14 +8861,11 @@ static void *pri_dchannel(void *vpri) if (chanpos < 0) { ast_log(LOG_WARNING, "Answer on unconfigured channel %d/%d span %d\n", PRI_SPAN(e->answer.channel), PRI_CHANNEL(e->answer.channel), pri->span); - chanpos = -1; - } - if (chanpos > -1) { + } else { chanpos = pri_fixup_principle(pri, chanpos, e->answer.call); if (chanpos < 0) { ast_log(LOG_WARNING, "Answer requested on channel %d/%d not in use on span %d\n", PRI_SPAN(e->answer.channel), PRI_CHANNEL(e->answer.channel), pri->span); - chanpos = -1; } else { ast_mutex_lock(&pri->pvts[chanpos]->lock); /* Now we can do call progress detection */ @@ -8929,9 +8919,7 @@ static void *pri_dchannel(void *vpri) if (chanpos < 0) { ast_log(LOG_WARNING, "Hangup requested on unconfigured channel %d/%d span %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span); - chanpos = -1; - } - if (chanpos > -1) { + } else { chanpos = pri_fixup_principle(pri, chanpos, e->hangup.call); if (chanpos > -1) { ast_mutex_lock(&pri->pvts[chanpos]->lock); @@ -8999,9 +8987,7 @@ static void *pri_dchannel(void *vpri) if (chanpos < 0) { ast_log(LOG_WARNING, "Hangup REQ requested on unconfigured channel %d/%d span %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span); - chanpos = -1; - } - if (chanpos > -1) { + } else { chanpos = pri_fixup_principle(pri, chanpos, e->hangup.call); if (chanpos > -1) { ast_mutex_lock(&pri->pvts[chanpos]->lock); @@ -9059,9 +9045,7 @@ static void *pri_dchannel(void *vpri) if (chanpos < 0) { ast_log(LOG_WARNING, "Hangup ACK requested on unconfigured channel number %d/%d span %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span); - chanpos = -1; - } - if (chanpos > -1) { + } else { chanpos = pri_fixup_principle(pri, chanpos, e->hangup.call); if (chanpos > -1) { ast_mutex_lock(&pri->pvts[chanpos]->lock); @@ -9118,9 +9102,7 @@ static void *pri_dchannel(void *vpri) ast_log(LOG_WARNING, "Restart ACK requested on strange channel %d/%d span %d\n", PRI_SPAN(e->restartack.channel), PRI_CHANNEL(e->restartack.channel), pri->span); } - chanpos = -1; - } - if (chanpos > -1) { + } else { if (pri->pvts[chanpos]) { ast_mutex_lock(&pri->pvts[chanpos]->lock); if (pri->pvts[chanpos]->realcall) |