23Sep04

- More doc.
- Pass EndFile and EndBlock to SD.

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

diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index 1cc8369a99e3cfa537ea4130acde6622d8d90982..cae33b8ea987cf87f0999b1eb20d407575ed2014 100644 (file)
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -59,7 +59,7 @@ static char OK_media[] = "1000 OK VolName=%s VolJobs=%u VolFiles=%u"
    " VolBlocks=%u VolBytes=%s VolMounts=%u VolErrors=%u VolWrites=%u"
    " MaxVolBytes=%s VolCapacityBytes=%s VolStatus=%s Slot=%d"
    " MaxVolJobs=%u MaxVolFiles=%u InChanger=%d VolReadTime=%s"
-   " VolWriteTime=%s\n";
+   " VolWriteTime=%s EndFile=%u EndBlock=%u\n";
 
 static char OK_create[] = "1000 OK CreateJobMedia\n";
 
@@ -80,7 +80,8 @@ static int send_volume_info_to_storage_daemon(JCR *jcr, BSOCK *sd, MEDIA_DBR *mr
       mr->VolStatus, mr->Slot, mr->MaxVolJobs, mr->MaxVolFiles,
       mr->InChanger,
       edit_uint64(mr->VolReadTime, ed4),
-      edit_uint64(mr->VolWriteTime, ed5));
+      edit_uint64(mr->VolWriteTime, ed5),
+      mr->EndFile, mr->EndBlock);
    unbash_spaces(mr->VolumeName);
    Dmsg2(200, "Vol Info for %s: %s", jcr->Job, sd->msg);
    return stat;

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 9efc7b098f072504a8915c8a867e00c05c20767b..0ac0833d8c39b6383716bb395e3d3eb8db7f02b2 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -48,7 +48,7 @@ static char OK_media[] = "1000 OK VolName=%127s VolJobs=%u VolFiles=%u"
    " VolBlocks=%u VolBytes=%" lld " VolMounts=%u VolErrors=%u VolWrites=%u"
    " MaxVolBytes=%" lld " VolCapacityBytes=%" lld " VolStatus=%20s"
    " Slot=%d MaxVolJobs=%u MaxVolFiles=%u InChanger=%d"
-   " VolReadTime=%" lld " VolWriteTime=%" lld;
+   " VolReadTime=%" lld " VolWriteTime=%" lld " EndFile=%u EndBlock=%u";
 
 
 static char OK_create[] = "1000 OK CreateJobMedia\n";
@@ -96,12 +96,14 @@ static bool do_get_volume_info(DCR *dcr)
               &vol.VolCatWrites, &vol.VolCatMaxBytes,
               &vol.VolCatCapacityBytes, vol.VolCatStatus,
               &vol.Slot, &vol.VolCatMaxJobs, &vol.VolCatMaxFiles,
-              &InChanger, &vol.VolReadTime, &vol.VolWriteTime);
-    if (n != 17) {
+              &InChanger, &vol.VolReadTime, &vol.VolWriteTime,
+              &vol.EndFile, &vol.EndBlock);
+    if (n != 19) {
        Dmsg2(100, "Bad response from Dir fields=%d: %s\n", n, dir->msg);
        Mmsg(jcr->errmsg, _("Error getting Volume info: %s\n"), dir->msg);
        return false;
     }
+    Dmsg2(000, "EndFile=%u EndBlock=%u\n", vol.EndFile, vol.EndBlock);
     vol.InChanger = InChanger;       /* bool in structure */
     unbash_spaces(vol.VolCatName);
     bstrncpy(dcr->VolumeName, vol.VolCatName, sizeof(dcr->VolumeName));

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 87aef8c1f87926340b1acdeeb2102fdc3a0277a3..b7d96d8836ec35b5746cdc64474cbfae829ce61d 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.5"
-#define BDATE   "22 September 2004"
-#define LSMDATE "22Sep04"
+#define BDATE   "23 September 2004"
+#define LSMDATE "23Sep04"
 
 /* Debug flags */
 #undef  DEBUG