[svn-commits] moy: branch 1.6.2 r200807 - in /branches/1.6.2: ./ channels/ configs/

[SVN commits to the Digium repositories]

Author: moy
Date: Mon Jun 15 21:41:09 2009
New Revision: 200807

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200807
Log:
Merged revisions 200799 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200799 | moy | 2009-06-15 21:24:30 -0500 (Mon, 15 Jun 2009) | 2 lines
  
  keep backwards compatible chan_dahdi with older openr2 versions by not using the new skip category feature unless supported
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c
    branches/1.6.2/configs/chan_dahdi.conf.sample

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=200807&r1=200806&r2=200807
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Mon Jun 15 21:41:09 2009
@@ -475,7 +475,9 @@
 	int max_ani;
 	int max_dnis;
 	int get_ani_first:1;
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
 	int skip_category_request:1;
+#endif
 	int call_files:1;
 	int allow_collect_calls:1;
 	int charge_calls:1;
@@ -1306,7 +1308,9 @@
 			.max_ani = 10,
 			.max_dnis = 4,
 			.get_ani_first = -1,
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
 			.skip_category_request = -1,
+#endif
 			.call_files = 0,
 			.allow_collect_calls = 0,
 			.charge_calls = 1,
@@ -9857,7 +9861,9 @@
 	}
 	openr2_context_set_log_level(r2_link->protocol_context, conf->mfcr2.loglevel);
 	openr2_context_set_ani_first(r2_link->protocol_context, conf->mfcr2.get_ani_first);
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
 	openr2_context_set_skip_category_request(r2_link->protocol_context, conf->mfcr2.skip_category_request);
+#endif
 	openr2_context_set_mf_threshold(r2_link->protocol_context, threshold);
 	openr2_context_set_mf_back_timeout(r2_link->protocol_context, conf->mfcr2.mfback_timeout);
 	openr2_context_set_metering_pulse_timeout(r2_link->protocol_context, conf->mfcr2.metering_pulse_timeout);
@@ -14623,7 +14629,9 @@
 				ast_cli(a->fd, "MFC/R2 Max ANI: %d\n", openr2_context_get_max_ani(r2context));
 				ast_cli(a->fd, "MFC/R2 Max DNIS: %d\n", openr2_context_get_max_dnis(r2context));
 				ast_cli(a->fd, "MFC/R2 Get ANI First: %s\n", openr2_context_get_ani_first(r2context) ? "Yes" : "No");
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
 				ast_cli(a->fd, "MFC/R2 Skip Category Request: %s\n", openr2_context_get_skip_category_request(r2context) ? "Yes" : "No");
+#endif
 				ast_cli(a->fd, "MFC/R2 Immediate Accept: %s\n", openr2_context_get_immediate_accept(r2context) ? "Yes" : "No");
 				ast_cli(a->fd, "MFC/R2 Accept on Offer: %s\n", tmp->mfcr2_accept_on_offer ? "Yes" : "No");
 				ast_cli(a->fd, "MFC/R2 Charge Calls: %s\n", tmp->mfcr2_charge_calls ? "Yes" : "No");

Modified: branches/1.6.2/configs/chan_dahdi.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/configs/chan_dahdi.conf.sample?view=diff&rev=200807&r1=200806&r2=200807
==============================================================================
--- branches/1.6.2/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.2/configs/chan_dahdi.conf.sample Mon Jun 15 21:41:09 2009
@@ -1039,9 +1039,8 @@
 ; you can change this setting from the dialplan
 ; 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
+; MFCR2_CATEGORY will also be a variable available in your context
+; on incoming calls set to the value received from the far end
 ; mfcr2_category=national_subscriber
 
 ; Call logging is stored at the Asterisk
@@ -1129,6 +1128,7 @@
 ; mfcr2_accept_on_offer=yes
 
 ; Skip request of calling party category and ANI
+; you need openr2 >= 1.2.0 to use this feature
 ; mfcr2_skip_category=no
 
 ; WARNING: advanced users only! I really mean it