From d6232012756606936447ffa8e7d292042e694bdb Mon Sep 17 00:00:00 2001
From: Kei Tsuchiya <kei.tsuchiya86@gmail.com>
Date: Sat, 11 Jan 2020 04:11:34 +0900
Subject: [PATCH] fix TcpdumpParser.pm and embed into pt-query-digest and
 pt-upgrade

---
 bin/pt-query-digest  | 2 +-
 bin/pt-upgrade       | 1 +
 lib/TcpdumpParser.pm | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index e2ab087a..fedee99e 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -3666,7 +3666,7 @@ sub parse_event {
       $pos_in_log -= 1 if $pos_in_log;
 
       $raw_packet =~ s/\n20\Z//;
-      $raw_packet = "20$raw_packet" if $raw_packet =~ /\A20-\d\d-\d\d/; # workaround for 2020 problem
+      $raw_packet = "20$raw_packet" if $raw_packet =~ /\A20-\d\d-\d\d/; # workaround for year 2020 problem
       $raw_packet = "20$raw_packet" unless $raw_packet =~ m/\A20/;
 
       $raw_packet =~ s/0x0000:.+?(450.) /0x0000:  $1 /;
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 54388686..978bf463 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -7724,6 +7724,7 @@ sub parse_event {
       $pos_in_log -= 1 if $pos_in_log;
 
       $raw_packet =~ s/\n20\Z//;
+      $raw_packet = "20$raw_packet" if $raw_packet =~ /\A20-\d\d-\d\d/; # workaround for year 2020 problem
       $raw_packet = "20$raw_packet" unless $raw_packet =~ m/\A20/;
 
       $raw_packet =~ s/0x0000:.+?(450.) /0x0000:  $1 /;
diff --git a/lib/TcpdumpParser.pm b/lib/TcpdumpParser.pm
index 1c9a09ff..bcf0efd0 100644
--- a/lib/TcpdumpParser.pm
+++ b/lib/TcpdumpParser.pm
@@ -88,6 +88,7 @@ sub parse_event {
       # Remove the separator from the packet, and restore it to the front if
       # necessary.
       $raw_packet =~ s/\n20\Z//;
+      $raw_packet = "20$raw_packet" if $raw_packet =~ /\A20-\d\d-\d\d/; # workaround for year 2020 problem
       $raw_packet = "20$raw_packet" unless $raw_packet =~ m/\A20/;
 
       # Remove special headers (e.g. vlan) before the IPv4 header.