fix upid parser for long uptimes

diff --git a/data/PVE/Tools.pm b/data/PVE/Tools.pm
index 735cbdeda65eaac934437315d7ac6553c8b32354..922c0e6685d6773ff9210428bde34b4931069b83 100644 (file)
--- a/data/PVE/Tools.pm
+++ b/data/PVE/Tools.pm
@@ -765,6 +765,8 @@ sub df {
 sub upid_encode {
     my $d = shift;
 
 sub upid_encode {
     my $d = shift;
 

+    # Note: pstart can be > 32bit if uptime > 497 days, so this can result in
+    # more that 8 characters for pstart

     return sprintf("UPID:%s:%08X:%08X:%08X:%s:%s:%s:", $d->{node}, $d->{pid}, 
                   $d->{pstart}, $d->{starttime}, $d->{type}, $d->{id}, 
                   $d->{user});
     return sprintf("UPID:%s:%08X:%08X:%08X:%s:%s:%s:", $d->{node}, $d->{pid}, 
                   $d->{pstart}, $d->{starttime}, $d->{type}, $d->{id}, 
                   $d->{user});


@@ -777,7 +779,8 @@ sub upid_decode {
     my $filename;
 
     # "UPID:$node:$pid:$pstart:$startime:$dtype:$id:$user"
     my $filename;
 
     # "UPID:$node:$pid:$pstart:$startime:$dtype:$id:$user"

-    if ($upid =~ m/^UPID:([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/) {
+    # Note: allow up to 9 characters for pstart (work until 20 years uptime)
+    if ($upid =~ m/^UPID:([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8,9}):([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/) {

        $res->{node} = $1;
        $res->{pid} = hex($3);
        $res->{pstart} = hex($4);
        $res->{node} = $1;
        $res->{pid} = hex($3);
        $res->{pstart} = hex($4);

diff --git a/debian/changelog b/debian/changelog
index d79e52260f0ec994aa20eaa0af47bb0717b44598..a0ce308442b3a1d6e270a519cbda25462473c1c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libpve-common-perl (3.0-9) unstable; urgency=low
 
   * export regular expressions for IPv4 and IPv6 addresses
 libpve-common-perl (3.0-9) unstable; urgency=low
 
   * export regular expressions for IPv4 and IPv6 addresses

+  
+  * fix upid parser for long uptimes (> 497 days)

 
  -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Oct 2013 12:45:52 +0100
 
 
  -- Proxmox Support Team <support@proxmox.com>  Wed, 30 Oct 2013 12:45:52 +0100