kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-17 10:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

manager: Clarify eventfilter documentation. Textual changes only.

Browse Source 
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
........

Merged revisions 406081 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@406082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Walter Doekes
2014-01-21 21:08:00 +00:00
parent b2a682bae2
commit 9a88cc33f8
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configs/manager.conf.sample
View File

@@ -94,12 +94,13 @@ bindaddr = 0.0.0.0
; user. ; user.
; ;
;eventfilter=Event: Newchannel ;eventfilter=Event: Newchannel
;eventfilter=!Channel: DAHDI* ;eventfilter=!Channel: DAHDI.*
; The eventfilter option is used to whitelist or blacklist events per user to be ; The eventfilter option is used to whitelist or blacklist events per user.
; reported with regular expressions and are allowed if both the regex matches ; A filter consists of a (basic/old-style and unanchored) regular expression
; and the user has read access set below. Filters are assumed to be for whitelisting ; that is run on the entire event data. If the first character of the filter
; unless preceeded by an exclamation point, which marks it as being black. ; is an exclamation mark (!), the filter is appended to the blacklist instead
; Evaluation of the filters is as follows: ; 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 no filters are configured all events are reported as normal.
; - If there are white filters only: implied black all filter processed first, ; - If there are white filters only: implied black all filter processed first,
; then white filters. ; then white filters.

4
main/manager.c
View File

@@ -5095,8 +5095,8 @@ static enum add_filter_result manager_add_filter(const char *filter_pattern, str
is_blackfilter = 0; is_blackfilter = 0;
} }
if (regcomp(new_filter, filter_pattern, 0)) { 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 regx"); ao2_t_ref(new_filter, -1, "failed to make regex");
return FILTER_COMPILE_FAIL; return FILTER_COMPILE_FAIL;
} }