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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@248005 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 853fc8fb7ae536e13e3ed28e02ed6fa757e6f65a..c3057d4ce967c67bc7ac62ea02244f2ba34276e5 100644 (file)
--- 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")) {