Changeset 235

Timestamp:

09/30/13 03:39:55 (11 years ago)

Author:

atzm

Message:

parse syslog datetime

Location:

ksyslog/trunk

Files:

• ksyslog.c (modified) (3 diffs)
• ksyslog.h (modified) (2 diffs)

ksyslog/trunk/ksyslog.c

@@ -128 +128 @@
 {
         struct ksyslog_entry *entry;
-        unsigned int facility, severity;
-        unsigned char priority, *start;
+        unsigned int priority, facility, severity, month, day, hour, minute, second;
+        unsigned char *start, month_s[4];
+        struct tm tm;
         int length, i;
 
-        if (sscanf(skb->data, "<%3hhu>", &priority) != 1)
+        if (sscanf(skb->data, "<%3u>%3s %2u %2u:%2u:%2u ",
+                   &priority, month_s, &day, &hour, &minute, &second) != 6)
                 return ERR_PTR(-EINVAL);
 
@@ -146 +148 @@
                 return ERR_PTR(-EINVAL);
         if (severity >= __KSYSLOG_S_MAX)
+                return ERR_PTR(-EINVAL);
+
+        month = ksyslog_month_num(month_s);
+        if (!month)
+                return ERR_PTR(-EINVAL);
+        if (day > 31)
+                return ERR_PTR(-EINVAL);
+        if (hour > 23)
+                return ERR_PTR(-EINVAL);
+        if (minute > 59)
+                return ERR_PTR(-EINVAL);
+        if (second > 59)
                 return ERR_PTR(-EINVAL);
 
@@ -164 +178 @@
                 do_gettimeofday(&entry->tv);
 
+        time_to_tm(entry->tv.tv_sec, 0, &tm);
+        entry->time = mktime(tm.tm_year + 1900, month, day, hour, minute, second);
+
+        entry->priority = priority;
         entry->facility = facility;
         entry->severity = severity;

ksyslog/trunk/ksyslog.h

@@ -52 +52 @@
 struct ksyslog_entry {
         struct list_head list;
+        struct timeval tv;
 
-        struct timeval tv;
+        unsigned long time;
+        unsigned int priority;
         enum ksyslog_facility facility;
         enum ksyslog_severity severity;
@@ -123 +125 @@
 }
 
+static inline __u8
+ksyslog_month_num(const char *month)
+{
+        if (!memcmp(month, "Jan", 3))
+                return 1;
+        else if (!memcmp(month, "Feb", 3))
+                return 2;
+        else if (!memcmp(month, "Mar", 3))
+                return 3;
+        else if (!memcmp(month, "Apr", 3))
+                return 4;
+        else if (!memcmp(month, "May", 3))
+                return 5;
+        else if (!memcmp(month, "Jun", 3))
+                return 6;
+        else if (!memcmp(month, "Jul", 3))
+                return 7;
+        else if (!memcmp(month, "Aug", 3))
+                return 8;
+        else if (!memcmp(month, "Sep", 3))
+                return 9;
+        else if (!memcmp(month, "Oct", 3))
+                return 10;
+        else if (!memcmp(month, "Nov", 3))
+                return 11;
+        else if (!memcmp(month, "Dec", 3))
+                return 12;
+        else
+                return 0;
+}
+
 #endif