manager: Clarify eventfilter documentation. Textual changes only.

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@406079 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index fb44e74d4d3958cb76d5ae27f7d45078d3c4d6ac..9d87695ff0ec417218b2ac8867e9be326c633e12 100644 (file)
--- a/configs/manager.conf.sample
+++ b/configs/manager.conf.sample
@@ -87,12 +87,13 @@ bindaddr = 0.0.0.0
 ;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.

diff --git a/main/manager.c b/main/manager.c
index 4e4c206f47452636f2779d22c9dca4638f064b77..394cad3682ce3c909a7a63838ef827b27498928f 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -7136,8 +7136,8 @@ static int __init_manager(int reload)
                                        } 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");