From 0d838691bc691201b15d797bf81b6cac0e1194ad Mon Sep 17 00:00:00 2001
From: Moises Silva <moises.silva@gmail.com>
Date: Fri, 19 Feb 2010 18:38:34 +0000
Subject: [PATCH] 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/trunk@248003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_dahdi.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index aadee12b43..9be24e44f5 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -572,17 +572,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;
@@ -16524,7 +16524,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")) {
--
GitLab