dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Make masquerade compatible with timingfd 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1140 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2003-06-29 23:23:54 +00:00
parent 4331044ea6
commit a85e253481
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
channel.c
View File

@ -1041,11 +1041,15 @@ struct ast_frame *ast_read(struct ast_channel *chan)
data = chan->timingdata;
pthread_mutex_unlock(&chan->lock);
if (func) {
#if 0
ast_log(LOG_DEBUG, "Calling private function\n");
#endif
func(data);
} else {
blah = 0;
pthread_mutex_lock(&chan->lock);
ioctl(chan->timingfd, ZT_TIMERCONFIG, &blah);
chan->timingdata = NULL;
pthread_mutex_unlock(&chan->lock);
}
f = &null_frame;
@ -1901,8 +1905,9 @@ static int ast_do_masquerade(struct ast_channel *original)
/* Update the type. */
original->type = clone->type;
/* Copy the FD's */
for (x=0;x<AST_MAX_FDS;x++)
for (x=0;x<AST_MAX_FDS;x++) {
original->fds[x] = clone->fds[x];
}
/* Move the variables */
tmpv = original->varshead.first;
original->varshead.first = clone->varshead.first;
@ -1931,6 +1936,9 @@ static int ast_do_masquerade(struct ast_channel *original)
original->callerid = clone->callerid;
clone->callerid = tmp;
/* Restore original timing file descriptor */
original->fds[AST_MAX_FDS - 2] = original->timingfd;
/* Our native formats are different now */
original->nativeformats = clone->nativeformats;