diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-07 21:47:49 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-07 21:47:49 +0000 |
| commit | 4d6996c27ad2cc1e0055b06b18522a44036c4f5c (patch) | |
| tree | c85e2036ae8d28edebee2af6cc055a51e39ba1da /channels/chan_mgcp.c | |
| parent | c347b4f11cda5733f217deac8c9f852fc46945f0 (diff) | |
A fair number of changes for the sake of bug 7506
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47290 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_mgcp.c')
| -rw-r--r-- | channels/chan_mgcp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 02a7600df..2e8011acc 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1433,7 +1433,7 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state) struct mgcp_endpoint *i = sub->parent; int fmt; - tmp = ast_channel_alloc(1); + tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, "MGCP/%s@%s-%d", i->name, i->parent->name, sub->id); if (tmp) { tmp->tech = &mgcp_tech; tmp->nativeformats = i->capability; @@ -1451,7 +1451,6 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state) } else { i->dsp = NULL; } - ast_setstate(tmp, state); if (state == AST_STATE_RING) tmp->rings = 1; tmp->writeformat = fmt; @@ -1474,7 +1473,7 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state) ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten)); /* Don't use ast_set_callerid() here because it will - * generate a NewCallerID event before the NewChannel event */ + * generate a needless NewCallerID event */ tmp->cid.cid_num = ast_strdup(i->cid_num); tmp->cid.cid_ani = ast_strdup(i->cid_num); tmp->cid.cid_name = ast_strdup(i->cid_name); |