--- deliantra/Deliantra-Client/DC/Main.pm	2012/01/04 11:23:23	1.8
+++ deliantra/Deliantra-Client/DC/Main.pm	2012/01/05 05:37:02	1.9
@@ -20,6 +20,7 @@
 use common::sense;
 use Carp 'verbose';
 use Cwd ();
+use Digest::MD5 ();
 use EV;
 BEGIN { *time = \&EV::time }
 
@@ -529,15 +530,8 @@
 #############################################################################
 # Over-the-air updates
 
-sub ota_update_finish {
-   $MESSAGE_DIST->message ({ type => "ota_update", markup => $_[0] });
-}
-
-sub ota_update_status {
-}
-
 sub ota_update {
-   my ($face, $size) = @_;
+   my ($face, $size, $md5) = @_;
 
    my $coro = Coro::async_pool {
       my $override = "$Urlader::EXE_DIR/override";
@@ -553,7 +547,7 @@
       my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY | IO::AIO::O_CREAT | IO::AIO::O_TRUNC, 0777;
       
       unless ($fh) {
-         ota_update_finish "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!";
+         $MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") });
          return;
       }
 
@@ -563,7 +557,6 @@
       my $error;
 
       $cv->begin (Coro::rouse_cb);
-
       $CONN->ask_face (
          $face,
          -1000,
@@ -598,6 +591,29 @@
          return;
       }
 
+      {
+         $MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." });
+
+         my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
+
+         if ($fh) {
+            $error ||= Coro::AIO::aio_stat "$override.tmp";
+            $error ||= -s _ != $size;
+            $error ||= Coro::AIO::aio_readahead $fh, 0, $size;
+
+            my $f_md5 = new Digest::MD5;
+            $f_md5->addfile ($fh);
+            $f_md5 = $f_md5->hexdigest;
+            $error ||= $md5 ne $f_md5;
+         }
+      }
+
+      if ($error) {
+         $MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." });
+         Coro::AIO::aio_unlink "$override.tmp";
+         return;
+      }
+
       $MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." });
 
       if (Coro::AIO::aio_rename "$override.tmp", $override) {
@@ -605,7 +621,7 @@
          Coro::AIO::aio_unlink "$override.tmp";
       }
 
-      $MESSAGE_DIST->message ({ type => "ota_update", markup => "update successfull, changes become active at next start." });
+      $MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." });
    };
 
    $CONN->{ota_update} = Guard::guard {
@@ -614,15 +630,16 @@
 }
 
 sub ota_update_ask {
-   my ($ok, $face, $ver, $size, $changes) = @_;
+   my ($ok, $face, $ver, $size, $md5, $changes) = @_;
 
    $CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel
-      x      => "center",
-      y      => "center",
-      max_w  => $::WIDTH * 0.7,
-      max_h  => $::WIDTH * 0.7,
-      title  => "Software update available",
-      child  => my $vbox = new DC::UI::VBox,
+      x       => "center",
+      y       => "center",
+      z       => 55,
+      force_w => $::WIDTH  * 0.7,
+      force_h => $::HEIGHT * 0.7,
+      title   => "Software update available",
+      child   => my $vbox = new DC::UI::VBox,
    ;
 
    $vbox->add (new DC::UI::Label
@@ -633,13 +650,14 @@
 
    $vbox->add (new DC::UI::FancyFrame
       expand => 1,
-      label  => "Changes",
+      label  => "Details",
       child  => (new DC::UI::TextScroller
                     expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4,
                     par => [{
                        markup => "<tt>Old revision:  $Urlader::EXE_VER\n"
                                . "New revision:  $ver\n"
                                . "Download size: $size bytes</tt>\n\n"
+                               . "Changes:\n\n"
                                . DC::asxml $changes
                     }],
                 ),
@@ -660,7 +678,7 @@
       text => "Yes, start downloading",
       on_activate => sub {
          $dialog->destroy;
-         ota_update $face, $size;
+         ota_update $face, $size, $md5;
          0
       },
    );
@@ -674,7 +692,7 @@
    ::message { markup => "Checking for software update..." };
 
    $CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub {
-      my ($ok, $face, $ver, $size, $changes) = @_;
+      my ($ok, $face, $ver, $size, $md5, $changes) = @_;
 
       if ($ok) {
          if (defined $ver) {
@@ -2455,7 +2473,7 @@
       $QUIT_DIALOG = new DC::UI::Toplevel
          x     => "center",
          y     => "center",
-         z     => 50,
+         z     => 60,
          title => "Really Quit?",
          on_key_down => sub {
             my ($dialog, $ev) = @_;