From f0f93a51c0c49793df2a8d54a41fbdb172b8985b Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Sun, 1 Apr 2018 17:07:02 +0000 Subject: [PATCH] [BF] Fixing filter, wenn keine Angelegt wurden, akzeptiere alle Pakete --- BosmonMqtt/MqttEventProcessor.cs | 3 +++ BosmonMqtt/MqttPlugin.cs | 2 +- BosmonMqtt/Properties/AssemblyInfo.cs | 4 ++-- BosmonMqtt/bin/Release/BosmonMqtt.dll | Bin 25088 -> 25088 bytes BosmonMqtt/bin/Release/M2Mqtt.dll | Bin 38912 -> 38912 bytes 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/BosmonMqtt/MqttEventProcessor.cs b/BosmonMqtt/MqttEventProcessor.cs index 552e68b..c3a0a10 100644 --- a/BosmonMqtt/MqttEventProcessor.cs +++ b/BosmonMqtt/MqttEventProcessor.cs @@ -164,6 +164,9 @@ namespace BlubbFish.BosmonMqtt { private Boolean FilterMatchType(List filter, Telegram t) { Boolean negatedInList = false; + if(filter.Count == 0) { + return true; + } foreach (FilterItem item in filter) { if (item.IsMatching(t) && item.Negated) { return false; diff --git a/BosmonMqtt/MqttPlugin.cs b/BosmonMqtt/MqttPlugin.cs index ba51bea..e89bca4 100644 --- a/BosmonMqtt/MqttPlugin.cs +++ b/BosmonMqtt/MqttPlugin.cs @@ -21,7 +21,7 @@ namespace BlubbFish.BosmonMqtt { Int32 IBosMonPlugin.PluginVersion { get { - return 2; + return 3; } } diff --git a/BosmonMqtt/Properties/AssemblyInfo.cs b/BosmonMqtt/Properties/AssemblyInfo.cs index 32b8096..6039b8e 100644 --- a/BosmonMqtt/Properties/AssemblyInfo.cs +++ b/BosmonMqtt/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] +[assembly: AssemblyVersion("1.2.1.0")] +[assembly: AssemblyFileVersion("1.2.1.0")] [assembly: NeutralResourcesLanguage("de")] diff --git a/BosmonMqtt/bin/Release/BosmonMqtt.dll b/BosmonMqtt/bin/Release/BosmonMqtt.dll index a8fb70168501569195a6d755639c511ea8dabbe4..73bc16c145b215df4eac2565cdb2a643b8b249a8 100644 GIT binary patch delta 6604 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 L`Tr8z8#Dg{w6u`! diff --git a/BosmonMqtt/bin/Release/M2Mqtt.dll b/BosmonMqtt/bin/Release/M2Mqtt.dll index dc65581b9e7babd5e5a4a2c5a59863ee373be00f..915dcd8c2bc349c80c646b36301078b5e2058080 100644 GIT binary patch delta 88 zcmZqJz|^pTX+j6{9)W`!yAQStXjC0%SgG>cefPuV;q?#iaBhz2n8B{ITi{?60}wC) qu?!;v1J61jp1{Bm6zmebBRY55M8++?tJif!Dc=3_YqP?H2kZa|IU*GR delta 88 zcmZqJz|^pTX+j6H>Z=1AyAQSt?44Y4Py4Bach|v{=Xu@)KiwSDF@s$PC>zB91WZ6I p!^ptEvkr(SFfarKy98VIp6y!CQsB0uiG?rvOW*U&3KJf%0{}|OA_o8f