[asterisk-commits] wdoekes: branch 1.8 r406079 - in /branches/1.8: configs/ main/

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Tue Jan 21 14:54:19 2014
New Revision: 406079

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

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

Modified:
    branches/1.8/configs/manager.conf.sample
    branches/1.8/main/manager.c

Modified: branches/1.8/configs/manager.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/manager.conf.sample?view=diff&rev=406079&r1=406078&r2=406079
==============================================================================
--- branches/1.8/configs/manager.conf.sample (original)
+++ branches/1.8/configs/manager.conf.sample Tue Jan 21 14:54:19 2014
@@ -87,12 +87,13 @@
 ;permit=209.16.236.73/255.255.255.0
 ;
 ;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/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=406079&r1=406078&r2=406079
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Tue Jan 21 14:54:19 2014
@@ -7136,8 +7136,8 @@
 					} else {
 						is_blackfilter = 0;
 					}
-					if (regcomp(new_filter, value, 0)) {
-						ao2_t_ref(new_filter, -1, "failed to make regx");
+					if (regcomp(new_filter, value, 0)) { /* XXX: the only place we use non-REG_EXTENDED */
+						ao2_t_ref(new_filter, -1, "failed to make regex");
 					} else {
 						if (is_blackfilter) {
 							ao2_t_link(user->blackfilters, new_filter, "link new filter into black user container");