[asterisk-commits] wdoekes: branch 12 r406081 - in /branches/12: ./ configs/ main/

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Tue Jan 21 15:06:39 2014
New Revision: 406081

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406081
Log:
manager: Clarify eventfilter documentation. Textual changes only.

Review: https://reviewboard.asterisk.org/r/3133/
........

Merged revisions 406079 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 406080 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/configs/manager.conf.sample
    branches/12/main/manager.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/configs/manager.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/12/configs/manager.conf.sample?view=diff&rev=406081&r1=406080&r2=406081
==============================================================================
--- branches/12/configs/manager.conf.sample (original)
+++ branches/12/configs/manager.conf.sample Tue Jan 21 15:06:39 2014
@@ -94,12 +94,13 @@
 ; user.
 ;
 ;eventfilter=Event: Newchannel
-;eventfilter=!Channel: DAHDI*
-; The eventfilter option is used to whitelist or blacklist events per user to be
-; reported with regular expressions and are allowed if both the regex matches
-; and the user has read access set below. Filters are assumed to be for whitelisting
-; unless preceeded by an exclamation point, which marks it as being black.
-; Evaluation of the filters is as follows:
+;eventfilter=!Channel: DAHDI.*
+; The eventfilter option is used to whitelist or blacklist events per user.
+; A filter consists of a (basic/old-style and unanchored) regular expression
+; that is run on the entire event data. If the first character of the filter
+; is an exclamation mark (!), the filter is appended to the blacklist instead
+; of the whitelist. After first checking the read access below, the regular
+; expression filters are processed as follows:
 ; - If no filters are configured all events are reported as normal.
 ; - If there are white filters only: implied black all filter processed first,
 ; then white filters.

Modified: branches/12/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/manager.c?view=diff&rev=406081&r1=406080&r2=406081
==============================================================================
--- branches/12/main/manager.c (original)
+++ branches/12/main/manager.c Tue Jan 21 15:06:39 2014
@@ -5095,8 +5095,8 @@
 		is_blackfilter = 0;
 	}
 
-	if (regcomp(new_filter, filter_pattern, 0)) {
-		ao2_t_ref(new_filter, -1, "failed to make regx");
+	if (regcomp(new_filter, filter_pattern, 0)) { /* XXX: the only place we use non-REG_EXTENDED */
+		ao2_t_ref(new_filter, -1, "failed to make regex");
 		return FILTER_COMPILE_FAIL;
 	}