kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert my changes that converted the jb on the channel to be dynamically

Browse Source 
allocated. These changes caused crashes when using a channel type that did
not support the jitterbuffer. Instead of fixing why it's crashing, I'm going
to implement this in a better way next week. The way I did it caused a
jitterbuffer to be allocated on every channel where the channel type supported
jitterbuffers, even if they were disabled.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-06-23 16:49:12 +00:00
parent b8518110da
commit c8ceb92a4f
12 changed files with 79 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
channels/chan_jingle.c
View File

@@ -756,6 +756,9 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
if (!ast_strlen_zero(client->musicclass))
ast_string_field_set(tmp, musicclass, client->musicclass);
i->owner = tmp;
ast_mutex_lock(&usecnt_lock);
usecnt++;
ast_mutex_unlock(&usecnt_lock);
ast_copy_string(tmp->context, client->context, sizeof(tmp->context));
ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
if (!ast_strlen_zero(i->cid_num))
@@ -766,26 +769,16 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
tmp->cid.cid_dnid = ast_strdup(i->exten);
tmp->priority = 1;
ast_setstate(tmp, state);
/* Configure the new channel jb */
if (i->rtp) {
if (ast_jb_configure(tmp, &global_jbconf)) {
ast_hangup(tmp);
i->owner = NULL;
return NULL;
}
}
if (state != AST_STATE_DOWN && ast_pbx_start(tmp)) {
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
tmp->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
ast_hangup(tmp);
i->owner = NULL;
return NULL;
tmp = NULL;
}
ast_mutex_lock(&usecnt_lock);
usecnt++;
ast_mutex_unlock(&usecnt_lock);
ast_update_use_count();
/* Configure the new channel jb */
if (tmp && i && i->rtp)
ast_jb_configure(tmp, &global_jbconf);
return tmp;
}