diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-20 16:04:14 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-20 16:04:14 +0000 |
| commit | 6b706ba403b56e824e2f01b2378588ce873efccd (patch) | |
| tree | 85ea5dd2800cda4fa02cad44e89b2f0bd5f8eda9 /main | |
| parent | 373fef766ed3b5deaa1452a197a3adc34a4c3797 (diff) | |
Merged revisions 47852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47852 | file | 2006-11-20 10:58:50 -0500 (Mon, 20 Nov 2006) | 2 lines
Only remove/destroy the RTCP I/O item if it exists.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47853 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c index dfc4df5f4..005627a5d 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2941,7 +2941,8 @@ static int p2p_callback_disable(struct ast_channel *chan, struct ast_rtp *rtp, i ast_channel_lock(chan); /* Remove the callback from the IO context */ 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 */ chan->fds[0] = fds[0]; chan->fds[1] = fds[1]; @@ -2958,7 +2959,7 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast struct ast_frame *fr = NULL; struct ast_channel *who = NULL, *other = NULL, *cs[3] = {NULL, }; 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; enum ast_bridge_result res = AST_BRIDGE_FAILED; |