@@ -502,6 +502,14 @@ time_now (void)
__clock_gettime (TIME_CLOCK_GETTIME_CLOCKID, &ts);
return ts.tv_sec;
}
+
+static inline struct __timespec64
+timespec64_now (void)
+{
+ struct __timespec64 ts64;
+ __clock_gettime64 (TIME_CLOCK_GETTIME_CLOCKID, &ts64);
+ return ts64;
+}
#endif
#endif
@@ -38,6 +38,10 @@
#include <sys/un.h>
#include <stdio_ext.h>
+#ifndef HOST_NAME_MAX
+# define HOST_NAME_MAX 64
+#endif
+
static int LogType = SOCK_DGRAM; /* Type of socket connection */
static int LogFile = -1; /* fd for log */
static bool connected; /* Have done connect */
@@ -111,6 +115,30 @@ __vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
__vsyslog_internal (pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
}
+/* Defined by RFC5424. */
+#define NILVALUE "-"
+
+struct timebuf_t
+{
+ char b[sizeof ("YYYY-MM-DDThh:mm:ss.nnnnnnZ")];
+};
+
+/* Fill TIMEBUF with a RFC3339 timestamp. Use UTC time and maximum
+ TIME-SECFRAC accurancy allowed (6 digits for microseconds). */
+static void
+syslog_rfc3339_timestamp (struct timebuf_t *timebuf)
+{
+ struct __timespec64 ts = timespec64_now ();
+ struct tm now_tm;
+ __gmtime64_r (&ts.tv_sec, &now_tm);
+
+ __snprintf (timebuf->b, sizeof (timebuf->b),
+ "%04d-%02d-%02dT%02d:%02d:%02d.%06dZ",
+ now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday,
+ now_tm.tm_hour, now_tm.tm_min, now_tm.tm_sec,
+ (int32_t) ts.tv_nsec / 1000);
+}
+
void
__vsyslog_internal (int pri, const char *fmt, va_list ap,
unsigned int mode_flags)
@@ -143,35 +171,30 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
if ((pri & LOG_FACMASK) == 0)
pri |= LogFacility;
- pid_t pid = LogStat & LOG_PID ? __getpid () : 0;
-
- enum
- {
- timebuf_size = 3+1 /* "%h " */
- + 2+1 /* "%e " */
- + 2+1 + 2+1 + 2+1 + 1, /* "%T " */
+ struct timebuf_t timestamp;
+ syslog_rfc3339_timestamp (×tamp);
- bufs_size = 1024
- };
+ char hostname[HOST_NAME_MAX];
+ if (__gethostname (hostname, sizeof (hostname)) == -1)
+ strcpy (hostname, NILVALUE);
- /* "%h %e %H:%M:%S " */
- char timestamp[timebuf_size];
- time_t now = time_now ();
- struct tm now_tm;
- __localtime_r (&now, &now_tm);
- __strftime_l (timestamp, sizeof (timestamp), "%h %e %T ", &now_tm,
- _nl_C_locobj_ptr);
+ pid_t pid = LogStat & LOG_PID ? __getpid () : 0;
-#define SYSLOG_HEADER(__pri, __timestamp, __msgoff, pid) \
- "<%d>%s %n%s%s%.0d%s: ", \
- __pri, __timestamp, __msgoff, \
- LogTag == NULL ? __progname : LogTag, \
- pid != 0 ? "[" : "", pid, pid != 0 ? "]" : ""
+#define SYSLOG_HEADER(__pri, __timestamp, __msgoff, __hostname, __pid) \
+ "<%d>1 %s %n%s %s %s%.0d %s %s ", \
+ __pri, /* PRI */ \
+ __timestamp.b, /* TIMESTAMP */ \
+ __msgoff, __hostname, /* HOSTNAME */ \
+ LogTag == NULL ? __progname : LogTag, /* APP-NAME */ \
+ NILVALUE + !!__pid, __pid, /* PROCID */ \
+ NILVALUE, /* MSGID */ \
+ NILVALUE /* STRUCT-DATA */
/* Try to use a static buffer as an optimization. */
+ enum { bufs_size = 1024 };
char bufs[bufs_size];
int l = __snprintf (bufs, sizeof bufs,
- SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
+ SYSLOG_HEADER (pri, timestamp, &msgoff, hostname, pid));
if (l < sizeof (bufs))
{
va_list apc;
@@ -198,7 +221,7 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap,
if (f != NULL)
{
__fsetlocking (f, FSETLOCKING_BYCALLER);
- fprintf (f, SYSLOG_HEADER (pri, timestamp, &msgoff, pid));
+ fprintf (f, SYSLOG_HEADER (pri, timestamp, &msgoff, hostname, pid));
/* Restore errno for %m format. */
__set_errno (saved_errno);
__vfprintf_internal (f, fmt, ap, mode_flags);
@@ -18,6 +18,7 @@
#include <array_length.h>
#include <fcntl.h>
+#include <intprops.h>
#include <paths.h>
#include <netinet/in.h>
#include <support/capture_subprocess.h>
@@ -201,7 +202,7 @@ check_openlog_message (const struct msg_t *msg, int msgnum,
{
if (options & LOG_PID)
TEST_COMPARE (msg->pid, pid);
- TEST_COMPARE_STRING (msg->ident, expected_ident);
+ TEST_COMPARE_STRING (msg->ident, OPENLOG_IDENT);
TEST_COMPARE (msg->facility, LOG_LOCAL0);
}
else if (msgnum < 2 * array_length (priorities))
@@ -218,28 +219,25 @@ check_openlog_message (const struct msg_t *msg, int msgnum,
return true;
}
+#define NILVALUE "-"
+
static struct msg_t
parse_syslog_msg (const char *msg)
{
struct msg_t r = { .pid = -1 };
int number;
+ char procid[INT_BUFSIZE_BOUND (pid_t)];
/* The message in the form:
- <179>Apr 8 14:51:19 tst-syslog: syslog message 176 3 */
- int n = sscanf (msg, "<%3d>%*s %*d %*d:%*d:%*d %32s %64s %*d %*d",
- &number, r.ident, r.msg);
- TEST_COMPARE (n, 3);
+ <34>1 2003-10-11T22:14:15.003Z mymachine openlog_ident PID - MSG */
+ int n = sscanf (msg, "<%6d>1 %*s %*s %32s %s - - %s",
+ &number, r.ident, procid, r.msg);
+ TEST_COMPARE (n, 4);
r.facility = number & LOG_FACMASK;
r.priority = number & LOG_PRIMASK;
-
- char *pid_start = strchr (r.ident, '[');
- if (pid_start != NULL)
- {
- char *pid_end = strchr (r.ident, ']');
- if (pid_end != NULL)
- r.pid = strtoul (pid_start + 1, NULL, 10);
- }
+ r.pid = strcmp (procid, NILVALUE) == 0
+ ? 0 : strtoul (procid, NULL, 10);
return r;
}
@@ -252,8 +250,8 @@ parse_syslog_console (const char *msg)
struct msg_t r;
/* The message in the form:
- openlog_ident: syslog_message 128 0 */
- int n = sscanf (msg, "%32s %64s %d %d",
+ mymachine openlog_ident PID - syslog_message 128 0 */
+ int n = sscanf (msg, "%*s %32s %*s - - %s %d %d",
r.ident, r.msg, &facility, &priority);
TEST_COMPARE (n, 4);
@@ -390,7 +388,7 @@ check_syslog_console_read (FILE *fp)
while (fgets (buf, sizeof (buf), fp) != NULL)
{
struct msg_t msg = parse_syslog_console (buf);
- TEST_COMPARE_STRING (msg.ident, OPENLOG_IDENT ":");
+ TEST_COMPARE_STRING (msg.ident, OPENLOG_IDENT);
TEST_COMPARE (msg.priority, priorities[msgnum]);
TEST_COMPARE (msg.facility, LOG_LOCAL0);