kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-23 07:54:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 92815 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r92815 | tilghman | 2007-12-13 15:28:39 -0600 (Thu, 13 Dec 2007) | 5 lines

Properly initialize polarity statuses, so that they are detected properly.
Reported by: julianjm
Patch by: julianjm
(Closes issue #10238)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-12-13 21:42:33 +00:00
parent e941bbad0f
commit e6fea0b9b0
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_zap.c
+19
View File
@@ -4282,6 +4282,11 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
ast_setstate(ast, AST_STATE_UP);
p->subs[index].f.frametype = AST_FRAME_CONTROL;
p->subs[index].f.subclass = AST_CONTROL_ANSWER;
/* If aops=0 and hops=1, this is necessary */
p->polarity = POLARITY_REV;
} else {
/* Start clean, so we can catch the change to REV polarity when party answers */
p->polarity = POLARITY_IDLE;
}
}
}
@@ -6933,6 +6938,14 @@ static void *ss_thread(void *data)
if (i & ZT_IOMUX_SIGEVENT) {
res = zt_get_event(p->subs[index].zfd);
ast_log(LOG_NOTICE, "Got event %d (%s)...\n", res, event2str(res));
/* If we get a PR event, they hung up while processing calerid */
if ( res == ZT_EVENT_POLARITY && p->hanguponpolarityswitch && p->polarity == POLARITY_REV) {
ast_log(LOG_DEBUG, "Hanging up due to polarity reversal on channel %d while detecting callerid\n", p->channel);
p->polarity = POLARITY_IDLE;
callerid_free(cs);
ast_hangup(chan);
return NULL;
}
res = 0;
/* Let us detect callerid when the telco uses distinctive ring */
@@ -7305,6 +7318,12 @@ static int handle_init_event(struct zt_pvt *i, int event)
case SIG_FXSLS:
case SIG_FXSKS:
case SIG_FXSGS:
/* We have already got a PR before the channel was
created, but it wasn't handled. We need polarity
to be REV for remote hangup detection to work.
At least in Spain */
if (i->hanguponpolarityswitch)
i->polarity = POLARITY_REV;
if (i->cid_start == CID_START_POLARITY || i->cid_start == CID_START_POLARITY_IN) {
i->polarity = POLARITY_REV;
ast_verb(2, "Starting post polarity "