[asterisk-commits] rmudgett: branch rmudgett/ss7_27_knk r406639 - in /team/rmudgett/ss7_27_knk: ...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Jan 27 10:46:13 2014
New Revision: 406639

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406639
Log:
Resolve conflict and reset automerge.

Modified:
    team/rmudgett/ss7_27_knk/   (props changed)
    team/rmudgett/ss7_27_knk/UPGRADE.txt
    team/rmudgett/ss7_27_knk/configs/manager.conf.sample
    team/rmudgett/ss7_27_knk/main/manager.c

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/ss7_27_knk/
------------------------------------------------------------------------------
--- ss7_27_knk-integrated (original)
+++ ss7_27_knk-integrated Mon Jan 27 10:46:13 2014
@@ -1,1 +1,1 @@
-/trunk:1-406609
+/trunk:1-406638

Modified: team/rmudgett/ss7_27_knk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/UPGRADE.txt?view=diff&rev=406639&r1=406638&r2=406639
==============================================================================
--- team/rmudgett/ss7_27_knk/UPGRADE.txt (original)
+++ team/rmudgett/ss7_27_knk/UPGRADE.txt Mon Jan 27 10:46:13 2014
@@ -47,8 +47,11 @@
    again set the root console verbose level and affect the verbose level
    logged.
 
-chan_dahdi:
- - SS7 support now requires libss7 v2.0 or later.
+ - The manager.conf 'eventfilter' now takes an "extended" regular expression
+   instead of a "basic" one.
 
 ===========================================================
 ===========================================================
+
+chan_dahdi:
+ - SS7 support now requires libss7 v2.0 or later.

Modified: team/rmudgett/ss7_27_knk/configs/manager.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/configs/manager.conf.sample?view=diff&rev=406639&r1=406638&r2=406639
==============================================================================
--- team/rmudgett/ss7_27_knk/configs/manager.conf.sample (original)
+++ team/rmudgett/ss7_27_knk/configs/manager.conf.sample Mon Jan 27 10:46:13 2014
@@ -94,13 +94,14 @@
 ; user.
 ;
 ;eventfilter=Event: Newchannel
-;eventfilter=!Channel: DAHDI.*
+;eventfilter=Channel: (PJ)?SIP/(james|jim|john)-
+;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:
+; A filter consists of an (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: team/rmudgett/ss7_27_knk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ss7_27_knk/main/manager.c?view=diff&rev=406639&r1=406638&r2=406639
==============================================================================
--- team/rmudgett/ss7_27_knk/main/manager.c (original)
+++ team/rmudgett/ss7_27_knk/main/manager.c Mon Jan 27 10:46:13 2014
@@ -5121,7 +5121,7 @@
 		is_blackfilter = 0;
 	}
 
-	if (regcomp(new_filter, filter_pattern, 0)) { /* XXX: the only place we use non-REG_EXTENDED */
+	if (regcomp(new_filter, filter_pattern, REG_EXTENDED | REG_NOSUB)) {
 		ao2_t_ref(new_filter, -1, "failed to make regex");
 		return FILTER_COMPILE_FAIL;
 	}