kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ast_bridged_channel call from abstract_jb.c

Browse Source 
Interestingly, this only happens in dead code.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395810 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2013-07-30 21:43:29 +00:00
parent 554c46a9cd
commit ea98c903fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/abstract_jb.c
View File

@@ -409,7 +409,6 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
struct ast_jb_conf *jbconf = &jb->conf; struct ast_jb_conf *jbconf = &jb->conf;
const struct ast_jb_impl *jbimpl = jb->impl; const struct ast_jb_impl *jbimpl = jb->impl;
void *jbobj; void *jbobj;
struct ast_channel *bridged;
long now; long now;
char logfile_pathname[20 + AST_JB_IMPL_NAME_SIZE + 2*AST_CHANNEL_NAME + 1]; char logfile_pathname[20 + AST_JB_IMPL_NAME_SIZE + 2*AST_CHANNEL_NAME + 1];
char name1[AST_CHANNEL_NAME], name2[AST_CHANNEL_NAME], *tmp; char name1[AST_CHANNEL_NAME], name2[AST_CHANNEL_NAME], *tmp;
@@ -442,14 +441,15 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
/* Create a frame log file */ /* Create a frame log file */
if (ast_test_flag(jbconf, AST_JB_LOG)) { if (ast_test_flag(jbconf, AST_JB_LOG)) {
RAII_VAR(struct ast_channel *, bridged, ast_channel_bridge_peer(chan), ast_channel_cleanup);
char safe_logfile[30] = "/tmp/logfile-XXXXXX"; char safe_logfile[30] = "/tmp/logfile-XXXXXX";
int safe_fd; int safe_fd;
snprintf(name2, sizeof(name2), "%s", ast_channel_name(chan)); snprintf(name2, sizeof(name2), "%s", ast_channel_name(chan));
if ((tmp = strchr(name2, '/'))) { if ((tmp = strchr(name2, '/'))) {
*tmp = '#'; *tmp = '#';
} }
bridged = ast_bridged_channel(chan);
/* We should always have bridged chan if a jitterbuffer is in use */ /* We should always have bridged chan if a jitterbuffer is in use */
ast_assert(bridged != NULL); ast_assert(bridged != NULL);