[svn-commits] russell: branch group/security_events r200839 - in /team/group/security_event...

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 16 06:55:24 2009
New Revision: 200839

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200839
Log:
resolve, reset

Modified:
    team/group/security_events/   (props changed)
    team/group/security_events/channels/chan_dahdi.c
    team/group/security_events/configs/chan_dahdi.conf.sample
    team/group/security_events/main/manager.c

Propchange: team/group/security_events/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/security_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 16 06:55:24 2009
@@ -1,1 +1,1 @@
-/trunk:1-200783
+/trunk:1-200838

Modified: team/group/security_events/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/channels/chan_dahdi.c?view=diff&rev=200839&r1=200838&r2=200839
==============================================================================
--- team/group/security_events/channels/chan_dahdi.c (original)
+++ team/group/security_events/channels/chan_dahdi.c Tue Jun 16 06:55:24 2009
@@ -583,7 +583,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;
@@ -1419,7 +1421,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,
@@ -11082,7 +11086,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);
@@ -16197,7 +16203,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: team/group/security_events/configs/chan_dahdi.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/configs/chan_dahdi.conf.sample?view=diff&rev=200839&r1=200838&r2=200839
==============================================================================
--- team/group/security_events/configs/chan_dahdi.conf.sample (original)
+++ team/group/security_events/configs/chan_dahdi.conf.sample Tue Jun 16 06:55:24 2009
@@ -1042,9 +1042,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
@@ -1132,6 +1131,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

Modified: team/group/security_events/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/security_events/main/manager.c?view=diff&rev=200839&r1=200838&r2=200839
==============================================================================
--- team/group/security_events/main/manager.c (original)
+++ team/group/security_events/main/manager.c Tue Jun 16 06:55:24 2009
@@ -1124,7 +1124,7 @@
 
 static int check_manager_session_inuse(const char *name)
 {
-	struct mansession_session *session = ao2_find(sessions, (char*) name, 0);
+	struct mansession_session *session = ao2_find(sessions, (char *) name, 0);
 	int inuse = 0;
 
 	if (session) {