From 3b6fe2bfb4d62326dc647f5dc4901621b2fcae03 Mon Sep 17 00:00:00 2001
From: Frank Carpenter <frank.carpenter@spectralink.com>
Date: Tue, 17 Jan 2017 13:21:56 -0700
Subject: Populate logcat year based on localtime

Change-Id: If7c790c25ed24da1b1442ee86e3a2f75bd3f8856
Reviewed-on: https://code.wireshark.org/review/19658
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 extcap/androiddump.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'extcap/androiddump.c')

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index ea7ec94242..09386a4169 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -2076,12 +2076,14 @@ static int capture_android_logcat_text(char *interface, char *fifo,
             time_t     seconds;
             time_t     secs = 0;
             int        nsecs = 0;
+            time_t     t;
 
             length = (gssize)(pos - packet) + 1;
 
+            t = time(NULL);
+            date = *localtime(&t);
             if (6 == sscanf(packet + exported_pdu_headers_size, "%d-%d %d:%d:%d.%d", &date.tm_mon, &date.tm_mday, &date.tm_hour,
                             &date.tm_min, &date.tm_sec, &ms)) {
-                date.tm_year = 70;
                 date.tm_mon -= 1;
                 seconds = mktime(&date);
                 secs = (time_t) seconds;
-- 
cgit v1.2.1