mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix syslog RFC5424 compliance (#23509)

Browse Source
This commit is contained in:
Theo Arends 2025-08-07 14:57:43 +02:00
parent 82ab4d1a88
commit 324ac9b158
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
### Changed
### Fixed
- Syslog RFC5424 compliance (#23509)
### Removed

1
RELEASENOTES.md
View File

@ -144,6 +144,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
- Berry raise webserver hooks from 16 to 32 [#23748](https://github.com/arendst/Tasmota/issues/23748)
### Fixed
- Syslog RFC5424 compliance [#23509](https://github.com/arendst/Tasmota/issues/23509)
- AHT30 sensor start with null values after deep sleep [#23624](https://github.com/arendst/Tasmota/issues/23624)
- NeoPool reset to default settings [#23734](https://github.com/arendst/Tasmota/issues/23734)
- Berry vulnerability in JSON parsing for unicode [#23603](https://github.com/arendst/Tasmota/issues/23603)

35
tasmota/tasmota_support/support.ino
View File

@ -2516,16 +2516,16 @@ void SyslogAsync(bool refresh) {
char* msg_start = line +mxtime;
uint32_t msg_len = len -mxtime -1;
/* RFC5424 - Syslog protocol - <PRI>VERSION TIMESTAMP HOSTNAME APP_NAME PROCID STRUCTURED-DATA MSGID MSG
/* RFC5424 - Syslog protocol - <PRI>VERSION TIMESTAMP HOSTNAME APP_NAME PROCID MSGID STRUCTURED-DATA MSG
<PRI>[5] = Facility 16 (= local use 0), Severity 6 (= informational) => 16 * 8 + 6 = <134>
VERSION[2] = 1
TIMESTAMP = yyyy-mm-ddThh:mm:ss.nnnnnn-hh:mm (= local with timezone)
HOSTNAME[255] = wemos5
APP_NAME[48] = tasmota
PROCID[128] = -
STRUCTURED-DATA = -
MSGID[32] = HTP:
SYSLOG-MSG = <134>1 1970-01-01T00:00:02.096000+01:00 wemos5 tasmota - - HTP: Web server active on wemos5 with IP address 192.168.2.172
STRUCTURED-DATA = -
SYSLOG-MSG = <134>1 1970-01-01T00:00:02.096000+01:00 wemos5 tasmota - HTP: - Web server active on wemos5 with IP address 192.168.2.172
Result = 1970-01-01T00:00:02.096000+00:00 wemos5 tasmota HTP: Web server active on wemos5 with IP address 192.168.2.172
Notice date and time is provided by Tasmota device.
@ -2536,43 +2536,46 @@ void SyslogAsync(bool refresh) {
char timestamp[mxtime];
subStr(timestamp, line, " ", 1); // 00:00:02.096-026
subStr(timestamp, timestamp, "-", 1); // 00:00:02.096
/*
snprintf_P(header, sizeof(header), PSTR("<%d>1 %s%s000%s %s tasmota - - -"),
128 + min(loglevel * 3, 7),
128 + min(loglevel * 3, 7), // Error (1) = 131, Info (2) = 134, Debug (3) = 135, DebugMore = (4) 135
GetDate().c_str(), timestamp, GetTimeZone().c_str(), // 1970-01-01T00:00:02.096000+01:00
NetworkHostname());
*/
/*
// msgid is currently not well supported in rsyslog (https://github.com/rsyslog/rsyslog/issues/3592#issuecomment-480186237)
char msgid[5];
char* line_msgid = strchr(msg_start, ' ');
if (line_msgid && (line_msgid - msg_start < sizeof(msgid))) { // Only 3 character message ids supported
subStr(msgid, msg_start, " ", 1); // HTP:
msg_start += strlen(msgid);
msg_len -= strlen(msgid);
uint32_t strlen_msgid = strlen(msgid) +1;
msg_start += strlen_msgid;
msg_len -= strlen_msgid;
} else {
strcpy(msgid, "-"); // -
}
*/
/*
char msgid[2] = { 0 };
char* line_msgid = strchr(msg_start, ':');
if ((line_msgid == nullptr) || (line_msgid - msg_start != 3)) { // Only 3 character message id supported
strcpy(msgid, "-"); // -
}
snprintf_P(header, sizeof(header), PSTR("<%d>1 %s%s000%s %s tasmota - - %s"),
*/
/*
snprintf_P(header, sizeof(header), PSTR("<%d>1 %s%s000%s %s tasmota - %s -"),
128 + min(loglevel * 3, 7), // Error (1) = 131, Info (2) = 134, Debug (3) = 135, DebugMore = (4) 135
GetDate().c_str(), timestamp, GetTimeZone().c_str(), // 1970-01-01T00:00:02.096000+01:00
NetworkHostname(), msgid);
*/
/*
TasConsole.printf("Loglevel ");
TasConsole.print(loglevel);
TasConsole.printf(", Header '");
TasConsole.printf((char*)"Loglevel ");
char number[10];
TasConsole.printf(itoa(loglevel, number, 10));
TasConsole.printf((char*)", Header '");
TasConsole.printf(header);
TasConsole.printf("', Msg '");
TasConsole.printf((char*)"', Msg '");
TasConsole.write((uint8_t*)msg_start, msg_len);
TasConsole.printf("'\r\n");
TasConsole.printf((char*)"'\r\n");
*/
#ifdef ESP8266
// Packets over 1460 bytes are not send