[svn-commits] moy: branch moy/mfcr2 r130633 - in /team/moy/mfcr2: channels/ configs/

[SVN commits to the Digium repositories]

Author: moy
Date: Mon Jul 14 00:04:43 2008
New Revision: 130633

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130633
Log:
added initial support for double-answer process to block collect calls - needs testing

Modified:
    team/moy/mfcr2/channels/chan_zap.c
    team/moy/mfcr2/configs/zapata.conf.sample

Modified: team/moy/mfcr2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/channels/chan_zap.c?view=diff&rev=130633&r1=130632&r2=130633
==============================================================================
--- team/moy/mfcr2/channels/chan_zap.c (original)
+++ team/moy/mfcr2/channels/chan_zap.c Mon Jul 14 00:04:43 2008
@@ -421,7 +421,8 @@
 static int mfcr2_cur_get_ani_first = 0;
 static int mfcr2_cur_context_index = 0;
 static int mfcr2_cur_call_files = 0;
-static int mfcr2_cur_allow_collect_calls = 0; /* don't allow collect calls by default */
+static int mfcr2_cur_allow_collect_calls = 0; 
+static int mfcr2_cur_double_answer = 0; 
 static char mfcr2_cur_logdir[OR2_MAX_LOGDIR];
 static openr2_log_level_t mfcr2_cur_loglevel = OR2_LOG_ERROR | OR2_LOG_WARNING;
 static openr2_calling_party_category_t mfcr2_cur_category = OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER;
@@ -8854,6 +8855,7 @@
 					openr2_context_set_mf_threshold(zap_r2->protocol_context, threshold);
 					openr2_context_set_mf_back_timeout(zap_r2->protocol_context, mfcr2_cur_mfback_timeout);
 					openr2_context_set_metering_pulse_timeout(zap_r2->protocol_context, mfcr2_cur_metering_pulse_timeout);
+					openr2_context_set_double_answer(zap_r2->protocol_context, mfcr2_cur_double_answer);
 					if (ast_strlen_zero(mfcr2_cur_logdir)) {
 						if (openr2_context_set_log_directory(zap_r2->protocol_context, tmplogdir)) {
 							ast_log(LOG_ERROR, "Failed setting default MFC/R2 log directory %s\n", tmplogdir);
@@ -15143,6 +15145,8 @@
 				}
 			} else if (!strcasecmp(v->name, "mfcr2_get_ani_first")) {
 				mfcr2_cur_get_ani_first = ast_true(v->value);
+			} else if (!strcasecmp(v->name, "mfcr2_double_answer")) {
+				mfcr2_cur_double_answer = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "mfcr2_allow_collect_calls")) {
 				mfcr2_cur_allow_collect_calls = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "mfcr2_call_files")) {

Modified: team/moy/mfcr2/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/configs/zapata.conf.sample?view=diff&rev=130633&r1=130632&r2=130633
==============================================================================
--- team/moy/mfcr2/configs/zapata.conf.sample (original)
+++ team/moy/mfcr2/configs/zapata.conf.sample Mon Jul 14 00:04:43 2008
@@ -886,9 +886,11 @@
 ; national_priority_subscriber
 ; international_subscriber
 ; international_priority_subscriber
+; collect_call
 ; usually national_subscriber works just fine
 ; you can change this setting from the dialplan
-; by setting the variable MFCR2_CATEGORY
+; by setting the variable MFCR2_CATEGORY 
+; (remember to set _MFCR2_CATEGORY from originating channels)
 ; MFCR2_CATEGORY will also be a variable available
 ; on incoming calls set to the value received from
 ; the far end
@@ -951,7 +953,16 @@
 ; instead of using the operator (as in Mexico). The R2 spec in Brazil says a special GB tone
 ; should be used to reject collect calls. If you want to ALLOW collect calls specify 'yes',
 ; if you want to BLOCK collect calls then say 'no'. Default is to block collect calls.
+; (see also 'mfcr2_double_answer')
 ; mfcr2_allow_collect_calls=no
+
+; This feature is related but independent of mfcr2_allow_collect_calls
+; Some PBX's require a double-answer process to block collect calls, if
+; you ever have problems blocking collect calls using Group B signals (mfcr2_allow_collect_calls=no)
+; then you may want to try with mfcr2_double_answer=yes, this will cause that every answer signal
+; is changed by answer->clear back->answer (sort of a flash)
+; (see also 'mfcr2_allow_collect_calls')
+; mfcr2_double_answer=no
 
 ; ---------------- END of options to be used with signalling=mfcr2