From 6ce67f24ddd596a9dc273e9e9196feecfc1f2a4b Mon Sep 17 00:00:00 2001
From: f-kessler <f-kessler@github.com>
Date: Thu, 22 Feb 2018 14:20:33 +0100
Subject: [PATCH 1/2] Enhancement for multicastAlarm. The RICs configured in
 multicastAlarm_delimiter_ric and multicastAlarm_ric no longer need to be
 included in allow_ric or filter_range_start/filter_range_end.

---
 includes/decoders/poc.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/includes/decoders/poc.py b/includes/decoders/poc.py
index da86318..30a0e22 100644
--- a/includes/decoders/poc.py
+++ b/includes/decoders/poc.py
@@ -62,11 +62,23 @@ def isAllowed(poc_id):
 			return True
 		else:
 			allowed = 0
+	# 5.) Implementation for multicastAlarm
+	if globalVars.config.get("multicastAlarm", "multicastAlarm_delimiter_ric"):
+		if poc_id in globalVars.config.get("multicastAlarm", "multicastAlarm_delimiter_ric"):
+			logging.info("RIC %s as multicastAlarm delimiter", poc_id)
+			return True
+		else:
+			allowed = 0
+	if globalVars.config.get("multicastAlarm", "multicastAlarm_ric"):
+		if poc_id in globalVars.config.get("multicastAlarm", "multicastAlarm_ric"):
+			logging.info("RIC %s as multicastAlarm message", poc_id)
+			return True
+		else:
+			allowed = 0
 
 	if allowed == 0:
 		return False
 	return True
-
 ##
 #
 # POCSAG decoder function

From fadb1de813ca30d8dc97838bbca51bb4f412504d Mon Sep 17 00:00:00 2001
From: f-kessler <f-kessler@github.com>
Date: Fri, 23 Feb 2018 14:42:47 +0100
Subject: [PATCH 2/2] =?UTF-8?q?347=20und=20357=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4e9d3a..3a5e25e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,13 @@
 - FMS und ZVEI Support für Pushover Plugin [#352](https://github.com/Schrolli91/BOSWatch/pull/352)
 - Benutzerdefinierte Nachrichten für Pushover Plugin in config [#352](https://github.com/Schrolli91/BOSWatch/pull/352)
 ##### Changed
+- multicastAlarm Plugin - RICs die von multicastAlarm genutzt werden, müssen nicht mehr in der config bei allow_ric bzw. filter_range_start/filter_range_end berücksichtigt werden. [#357](https://github.com/Schrolli91/BOSWatch/pull/357)
+- FFAgent Plugin - Debug Logging für die alarmHeaders eingebaut zwecks Troubleshooting [#354](https://github.com/Schrolli91/BOSWatch/pull/354)
 ##### Deprecated
 ##### Removed
 ##### Fixed
 - Fehler beim Auslesen der netIdent_RIC im MySQL Plugin [#347](https://github.com/Schrolli91/BOSWatch/pull/347)
+- FFAgent Plugin - Typo bei alarmHeaders für Live Betrieb gefixt [#354](https://github.com/Schrolli91/BOSWatch/pull/354)
 ##### Security