kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only remove/destroy the RTCP I/O item if it exists.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-11-20 15:58:50 +00:00
parent 335630b10c
commit b42279c142
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/rtp.c
View File

@@ -2871,7 +2871,8 @@ static int p2p_callback_disable(struct ast_channel *chan, struct ast_rtp *rtp, i
ast_channel_lock(chan); ast_channel_lock(chan);
/* Remove the callback from the IO context */ /* Remove the callback from the IO context */
ast_io_remove(rtp->io, iod[0]); ast_io_remove(rtp->io, iod[0]);
ast_io_remove(rtp->io, iod[1]); if (iod[1])
ast_io_remove(rtp->io, iod[1]);
/* Restore file descriptors */ /* Restore file descriptors */
chan->fds[0] = fds[0]; chan->fds[0] = fds[0];
chan->fds[1] = fds[1]; chan->fds[1] = fds[1];
@@ -2888,7 +2889,7 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast
struct ast_frame *fr = NULL; struct ast_frame *fr = NULL;
struct ast_channel *who = NULL, *other = NULL, *cs[3] = {NULL, }; struct ast_channel *who = NULL, *other = NULL, *cs[3] = {NULL, };
int p0_fds[2] = {-1, -1}, p1_fds[2] = {-1, -1}; int p0_fds[2] = {-1, -1}, p1_fds[2] = {-1, -1};
int *p0_iod[2] = {NULL, }, *p1_iod[2] = {NULL, }; int *p0_iod[2] = {NULL, NULL}, *p1_iod[2] = {NULL, NULL};
int p0_callback = 0, p1_callback = 0; int p0_callback = 0, p1_callback = 0;
enum ast_bridge_result res = AST_BRIDGE_FAILED; enum ast_bridge_result res = AST_BRIDGE_FAILED;