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

handle polarity reversal hangup indication during an incoming call that is still ringing (issue #5191)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Kevin P. Fleming 20 years ago
parent 78fa3593b1
commit 24cdb73f92
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File

52
channels/chan_zap.c
Unescape View File

@ -4140,37 +4140,44 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
} }
break; break;
case ZT_EVENT_POLARITY: case ZT_EVENT_POLARITY:
/* /*
* If we get a Polarity Switch event, check to see * If we get a Polarity Switch event, check to see
* if we should change the polarity state and * if we should change the polarity state and
* mark the channel as UP or if this is an indication * mark the channel as UP or if this is an indication
* of remote end disconnect. * of remote end disconnect.
*/ */
if (p->polarity == POLARITY_IDLE) { if (p->polarity == POLARITY_IDLE) {
p->polarity = POLARITY_REV; p->polarity = POLARITY_REV;
if (p->answeronpolarityswitch && if (p->answeronpolarityswitch &&
((ast->_state == AST_STATE_DIALING) || ((ast->_state == AST_STATE_DIALING) ||
(ast->_state == AST_STATE_RINGING))) { (ast->_state == AST_STATE_RINGING))) {
ast_log(LOG_DEBUG, "Answering on polarity switch!\n"); ast_log(LOG_DEBUG, "Answering on polarity switch!\n");
ast_setstate(p->owner, AST_STATE_UP); ast_setstate(p->owner, AST_STATE_UP);
} else } else
ast_log(LOG_DEBUG, "Ignore switch to REVERSED Polarity on channel %d, state %d\n", p->channel, ast->_state); ast_log(LOG_DEBUG, "Ignore switch to REVERSED Polarity on channel %d, state %d\n", p->channel, ast->_state);
} else if(p->hanguponpolarityswitch && }
/* Removed else statement from here as it was preventing hangups from ever happening*/
/* Added AST_STATE_RING in if statement below to deal with calling party hangups that take place when ringing */
if(p->hanguponpolarityswitch &&
(p->polarityonanswerdelay > 0) && (p->polarityonanswerdelay > 0) &&
(p->polarity == POLARITY_REV) && (p->polarity == POLARITY_REV) &&
(ast->_state == AST_STATE_UP)) { ((ast->_state == AST_STATE_UP) || (ast->_state == AST_STATE_RING)) ) {
/* Added log_debug information below to provide a better indication of what is going on */
ast_log(LOG_DEBUG, "Polarity Reversal event occured - DEBUG 1: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %d\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );
if(ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) > p->polarityonanswerdelay) { if(ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) > p->polarityonanswerdelay) {
ast_log(LOG_DEBUG, "Hangup due to Reverse Polarity on channel %d\n", p->channel); ast_log(LOG_DEBUG, "Polarity Reversal detected and now Hanging up on channel %d\n", p->channel);
ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT); ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT);
p->polarity = POLARITY_IDLE; p->polarity = POLARITY_IDLE;
} else { } else {
ast_log(LOG_DEBUG, "Ignore Reverse Polarity (too close to answer event) on channel %d, state %d\n", p->channel, ast->_state); ast_log(LOG_DEBUG, "Polarity Reversal detected but NOT hanging up (too close to answer event) on channel %d, state %d\n", p->channel, ast->_state);
} }
} else { } else {
p->polarity = POLARITY_IDLE; p->polarity = POLARITY_IDLE;
ast_log(LOG_DEBUG, "Ignore switch to IDLE Polarity on channel %d, state %d\n", p->channel, ast->_state); ast_log(LOG_DEBUG, "Ignoring Polarity switch to IDLE on channel %d, state %d\n", p->channel, ast->_state);
} }
/* Added more log_debug information below to provide a better indication of what is going on */
ast_log(LOG_DEBUG, "Polarity Reversal event occured - DEBUG 2: channel %d, state %d, pol= %d, aonp= %d, honp= %d, pdelay= %d, tv= %d\n", p->channel, ast->_state, p->polarity, p->answeronpolarityswitch, p->hanguponpolarityswitch, p->polarityonanswerdelay, ast_tvdiff_ms(ast_tvnow(), p->polaritydelaytv) );
break; break;
default: default:
ast_log(LOG_DEBUG, "Dunno what to do with event %d on channel %d\n", res, p->channel); ast_log(LOG_DEBUG, "Dunno what to do with event %d on channel %d\n", res, p->channel);
@ -4180,6 +4187,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
static struct ast_frame *__zt_exception(struct ast_channel *ast) static struct ast_frame *__zt_exception(struct ast_channel *ast)
{ {
struct zt_pvt *p = ast->tech_pvt; struct zt_pvt *p = ast->tech_pvt;

Write Preview
Loading…
Cancel
Save