mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 04:00:41 -04:00
80 lines
1.8 KiB
C
80 lines
1.8 KiB
C
|
|
$FreeBSD$
|
|
|
|
--- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005
|
|
+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006
|
|
@@ -638,6 +638,7 @@ static struct zt_pvt {
|
|
int cidlen;
|
|
int ringt;
|
|
int ringt_base;
|
|
+ int waitnorings;
|
|
int stripmsd;
|
|
int callwaitcas;
|
|
int callwaitrings;
|
|
@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel
|
|
}
|
|
|
|
ast_mutex_lock(&p->lock);
|
|
+ switch (p->sig) {
|
|
+ case SIG_FXSGS:
|
|
+ case SIG_FXSKS:
|
|
+ case SIG_FXSLS:
|
|
+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1))
|
|
+ {
|
|
+ p->waitnorings = 1;
|
|
+ }
|
|
+ break;
|
|
+ default:
|
|
+ break;
|
|
+ };
|
|
+
|
|
|
|
index = zt_get_index(ast, p, 1);
|
|
|
|
@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data)
|
|
ast_setstate(chan, AST_STATE_RING);
|
|
chan->rings = 1;
|
|
p->ringt = p->ringt_base;
|
|
+ p->waitnorings = 0;
|
|
res = ast_pbx_run(chan);
|
|
+
|
|
+ if(p->waitnorings)
|
|
+ {
|
|
+ p->ringt = p->ringt_base;
|
|
+ for(;;)
|
|
+ {
|
|
+ int i,j=0;
|
|
+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT;
|
|
+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1)
|
|
+ break;
|
|
+
|
|
+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1)
|
|
+ break;
|
|
+
|
|
+ if(j == ZT_EVENT_RINGOFFHOOK)
|
|
+ p->ringt = p->ringt_base;
|
|
+
|
|
+ usleep(20000);
|
|
+
|
|
+ if (p->ringt <= 0)
|
|
+ break;
|
|
+
|
|
+ else if (p->ringt > 0)
|
|
+ p->ringt--;
|
|
+ }
|
|
+ p->ringt = 0;
|
|
+ p->waitnorings = 0;
|
|
+ }
|
|
+
|
|
if (res) {
|
|
ast_hangup(chan);
|
|
ast_log(LOG_WARNING, "PBX exited non-zero\n");
|
|
@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data)
|
|
i = iflist;
|
|
while(i) {
|
|
if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) {
|
|
- if (!i->owner && !i->subs[SUB_REAL].owner) {
|
|
+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) {
|
|
/* This needs to be watched, as it lacks an owner */
|
|
pfds[count].fd = i->subs[SUB_REAL].zfd;
|
|
pfds[count].events = POLLPRI;
|