FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

93_Log2Syslog: contrib 5.10.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21603 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-04-05 13:32:13 +00:00
parent 3f39b64a4c
commit 454c0e6631
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fhem/contrib/DS_Starter/93_Log2Syslog.pm
View File

@ -494,34 +494,41 @@ sub Log2Syslog_Read {
if($data) {
# parse Payload
my (@load,$mlen,$msg,$tail);
if($data =~ /^(?<mlen>(\d+))\s(?<tail>.*)/s) { # Syslog Sätze mit Octet Count -> Transmission of Syslog Messages over TCP https://tools.ietf.org/html/rfc6587
my (@load,$ocount,$msg,$tail);
if($data =~ /^(?<ocount>(\d+))\s(?<tail>.*)/s) { # Syslog Sätze mit Octet Count -> Transmission of Syslog Messages over TCP https://tools.ietf.org/html/rfc6587
Log2Syslog_Log3slog ($hash, 4, "Log2Syslog $name - Datagramm with Octet Count detected - prepare message for Parsing ... \n");
my $i = 0;
$mlen = $+{mlen};
$tail = $+{tail};
$msg = substr($tail,0,$mlen-(length($mlen)+1));
my $i = 0;
$ocount = $+{ocount};
$tail = $+{tail};
$msg = substr($tail,0,$ocount-(1+length $ocount));
chomp $msg;
push @load, $msg;
if(length($tail) >= $mlen) {
$tail = substr($tail,$mlen-(length($mlen)+1));
if(length($tail) >= $ocount-(1+length $ocount)) {
$tail = substr($tail,$ocount-(1+length $ocount));
} else {
$tail = "";
}
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> LEN$i: $mlen, MSG$i: $msg, TAIL$i: $tail \n");
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> OCTET$i : $ocount");
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> MSG$i : $msg");
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> MSGLEN$i: ".length($msg));
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> TAIL$i : $tail");
while($tail && $tail =~ /^(?<mlen>(\d+))\s(?<tail>.*)/s) {
while($tail && $tail =~ /^(?<ocount>(\d+))\s(?<tail>.*)/s) {
$i++;
$mlen = $+{mlen};
$tail = $+{tail};
$msg = substr($tail,0,$mlen-(length($mlen)+1));
$ocount = $+{ocount};
$tail = $+{tail};
$msg = substr($tail,0,$ocount-(1+length $ocount));
chomp $msg;
push @load, $msg;
next if(!$tail);
$tail = substr($tail,$mlen-(length($mlen)+1));
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> LEN$i: $mlen, MSG$i: $msg, TAIL$i: $tail");
$tail = substr($tail,$ocount-(1+length $ocount));
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> OCTET$i : $ocount");
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> MSG$i : $msg");
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> MSGLEN$i: ".length($msg));
Log2Syslog_Log3slog ($hash, 5, "Log2Syslog $name -> TAIL$i : $tail");
}
} else {
@load = split("[\r\n]",$data);