diff options
| author | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-19 19:00:17 +0000 |
|---|---|---|
| committer | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-19 19:00:17 +0000 |
| commit | 06ae54a8a1b503fbb8ff3f1ae607cd9a7919c032 (patch) | |
| tree | 9c1d7f92a55175242085e753031800fd6abe9068 | |
| parent | 2fa4ddb40dce040087a20145a568e10be9e9f698 (diff) | |
Merged revisions 248003 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r248003 | moy | 2010-02-19 13:38:34 -0500 (Fri, 19 Feb 2010) | 1 line
mfcr2 issue 0016844 - Fix portability bit fields and make mfcr2_immediate_accept work again, reported and patched by korihor
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@248005 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 853fc8fb7..c3057d4ce 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -472,17 +472,17 @@ struct dahdi_mfcr2_conf { int metering_pulse_timeout; int max_ani; int max_dnis; - int get_ani_first:1; + signed int get_ani_first:2; #if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1 - int skip_category_request:1; + signed int skip_category_request:2; #endif - int call_files:1; - int allow_collect_calls:1; - int charge_calls:1; - int accept_on_offer:1; - int forced_release:1; - int double_answer:1; - int immediate_accept:1; + unsigned int call_files:1; + unsigned int allow_collect_calls:1; + unsigned int charge_calls:1; + unsigned int accept_on_offer:1; + unsigned int forced_release:1; + unsigned int double_answer:1; + signed int immediate_accept:2; char logdir[OR2_MAX_PATH]; char r2proto_file[OR2_MAX_PATH]; openr2_log_level_t loglevel; @@ -16852,7 +16852,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct } else if (!strcasecmp(v->name, "mfcr2_charge_calls")) { confp->mfcr2.charge_calls = ast_true(v->value) ? 1 : 0; } else if (!strcasecmp(v->name, "mfcr2_accept_on_offer")) { - confp->mfcr2.accept_on_offer = ast_true(v->value); + confp->mfcr2.accept_on_offer = ast_true(v->value) ? 1 : 0; } else if (!strcasecmp(v->name, "mfcr2_allow_collect_calls")) { confp->mfcr2.allow_collect_calls = ast_true(v->value) ? 1 : 0; } else if (!strcasecmp(v->name, "mfcr2_forced_release")) { |