[asterisk-commits] file: branch file/pjsip-outbound-publish r419681 - /team/file/pjsip-outbound-...

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jul 28 07:20:29 2014
New Revision: 419681

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419681
Log:
Fix a bug where filtering would not occur.

Modified:
    team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c

Modified: team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c?view=diff&rev=419681&r1=419680&r2=419681
==============================================================================
--- team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c (original)
+++ team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c Mon Jul 28 07:20:29 2014
@@ -317,8 +317,11 @@
 	datastore->data = publisher_state;
 
 	value = ast_sorcery_object_get_extended(configuration, "device_state_filter");
-	if (!ast_strlen_zero(value) && build_regex(&publisher_state->device_state_regex, value)) {
-		return -1;
+	if (!ast_strlen_zero(value)) {
+		if (build_regex(&publisher_state->device_state_regex, value)) {
+			return -1;
+		}
+		publisher_state->device_state_filter = 1;
 	}
 
 	value = ast_sorcery_object_get_extended(configuration, "device_state");
@@ -327,8 +330,11 @@
 	}
 
 	value = ast_sorcery_object_get_extended(configuration, "mailbox_state_filter");
-	if (!ast_strlen_zero(value) && build_regex(&publisher_state->mailbox_state_regex, value)) {
-		return -1;
+	if (!ast_strlen_zero(value)) {
+		if (build_regex(&publisher_state->mailbox_state_regex, value)) {
+			return -1;
+		}
+		publisher_state->mailbox_state_filter = 1;
 	}
 
 	value = ast_sorcery_object_get_extended(configuration, "mailbox_state");