[asterisk-commits] moy: branch moy/mfcr2 r124595 - in /team/moy/mfcr2: channels/ configs/

[SVN commits to the Asterisk project]

Author: moy
Date: Sat Jun 21 23:29:48 2008
New Revision: 124595

URL: http://svn.digium.com/view/asterisk?view=rev&rev=124595
Log:
added mfcr2_call_files option to disable/enable via config file the call files

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=124595&r1=124594&r2=124595
==============================================================================
--- team/moy/mfcr2/channels/chan_zap.c (original)
+++ team/moy/mfcr2/channels/chan_zap.c Sat Jun 21 23:29:48 2008
@@ -420,6 +420,7 @@
 static int mfcr2_cur_max_dnis = 4;
 static int mfcr2_cur_get_ani_first = 0;
 static int mfcr2_cur_context_index = 0;
+static int mfcr2_cur_call_files = 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;
@@ -8847,6 +8848,9 @@
 					openr2_chan_set_client_data(tmp->r2chan, tmp);
 					openr2_chan_set_logging_func(tmp->r2chan, zt_r2_on_chan_log);
 					openr2_chan_set_log_level(tmp->r2chan, mfcr2_cur_loglevel);
+					if (mfcr2_cur_call_files) {
+						openr2_chan_enable_call_files(tmp->r2chan);
+					} 
 					tmp->mf_tx_state.r2chan = tmp->r2chan;
 					tmp->mfcr2_category = mfcr2_cur_category;
 					tmp->mfcr2 = zap_r2;
@@ -15046,6 +15050,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_call_files")) {
+				mfcr2_cur_call_files = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "mfcr2_max_ani")) {
 				mfcr2_cur_max_ani = atoi(v->value);
 			} else if (!strcasecmp(v->name, "mfcr2_max_dnis")) {

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=124595&r1=124594&r2=124595
==============================================================================
--- team/moy/mfcr2/configs/zapata.conf.sample (original)
+++ team/moy/mfcr2/configs/zapata.conf.sample Sat Jun 21 23:29:48 2008
@@ -897,11 +897,15 @@
 ; Call logging is stored at the Asterisk
 ; logging directory specified in asterisk.conf
 ; plus mfcr2/<whatever you put here>
-; For call logging to work the directory must exists
+; For call logging to work the directory MUST exists
 ; if you specify 'span1' here and asterisk.conf has
 ; as logging directory /var/log/asterisk then the full
 ; path to your MFC/R2 call logs will be /var/log/asterisk/mfcr2/span1
+; remember to set mfcr2_call_files=yes
 ; mfcr2_logdir=span1
+
+; whether or not to drop call files into mfcr2_logdir
+; mfcr2_call_files=yes|no
 
 ; MFC/R2 valid logging values are: all,error,warning,debug,notice,cas,mf,stack,nothing
 ; error,warning,debug and notice are self-descriptive