diff options
| author | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-23 05:29:33 +0000 |
|---|---|---|
| committer | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-23 05:29:33 +0000 |
| commit | 0423bcb5f65a0dd0b4910cccb88e16e8b25e25ab (patch) | |
| tree | 635cf6c52d1e4955ace8ee9ee4d3c2360e3f7513 | |
| parent | 4199db292a90825dae45b18100a81a37d204c2c9 (diff) | |
Merged revisions 196456 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r196456 | moy | 2009-05-22 23:27:47 -0500 (Fri, 22 May 2009) | 1 line
set MFCR2_CATEGORY just when starting the pbx
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@196487 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9c684601a..78de3620e 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -7519,10 +7519,6 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb i->isidlecall = 0; i->alreadyhungup = 0; #endif -#ifdef HAVE_OPENR2 - if (i->mfcr2call) - pbx_builtin_setvar_helper(tmp, "MFCR2_CATEGORY", openr2_proto_get_category_string(i->mfcr2_recvd_category)); -#endif /* clear the fake event in case we posted one before we had ast_channel */ i->fake_event = 0; /* Assure there is no confmute on this channel */ @@ -7537,6 +7533,11 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb pbx_builtin_setvar_helper(tmp, v->name, v->value); if (startpbx) { +#ifdef HAVE_OPENR2 + if (i->mfcr2call) { + pbx_builtin_setvar_helper(tmp, "MFCR2_CATEGORY", openr2_proto_get_category_string(i->mfcr2_recvd_category)); + } +#endif if (ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name); ast_hangup(tmp); |