From 6ff5c62ef57c4da4051e310163cf3a6c557b4b4c Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Tue, 16 Oct 2018 13:00:30 +0000 Subject: [PATCH] 93_Log2Syslog: attribute sslCertPrefix added (Forum:#92030) git-svn-id: https://svn.fhem.de/fhem/trunk@17544 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/93_Log2Syslog.pm | 77 ++++++++++++++++++++++++++------------ 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 3b060d9eb..5c01172bb 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 93_Log2Syslog: attribute sslCertPrefix added (Forum:#92030) - bugfix: 10_IT fix usage with multible io devices - bugfix: 73_GardenaSmartBridge/Device fix typo oK to ok, change to package System diff --git a/fhem/FHEM/93_Log2Syslog.pm b/fhem/FHEM/93_Log2Syslog.pm index db486337c..78a4e99ce 100644 --- a/fhem/FHEM/93_Log2Syslog.pm +++ b/fhem/FHEM/93_Log2Syslog.pm @@ -35,6 +35,7 @@ use warnings; # Versions History intern: our %Log2Syslog_vNotesIntern = ( + "5.3.0" => "16.10.2018 attribute sslCertPrefix added (Forum:#92030), module hints & release info order switched ", "5.2.1" => "08.10.2018 setpayload of BSD-format changed, commandref revised ", "5.2.0" => "02.10.2018 added direct help for attributes", "5.1.0" => "01.10.2018 new get versionNotes command", @@ -85,6 +86,7 @@ our %Log2Syslog_vNotesIntern = ( # Versions History extern: our %Log2Syslog_vNotesExtern = ( + "5.3.0" => "16.10.2018 attribute sslCertPrefix added to support multiple SSL-keys (Forum:#92030)", "5.2.1" => "08.10.2018 Send format of BSD changed. The TAG-field was changed to \"IDENT[PID]: \" ", "5.2.0" => "02.10.2018 direct help for attributes added", "5.1.0" => "29.09.2018 new get <name> versionNotes command ", @@ -261,6 +263,7 @@ sub Log2Syslog_Initialize($) { "respectSeverity:multiple-strict,Emergency,Alert,Critical,Error,Warning,Notice,Informational,Debug ". "octetCount:1,0 ". "ssldebug:0,1,2,3 ". + "sslCertPrefix ". "TLS:1,0 ". "timeout ". "protocol:UDP,TCP ". @@ -1117,32 +1120,12 @@ sub Log2Syslog_Get($@) { } elsif ($opt =~ /versionNotes/) { my $header = "Module release information table
"; my $header1 = "Helpful hints
"; + my $i; # Ausgabetabelle erstellen my ($ret,$val0,$val1); $ret = ""; - $ret .= sprintf("
$header
"); - $ret .= ""; - $ret .= ""; - $ret .= ""; - my $i = 0; - foreach my $key (reverse sort(keys %Log2Syslog_vNotesExtern)) { - ($val0,$val1) = split(/\s/,$Log2Syslog_vNotesExtern{$key},2); - $ret .= sprintf("" ); - $ret .= ""; - $i++; - if ($i & 1) { - # $i ist ungerade - $ret .= ""; - } else { - $ret .= ""; - } - } - $ret .= ""; - $ret .= ""; - $ret .= "
$key $val0 $val1
"; - $ret .= "
"; - + $ret .= sprintf("
$header1
"); $ret .= ""; $ret .= ""; @@ -1165,7 +1148,30 @@ sub Log2Syslog_Get($@) { $ret .= ""; $ret .= "
"; $ret .= "
"; - $ret .= ""; + + $ret .= sprintf("
$header
"); + $ret .= ""; + $ret .= ""; + $ret .= ""; + $i = 0; + foreach my $key (reverse sort(keys %Log2Syslog_vNotesExtern)) { + ($val0,$val1) = split(/\s/,$Log2Syslog_vNotesExtern{$key},2); + $ret .= sprintf("" ); + $ret .= ""; + $i++; + if ($i & 1) { + # $i ist ungerade + $ret .= ""; + } else { + $ret .= ""; + } + } + $ret .= ""; + $ret .= ""; + $ret .= "
$key $val0 $val1
"; + $ret .= "
"; + + $ret .= ""; return $ret; @@ -2507,6 +2513,18 @@ $CONT = (split(">",$CONT))[1] if($CONT =~ /^<.*>.*$/);

+ +
+
+