kes Enable Win32 plugin load code in lib.

kes  Make Verify code that computes disk checksums use the same
     algorithm as backup when dealing with sparse files.
kes  Attempt to run VSS on any systems newer than Vista -- should
     make it work on Windows Server 2008.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7580 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/verify.c b/bacula/src/filed/verify.c
index 6c3171f1204f1958b840b8b7b894f53c5a6b4694..54971ccdd98cddc97bf200708c3c55cf589efc4e 100644 (file)
--- a/bacula/src/filed/verify.c
+++ b/bacula/src/filed/verify.c
@@ -333,13 +333,32 @@ int digest_file(JCR *jcr, FF_PKT *ff_pkt, DIGEST *digest)
  * Read message digest of bfd, updating digest
  * In case of errors we need the job control record and file name.
  */
-int read_digest(BFILE *bfd, DIGEST *digest, JCR *jcr)
+static int read_digest(BFILE *bfd, DIGEST *digest, JCR *jcr)
 {
    char buf[DEFAULT_NETWORK_BUFFER_SIZE];
    int64_t n;
+   int64_t bufsiz = (int64_t)sizeof(buf);
+   FF_PKT *ff_pkt = (FF_PKT *)jcr->ff;
+   uint64_t fileAddr = 0;             /* file address */
+
 
    Dmsg0(50, "=== read_digest\n");
-   while ((n=bread(bfd, buf, sizeof(buf))) > 0) {
+   while ((n=bread(bfd, buf, bufsiz)) > 0) {
+      /* Check for sparse blocks */
+      if (ff_pkt->flags & FO_SPARSE) {
+         bool haveBlock = true;
+         if (n == bufsiz &&
+             fileAddr+n < (uint64_t)ff_pkt->statp.st_size ||
+             ((ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) &&
+               (uint64_t)ff_pkt->statp.st_size == 0)) {
+            haveBlock = !is_buf_zero(buf, bufsiz);
+         }
+         fileAddr += n;               /* update file address */
+         if (!haveBlock) {
+            continue;                 /* skip block of zeros */
+         }
+      }
+      
       crypto_digest_update(digest, (uint8_t *)buf, n);
       jcr->JobBytes += n;
       jcr->ReadBytes += n;

diff --git a/bacula/src/lib/plugins.c b/bacula/src/lib/plugins.c
index 786f9ea6825ec02cef1ba34623aeefedb9550919..1c60be7cf4cacb3fc5cd1766a5f0e3dfdb3a7774 100644 (file)
--- a/bacula/src/lib/plugins.c
+++ b/bacula/src/lib/plugins.c
@@ -58,7 +58,7 @@ Plugin *new_plugin()
 bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char *type)
 {
    bool found = false;
-#ifndef HAVE_WIN32
+//#ifndef HAVE_WIN32
    t_loadPlugin loadPlugin;
    Plugin *plugin;
    DIR* dp = NULL;
@@ -153,7 +153,7 @@ get_out:
    if (dp) {
       closedir(dp);
    }
-#endif
+//#endif
    return found;
 }
 
@@ -162,7 +162,7 @@ get_out:
  */
 void unload_plugins()
 {
-#ifndef HAVE_WIN32
+//#ifndef HAVE_WIN32
    Plugin *plugin;
 
    if (!plugin_list) {
@@ -179,5 +179,5 @@ void unload_plugins()
    }
    delete plugin_list;
    plugin_list = NULL;
-#endif
+//#endif
 }

diff --git a/bacula/src/lib/plugins.h b/bacula/src/lib/plugins.h
index ae60f8328da2d768f16cd3654c9ab675745e3348..be08be96595b666ff1b5721965196852831bcced 100644 (file)
--- a/bacula/src/lib/plugins.h
+++ b/bacula/src/lib/plugins.h
@@ -34,9 +34,7 @@
 #define __PLUGINS_H
 
 #include "bacula.h"
-#ifndef HAVE_WIN32
 #include <dlfcn.h>
-#endif
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #define NAMELEN(dirent) (strlen((dirent)->d_name))

diff --git a/bacula/src/win32/filed/vss.cpp b/bacula/src/win32/filed/vss.cpp
index fa8b1d9ddbd3bdc4f7e142b48f5f192689199edc..706565ae163dc140600ef7299cc794b27b137b4c 100644 (file)
--- a/bacula/src/win32/filed/vss.cpp
+++ b/bacula/src/win32/filed/vss.cpp
@@ -1,15 +1,7 @@
-
-// vss.cpp -- Interface to Volume Shadow Copies (VSS)
-//
-// Copyright transferred from MATRIX-Computer GmbH to
-//   Kern Sibbald by express permission.
-//
-// Author          : Thorsten Engel
-// Created On      : Fri May 06 21:44:00 2005
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2005-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2005-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -33,6 +25,13 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+// vss.cpp -- Interface to Volume Shadow Copies (VSS)
+//
+// Copyright transferred from MATRIX-Computer GmbH to
+//   Kern Sibbald by express permission.
+//
+// Author          : Thorsten Engel
+// Created On      : Fri May 06 21:44:00 2005
 
 
 #ifdef WIN32_VSS
@@ -74,9 +73,9 @@ void VSSInit()
          atexit(VSSCleanup);
          return;
       }
-   /* Vista or Longhorn */
-   } else if (g_MajorVersion == 6 && g_MinorVersion == 0) {
-      /* Probably will not work */
+   /* Vista or Longhorn or later */
+//       } else if (g_MajorVersion == 6 && g_MinorVersion == 0) {
+   } else if (g_MajorVersion >= 6) {
       g_pVSSClient = new VSSClientVista();
       atexit(VSSCleanup);
       return;

diff --git a/bacula/src/win32/filed/vss_generic.cpp b/bacula/src/win32/filed/vss_generic.cpp
index 48551836a2d72aa3505db786fc4557700dc930bd..bf7f12251d39374abce8ef76339a3a776ad75033 100644 (file)
--- a/bacula/src/win32/filed/vss_generic.cpp
+++ b/bacula/src/win32/filed/vss_generic.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2005-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2005-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 57aa818d42f85d8538883a7979996ee6610bf68a..4829148bcfafa01835528bfde8386dc50857b043 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -62,8 +62,13 @@ remove reader/writer in FOPTS????
 
 General:
 09Sep08
+kes  Enable Win32 plugin load code in lib.
+kes  Make Verify code that computes disk checksums use the same
+     algorithm as backup when dealing with sparse files.
+kes  Attempt to run VSS on any systems newer than Vista -- should
+     make it work on Windows Server 2008.
 ebl  Change the new statistic implementation. Remove the UseStatistic
-     directive and add a "update stats [days=...]" command. You can
+     directive and add a 'update stats [days=...]' command. You can
      now decide when copy job records from Job table to JobStat.
      Statistics are much more accurate with this.
 08Sep08
@@ -282,7 +287,7 @@ kes  Fix bug where SD did not ask operator if the device could not
 kes  Add dbuser to DIR conf file (replaces user).
 kes  Add --with-db-password to ./configure
 kes  Fix regress to handle db_password.
-ebl  Add new "status storage slots" that list autochanger
+ebl  Add new 'status storage slots' that list autochanger
      content.
 ebl  Update vtape driver to compile only under Linux.
 ebl  Fix a bug when restoring with a wrong mediatype.