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

Run setstate after setting all appropriate variables including callerid

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-04-28 14:35:20 +00:00
parent 882411586a
commit fd9d8ca43b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_h323.c
View File

@@ -656,7 +656,6 @@ static struct ast_channel *oh323_new(struct oh323_pvt *i, int state, const char
fmt = ast_best_codec(ch->nativeformats); fmt = ast_best_codec(ch->nativeformats);
ch->type = type; ch->type = type;
ch->fds[0] = ast_rtp_fd(i->rtp); ch->fds[0] = ast_rtp_fd(i->rtp);
ast_setstate(ch, state);
if (state == AST_STATE_RING) if (state == AST_STATE_RING)
ch->rings = 1; ch->rings = 1;
@@ -700,6 +699,7 @@ static struct ast_channel *oh323_new(struct oh323_pvt *i, int state, const char
strncpy(ch->accountcode, i->accountcode, sizeof(ch->accountcode)-1); strncpy(ch->accountcode, i->accountcode, sizeof(ch->accountcode)-1);
if (i->amaflags) if (i->amaflags)
ch->amaflags = i->amaflags; ch->amaflags = i->amaflags;
ast_setstate(ch, state);
if (state != AST_STATE_DOWN) { if (state != AST_STATE_DOWN) {
if (ast_pbx_start(ch)) { if (ast_pbx_start(ch)) {
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ch->name); ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ch->name);

3
channels/chan_sip.c
View File

@@ -1557,7 +1557,6 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title)
tmp->fds[2] = ast_rtp_fd(i->vrtp); tmp->fds[2] = ast_rtp_fd(i->vrtp);
tmp->fds[3] = ast_rtcp_fd(i->vrtp); tmp->fds[3] = ast_rtcp_fd(i->vrtp);
} }
ast_setstate(tmp, state);
if (state == AST_STATE_RING) if (state == AST_STATE_RING)
tmp->rings = 1; tmp->rings = 1;
tmp->adsicpe = AST_ADSI_UNAVAILABLE; tmp->adsicpe = AST_ADSI_UNAVAILABLE;
@@ -1605,7 +1604,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title)
if (strlen(i->domain)) { if (strlen(i->domain)) {
pbx_builtin_setvar_helper(tmp, "SIPDOMAIN", i->domain); pbx_builtin_setvar_helper(tmp, "SIPDOMAIN", i->domain);
} }
ast_setstate(tmp, state);
if (state != AST_STATE_DOWN) { if (state != AST_STATE_DOWN) {
if (ast_pbx_start(tmp)) { if (ast_pbx_start(tmp)) {
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name); ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);