X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbscan.c;h=735ddc11c9d7768d396ec679976973afa2683bc9;hb=95a7bca090bf3430d82effe6f42db505c2b16cf0;hp=1e11d8560a0f2953472f791b918b5121832da02c;hpb=c59dfb7b6e9679b8a36dbfff74dbc98df41ebdda;p=bacula%2Fbacula diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c index 1e11d8560a..735ddc11c9 100644 --- a/bacula/src/stored/bscan.c +++ b/bacula/src/stored/bscan.c @@ -10,22 +10,17 @@ * Version $Id$ */ /* - Copyright (C) 2001-2004 Kern Sibbald and John Walker + Copyright (C) 2001-2006 Kern Sibbald This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License + version 2 as amended with additional clauses defined in the + file LICENSE in the main source directory. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ @@ -33,39 +28,33 @@ #include "stored.h" #include "findlib/find.h" #include "cats/cats.h" + +/* Dummy functions */ +int generate_daemon_event(JCR *jcr, const char *event) { return 1; } /* Forward referenced functions */ static void do_scan(void); -static int record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec); -static int create_file_attributes_record(B_DB *db, JCR *mjcr, - char *fname, char *lname, int type, - char *ap, DEV_RECORD *rec); +static bool record_cb(DCR *dcr, DEV_RECORD *rec); +static int create_file_attributes_record(B_DB *db, JCR *mjcr, + char *fname, char *lname, int type, + char *ap, DEV_RECORD *rec); static int create_media_record(B_DB *db, MEDIA_DBR *mr, VOLUME_LABEL *vl); -static int update_media_record(B_DB *db, MEDIA_DBR *mr); +static bool update_media_record(B_DB *db, MEDIA_DBR *mr); static int create_pool_record(B_DB *db, POOL_DBR *pr); static JCR *create_job_record(B_DB *db, JOB_DBR *mr, SESSION_LABEL *label, DEV_RECORD *rec); -static int update_job_record(B_DB *db, JOB_DBR *mr, SESSION_LABEL *elabel, - DEV_RECORD *rec); +static int update_job_record(B_DB *db, JOB_DBR *mr, SESSION_LABEL *elabel, + DEV_RECORD *rec); static int create_client_record(B_DB *db, CLIENT_DBR *cr); static int create_fileset_record(B_DB *db, FILESET_DBR *fsr); static int create_jobmedia_record(B_DB *db, JCR *jcr); static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId); -static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type); - - -/* Global variables */ -STORES *me; -#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32) -int win32_client = 1; -#else -int win32_client = 0; -#endif +static int update_digest_record(B_DB *db, char *digest, DEV_RECORD *rec, int type); /* Local variables */ static DEVICE *dev = NULL; static B_DB *db; -static JCR *bjcr; /* jcr for bscan */ +static JCR *bjcr; /* jcr for bscan */ static BSR *bsr = NULL; static MEDIA_DBR mr; static POOL_DBR pr; @@ -80,30 +69,37 @@ static ATTR *attr; static time_t lasttime = 0; -static char *db_name = "bacula"; -static char *db_user = "bacula"; -static char *db_password = ""; -static char *db_host = NULL; -static char *wd = NULL; -static int update_db = 0; -static int update_vol_info = 0; -static int list_records = 0; +static const char *db_name = "bacula"; +static const char *db_user = "bacula"; +static const char *db_password = ""; +static const char *db_host = NULL; +static const char *wd = NULL; +static bool update_db = false; +static bool update_vol_info = false; +static bool list_records = false; static int ignored_msgs = 0; +static uint64_t currentVolumeSize; +static int last_pct = -1; +static bool showProgress = false; static int num_jobs = 0; static int num_pools = 0; static int num_media = 0; static int num_files = 0; #define CONFIG_FILE "bacula-sd.conf" -char *configfile; -bool forge_on = false; +char *configfile = NULL; +STORES *me = NULL; /* our Global resource */ +bool forge_on = false; /* proceed inspite of I/O errors */ +pthread_mutex_t device_release_mutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t wait_device_release = PTHREAD_COND_INITIALIZER; static void usage() { fprintf(stderr, _( -"\nVersion: " VERSION " (" BDATE ")\n\n" +"Copyright (C) 2001-%s Kern Sibbald.\n" +"\nVersion: %s (%s)\n\n" "Usage: bscan [ options ] \n" " -b bootstrap specify a bootstrap file\n" " -c specify configuration file\n" @@ -116,10 +112,11 @@ static void usage() " -p proceed inspite of I/O errors\n" " -r list records\n" " -s synchronize or store in database\n" +" -S show scan progress periodically\n" " -v verbose\n" " -V specify Volume names (separated by |)\n" " -w specify working directory (default from conf file)\n" -" -? print this message\n\n")); +" -? print this message\n\n"), BYEAR, VERSION, BDATE); exit(1); } @@ -129,78 +126,85 @@ int main (int argc, char *argv[]) struct stat stat_buf; char *VolumeName = NULL; + setlocale(LC_ALL, ""); + bindtextdomain("bacula", LOCALEDIR); + textdomain("bacula"); + my_name_is(argc, argv, "bscan"); init_msg(NULL, NULL); - while ((ch = getopt(argc, argv, "b:c:d:h:mn:pP:rsu:vV:w:?")) != -1) { + while ((ch = getopt(argc, argv, "b:c:d:h:mn:pP:rsSu:vV:w:?")) != -1) { switch (ch) { + case 'S' : + showProgress = true; + break; case 'b': - bsr = parse_bsr(NULL, optarg); - break; + bsr = parse_bsr(NULL, optarg); + break; case 'c': /* specify config file */ - if (configfile != NULL) { - free(configfile); - } - configfile = bstrdup(optarg); - break; + if (configfile != NULL) { + free(configfile); + } + configfile = bstrdup(optarg); + break; case 'd': /* debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) - debug_level = 1; - break; + debug_level = atoi(optarg); + if (debug_level <= 0) + debug_level = 1; + break; case 'h': - db_host = optarg; - break; + db_host = optarg; + break; case 'm': - update_vol_info = 1; - break; + update_vol_info = true; + break; case 'n': - db_name = optarg; - break; + db_name = optarg; + break; case 'u': - db_user = optarg; - break; + db_user = optarg; + break; case 'P': - db_password = optarg; - break; + db_password = optarg; + break; case 'p': - forge_on = true; - break; + forge_on = true; + break; case 'r': - list_records = 1; - break; + list_records = true; + break; case 's': - update_db = 1; - break; + update_db = true; + break; case 'v': - verbose++; - break; + verbose++; + break; case 'V': /* Volume name */ - VolumeName = optarg; - break; + VolumeName = optarg; + break; case 'w': - wd = optarg; - break; + wd = optarg; + break; case '?': default: - usage(); + usage(); - } + } } argc -= optind; argv += optind; @@ -219,16 +223,16 @@ int main (int argc, char *argv[]) me = (STORES *)GetNextRes(R_STORAGE, NULL); if (!me) { UnlockRes(); - Emsg1(M_ERROR_TERM, 0, _("No Storage resource defined in %s. Cannot continue.\n"), - configfile); + Emsg1(M_ERROR_TERM, 0, _("No Storage resource defined in %s. Cannot continue.\n"), + configfile); } UnlockRes(); /* Check if -w option given, otherwise use resource for working directory */ - if (wd) { + if (wd) { working_directory = wd; } else if (!me->working_directory) { Emsg1(M_ERROR_TERM, 0, _("No Working Directory defined in %s. Cannot continue.\n"), - configfile); + configfile); } else { working_directory = me->working_directory; } @@ -236,20 +240,29 @@ int main (int argc, char *argv[]) /* Check that working directory is good */ if (stat(working_directory, &stat_buf) != 0) { Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s not found. Cannot continue.\n"), - working_directory); + working_directory); } if (!S_ISDIR(stat_buf.st_mode)) { Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"), - working_directory); + working_directory); } - bjcr = setup_jcr("bscan", argv[0], bsr, VolumeName); - dev = setup_to_access_device(bjcr, 1); /* read device */ - if (!dev) { + bjcr = setup_jcr("bscan", argv[0], bsr, VolumeName, 1); /* read device */ + if (!bjcr) { exit(1); } + dev = bjcr->read_dcr->dev; + if (showProgress) { + char ed1[50]; + struct stat sb; + fstat(dev->fd, &sb); + currentVolumeSize = sb.st_size; + Pmsg1(000, _("First Volume Size = %sn"), + edit_uint64(currentVolumeSize, ed1)); + } - if ((db=db_init_database(NULL, db_name, db_user, db_password, db_host, 0, NULL)) == NULL) { + if ((db=db_init_database(NULL, db_name, db_user, db_password, + db_host, 0, NULL, 0)) == NULL) { Emsg0(M_ERROR_TERM, 0, _("Could not init Bacula database\n")); } if (!db_open_database(NULL, db)) { @@ -261,49 +274,69 @@ int main (int argc, char *argv[]) } do_scan(); - printf("Records added to catalog:\n%7d Media\n%7d Pool\n%7d Job\n%7d File\n", - num_media, num_pools, num_jobs, num_files); + if (update_db) { + printf("Records added or updated in the catalog:\n%7d Media\n%7d Pool\n%7d Job\n%7d File\n", + num_media, num_pools, num_jobs, num_files); + } + else { + printf("Records would have been added or updated in the catalog:\n%7d Media\n%7d Pool\n%7d Job\n%7d File\n", + num_media, num_pools, num_jobs, num_files); + } free_jcr(bjcr); + dev->term(); return 0; } - -/* + +/* * We are at the end of reading a tape. Now, we simulate handling * the end of writing a tape by wiffling through the attached * jcrs creating jobmedia records. */ -static int bscan_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) +static bool bscan_mount_next_read_volume(DCR *dcr) { + DEVICE *dev = dcr->dev; + DCR *mdcr; Dmsg1(100, "Walk attached jcrs. Volume=%s\n", dev->VolCatInfo.VolCatName); - for (JCR *mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) { - DCR *dcr = mjcr->dcr; + foreach_dlist(mdcr, dev->attached_dcrs) { + JCR *mjcr = mdcr->jcr; + if (mjcr->JobId == 0) { + continue; + } if (verbose) { Pmsg1(000, _("Create JobMedia for Job %s\n"), mjcr->Job); } - if (dev->state & ST_TAPE) { - dcr->EndBlock = dev->EndBlock; - dcr->EndFile = dev->EndFile; - } else { - dcr->EndBlock = (uint32_t)dev->file_addr; - dcr->EndFile = (uint32_t)(dev->file_addr >> 32); + if (dev->is_tape()) { + mdcr->EndBlock = dcr->EndBlock; + mdcr->EndFile = dcr->EndFile; +// } else { +// mdcr->EndBlock = (uint32_t)dcr->file_addr; +// mdcr->EndFile = (uint32_t)(dcr->file_addr >> 32); } + mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex; if (!create_jobmedia_record(db, mjcr)) { Pmsg2(000, _("Could not create JobMedia record for Volume=%s Job=%s\n"), - dev->VolCatInfo.VolCatName, mjcr->Job); + dev->VolCatInfo.VolCatName, mjcr->Job); } - } + } /* Now let common read routine get up next tape. Note, * we call mount_next... with bscan's jcr because that is where we * have the Volume list, but we get attached. */ - int stat = mount_next_read_volume(jcr, dev, block); - /* we must once more detach ourselves (attached by mount_next ...) */ - detach_jcr_from_device(dev, jcr); /* detach bscan jcr */ + bool stat = mount_next_read_volume(dcr); + + if (showProgress) { + char ed1[50]; + struct stat sb; + fstat(dev->fd, &sb); + currentVolumeSize = sb.st_size; + Pmsg1(000, _("First Volume Size = %sn"), + edit_uint64(currentVolumeSize, ed1)); + } return stat; } -static void do_scan() +static void do_scan() { attr = new_attr(); @@ -315,277 +348,293 @@ static void do_scan() memset(&fr, 0, sizeof(fr)); /* Detach bscan's jcr as we are not a real Job on the tape */ - detach_jcr_from_device(dev, bjcr); - read_records(bjcr, dev, record_cb, bscan_mount_next_read_volume); - release_device(bjcr); + read_records(bjcr->read_dcr, record_cb, bscan_mount_next_read_volume); free_attr(attr); - term_dev(dev); } -static int record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec) +/* + * Returns: true if OK + * false if error + */ +static bool record_cb(DCR *dcr, DEV_RECORD *rec) { JCR *mjcr; - DCR *dcr; char ec1[30]; + DEVICE *dev = dcr->dev; + JCR *bjcr = dcr->jcr; + DEV_BLOCK *block = dcr->block; + char digest[BASE64_SIZE(CRYPTO_DIGEST_MAX_SIZE)]; if (rec->data_len > 0) { mr.VolBytes += rec->data_len + WRITE_RECHDR_LENGTH; /* Accumulate Volume bytes */ + if (showProgress && currentVolumeSize > 0) { + int pct = (mr.VolBytes * 100) / currentVolumeSize; + if (pct != last_pct) { + fprintf(stdout, _("done: %d%%\n"), pct); + fflush(stdout); + last_pct = pct; + } + } } + if (list_records) { Pmsg5(000, _("Record: SessId=%u SessTim=%u FileIndex=%d Stream=%d len=%u\n"), - rec->VolSessionId, rec->VolSessionTime, rec->FileIndex, - rec->Stream, rec->data_len); + rec->VolSessionId, rec->VolSessionTime, rec->FileIndex, + rec->Stream, rec->data_len); } - /* - * Check for Start or End of Session Record + /* + * Check for Start or End of Session Record * */ if (rec->FileIndex < 0) { - int save_update_db = update_db; + bool save_update_db = update_db; if (verbose > 1) { - dump_label_record(dev, rec, 1); + dump_label_record(dev, rec, 1); } switch (rec->FileIndex) { case PRE_LABEL: Pmsg0(000, _("Volume is prelabeled. This tape cannot be scanned.\n")); - return 1; - break; + return false; + break; case VOL_LABEL: - unser_volume_label(dev, rec); - /* Check Pool info */ - bstrncpy(pr.Name, dev->VolHdr.PoolName, sizeof(pr.Name)); - bstrncpy(pr.PoolType, dev->VolHdr.PoolType, sizeof(pr.PoolType)); - num_pools++; - if (db_get_pool_record(bjcr, db, &pr)) { - if (verbose) { + unser_volume_label(dev, rec); + /* Check Pool info */ + bstrncpy(pr.Name, dev->VolHdr.PoolName, sizeof(pr.Name)); + bstrncpy(pr.PoolType, dev->VolHdr.PoolType, sizeof(pr.PoolType)); + num_pools++; + if (db_get_pool_record(bjcr, db, &pr)) { + if (verbose) { Pmsg1(000, _("Pool record for %s found in DB.\n"), pr.Name); - } - } else { - if (!update_db) { + } + } else { + if (!update_db) { Pmsg1(000, _("VOL_LABEL: Pool record not found for Pool: %s\n"), - pr.Name); - } - create_pool_record(db, &pr); - } - if (strcmp(pr.PoolType, dev->VolHdr.PoolType) != 0) { + pr.Name); + } + create_pool_record(db, &pr); + } + if (strcmp(pr.PoolType, dev->VolHdr.PoolType) != 0) { Pmsg2(000, _("VOL_LABEL: PoolType mismatch. DB=%s Vol=%s\n"), - pr.PoolType, dev->VolHdr.PoolType); - return 1; - } else if (verbose) { + pr.PoolType, dev->VolHdr.PoolType); + return true; + } else if (verbose) { Pmsg1(000, _("Pool type \"%s\" is OK.\n"), pr.PoolType); - } - - /* Check Media Info */ - memset(&mr, 0, sizeof(mr)); - bstrncpy(mr.VolumeName, dev->VolHdr.VolName, sizeof(mr.VolumeName)); - mr.PoolId = pr.PoolId; - num_media++; - if (db_get_media_record(bjcr, db, &mr)) { - if (verbose) { + } + + /* Check Media Info */ + memset(&mr, 0, sizeof(mr)); + bstrncpy(mr.VolumeName, dev->VolHdr.VolumeName, sizeof(mr.VolumeName)); + mr.PoolId = pr.PoolId; + num_media++; + if (db_get_media_record(bjcr, db, &mr)) { + if (verbose) { Pmsg1(000, _("Media record for %s found in DB.\n"), mr.VolumeName); - } - /* Clear out some volume statistics that will be updated */ - mr.VolJobs = mr.VolFiles = mr.VolBlocks = 0; - mr.VolBytes = rec->data_len + 20; - } else { - if (!update_db) { + } + /* Clear out some volume statistics that will be updated */ + mr.VolJobs = mr.VolFiles = mr.VolBlocks = 0; + mr.VolBytes = rec->data_len + 20; + } else { + if (!update_db) { Pmsg1(000, _("VOL_LABEL: Media record not found for Volume: %s\n"), - mr.VolumeName); - } - bstrncpy(mr.MediaType, dev->VolHdr.MediaType, sizeof(mr.MediaType)); - create_media_record(db, &mr, &dev->VolHdr); - } - if (strcmp(mr.MediaType, dev->VolHdr.MediaType) != 0) { + mr.VolumeName); + } + bstrncpy(mr.MediaType, dev->VolHdr.MediaType, sizeof(mr.MediaType)); + create_media_record(db, &mr, &dev->VolHdr); + } + if (strcmp(mr.MediaType, dev->VolHdr.MediaType) != 0) { Pmsg2(000, _("VOL_LABEL: MediaType mismatch. DB=%s Vol=%s\n"), - mr.MediaType, dev->VolHdr.MediaType); - return 1; - } else if (verbose) { + mr.MediaType, dev->VolHdr.MediaType); + return true; /* ignore error */ + } else if (verbose) { Pmsg1(000, _("Media type \"%s\" is OK.\n"), mr.MediaType); - } - /* Reset some JCR variables */ - for (mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) { - dcr = mjcr->dcr; - dcr->VolFirstIndex = dcr->FileIndex = 0; - dcr->StartBlock = dcr->EndBlock = 0; - dcr->StartFile = dcr->EndFile = 0; - } + } + /* Reset some DCR variables */ + foreach_dlist(dcr, dev->attached_dcrs) { + dcr->VolFirstIndex = dcr->FileIndex = 0; + dcr->StartBlock = dcr->EndBlock = 0; + dcr->StartFile = dcr->EndFile = 0; + } Pmsg1(000, _("VOL_LABEL: OK for Volume: %s\n"), mr.VolumeName); - break; + break; case SOS_LABEL: - mr.VolJobs++; - num_jobs++; - if (ignored_msgs > 0) { - Pmsg1(000, _("%d \"errors\" ignored before first Start of Session record.\n"), - ignored_msgs); - ignored_msgs = 0; - } - unser_session_label(&label, rec); - memset(&jr, 0, sizeof(jr)); - jr.JobId = label.JobId; - if (db_get_job_record(bjcr, db, &jr)) { - /* Job record already exists in DB */ - update_db = 0; /* don't change db in create_job_record */ - if (verbose) { + mr.VolJobs++; + num_jobs++; + if (ignored_msgs > 0) { + Pmsg1(000, _("%d \"errors\" ignored before first Start of Session record.\n"), + ignored_msgs); + ignored_msgs = 0; + } + unser_session_label(&label, rec); + memset(&jr, 0, sizeof(jr)); + bstrncpy(jr.Job, label.Job, sizeof(jr.Job)); + if (db_get_job_record(bjcr, db, &jr)) { + /* Job record already exists in DB */ + update_db = false; /* don't change db in create_job_record */ + if (verbose) { Pmsg1(000, _("SOS_LABEL: Found Job record for JobId: %d\n"), jr.JobId); - } - } else { - /* Must create a Job record in DB */ - if (!update_db) { + } + } else { + /* Must create a Job record in DB */ + if (!update_db) { Pmsg1(000, _("SOS_LABEL: Job record not found for JobId: %d\n"), - jr.JobId); - } - } - /* Create Client record if not already there */ - bstrncpy(cr.Name, label.ClientName, sizeof(cr.Name)); - create_client_record(db, &cr); - jr.ClientId = cr.ClientId; + jr.JobId); + } + } + /* Create Client record if not already there */ + bstrncpy(cr.Name, label.ClientName, sizeof(cr.Name)); + create_client_record(db, &cr); + jr.ClientId = cr.ClientId; /* process label, if Job record exists don't update db */ - mjcr = create_job_record(db, &jr, &label, rec); - dcr = mjcr->dcr; - update_db = save_update_db; - - jr.PoolId = pr.PoolId; - /* Set start positions into JCR */ - if (dev->state & ST_TAPE) { - /* - * Note, we have already advanced past current block, - * so the correct number is block_num - 1 - */ - dcr->StartBlock = dev->block_num - 1; - dcr->StartFile = dev->file; - } else { - dcr->StartBlock = (uint32_t)dev->file_addr; - dcr->StartFile = (uint32_t)(dev->file_addr >> 32); - } - mjcr->start_time = jr.StartTime; - mjcr->JobLevel = jr.Level; - - mjcr->client_name = get_pool_memory(PM_FNAME); - pm_strcpy(&mjcr->client_name, label.ClientName); - mjcr->pool_type = get_pool_memory(PM_FNAME); - pm_strcpy(&mjcr->pool_type, label.PoolType); - mjcr->fileset_name = get_pool_memory(PM_FNAME); - pm_strcpy(&mjcr->fileset_name, label.FileSetName); - mjcr->pool_name = get_pool_memory(PM_FNAME); - pm_strcpy(&mjcr->pool_name, label.PoolName); - - if (rec->VolSessionId != jr.VolSessionId) { + mjcr = create_job_record(db, &jr, &label, rec); + dcr = mjcr->read_dcr; + update_db = save_update_db; + + jr.PoolId = pr.PoolId; +#ifdef xxx + /* Set start positions into JCR */ + if (dev->is_tape()) { + /* + * Note, we have already advanced past current block, + * so the correct number is block_num - 1 + */ + dcr->StartBlock = dev->block_num - 1; + dcr->StartFile = dev->file; + } else { + dcr->StartBlock = (uint32_t)dev->file_addr; + dcr->StartFile = (uint32_t)(dev->file_addr >> 32); + } +#endif + mjcr->start_time = jr.StartTime; + mjcr->JobLevel = jr.JobLevel; + + mjcr->client_name = get_pool_memory(PM_FNAME); + pm_strcpy(mjcr->client_name, label.ClientName); + mjcr->fileset_name = get_pool_memory(PM_FNAME); + pm_strcpy(mjcr->fileset_name, label.FileSetName); + bstrncpy(dcr->pool_type, label.PoolType, sizeof(dcr->pool_type)); + bstrncpy(dcr->pool_name, label.PoolName, sizeof(dcr->pool_name)); + + if (rec->VolSessionId != jr.VolSessionId) { Pmsg3(000, _("SOS_LABEL: VolSessId mismatch for JobId=%u. DB=%d Vol=%d\n"), - jr.JobId, - jr.VolSessionId, rec->VolSessionId); - return 1; - } - if (rec->VolSessionTime != jr.VolSessionTime) { + jr.JobId, + jr.VolSessionId, rec->VolSessionId); + return true; /* ignore error */ + } + if (rec->VolSessionTime != jr.VolSessionTime) { Pmsg3(000, _("SOS_LABEL: VolSessTime mismatch for JobId=%u. DB=%d Vol=%d\n"), - jr.JobId, - jr.VolSessionTime, rec->VolSessionTime); - return 1; - } - if (jr.PoolId != pr.PoolId) { + jr.JobId, + jr.VolSessionTime, rec->VolSessionTime); + return true; /* ignore error */ + } + if (jr.PoolId != pr.PoolId) { Pmsg3(000, _("SOS_LABEL: PoolId mismatch for JobId=%u. DB=%d Vol=%d\n"), - jr.JobId, - jr.PoolId, pr.PoolId); - return 1; - } - break; + jr.JobId, + jr.PoolId, pr.PoolId); + return true; /* ignore error */ + } + break; case EOS_LABEL: - unser_session_label(&elabel, rec); + unser_session_label(&elabel, rec); - /* Create FileSet record */ - bstrncpy(fsr.FileSet, label.FileSetName, sizeof(fsr.FileSet)); - bstrncpy(fsr.MD5, label.FileSetMD5, sizeof(fsr.MD5)); - create_fileset_record(db, &fsr); - jr.FileSetId = fsr.FileSetId; + /* Create FileSet record */ + bstrncpy(fsr.FileSet, label.FileSetName, sizeof(fsr.FileSet)); + bstrncpy(fsr.MD5, label.FileSetMD5, sizeof(fsr.MD5)); + create_fileset_record(db, &fsr); + jr.FileSetId = fsr.FileSetId; - mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime); - if (!mjcr) { + mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime); + if (!mjcr) { Pmsg2(000, _("Could not find SessId=%d SessTime=%d for EOS record.\n"), - rec->VolSessionId, rec->VolSessionTime); - break; - } + rec->VolSessionId, rec->VolSessionTime); + break; + } - /* Do the final update to the Job record */ - update_job_record(db, &jr, &elabel, rec); + /* Do the final update to the Job record */ + update_job_record(db, &jr, &elabel, rec); - mjcr->end_time = jr.EndTime; - mjcr->JobStatus = JS_Terminated; + mjcr->end_time = jr.EndTime; + mjcr->JobStatus = JS_Terminated; - /* Create JobMedia record */ - create_jobmedia_record(db, mjcr); - detach_jcr_from_device(dev, mjcr); - free_jcr(mjcr); + /* Create JobMedia record */ + mjcr->read_dcr->VolLastIndex = dcr->VolLastIndex; + create_jobmedia_record(db, mjcr); + dev->attached_dcrs->remove(mjcr->read_dcr); + free_jcr(mjcr); - break; + break; case EOM_LABEL: - break; - - case EOT_LABEL: /* end of all tapes */ - /* - * Wiffle through all jobs still open and close - * them. - */ - if (update_db) { - mjcr=next_attached_jcr(dev, NULL); - for ( ; mjcr; ) { - JCR *njcr; - jr.JobId = mjcr->JobId; - jr.JobStatus = JS_ErrorTerminated; - jr.JobFiles = mjcr->JobFiles; - jr.JobBytes = mjcr->JobBytes; - jr.VolSessionId = mjcr->VolSessionId; - jr.VolSessionTime = mjcr->VolSessionTime; - jr.JobTDate = (utime_t)mjcr->start_time; - jr.ClientId = mjcr->ClientId; - if (!db_update_job_end_record(bjcr, db, &jr)) { + break; + + case EOT_LABEL: /* end of all tapes */ + /* + * Wiffle through all jobs still open and close + * them. + */ + if (update_db) { + DCR *mdcr; + foreach_dlist(mdcr, dev->attached_dcrs) { + JCR *mjcr = mdcr->jcr; + if (!mjcr || mjcr->JobId == 0) { + continue; + } + jr.JobId = mjcr->JobId; + /* Mark Job as Error Terimined */ + jr.JobStatus = JS_ErrorTerminated; + jr.JobFiles = mjcr->JobFiles; + jr.JobBytes = mjcr->JobBytes; + jr.VolSessionId = mjcr->VolSessionId; + jr.VolSessionTime = mjcr->VolSessionTime; + jr.JobTDate = (utime_t)mjcr->start_time; + jr.ClientId = mjcr->ClientId; + if (!db_update_job_end_record(bjcr, db, &jr)) { Pmsg1(0, _("Could not update job record. ERR=%s\n"), db_strerror(db)); - } - njcr = mjcr->next_dev; - free_jcr(mjcr); - mjcr = njcr; - } - } - mr.VolFiles = rec->File; - mr.VolBlocks = rec->Block; - mr.VolBytes += mr.VolBlocks * WRITE_BLKHDR_LENGTH; /* approx. */ - mr.VolMounts++; - update_media_record(db, &mr); + } + mjcr->read_dcr = NULL; + free_jcr(mjcr); + } + } + mr.VolFiles = rec->File; + mr.VolBlocks = rec->Block; + mr.VolBytes += mr.VolBlocks * WRITE_BLKHDR_LENGTH; /* approx. */ + mr.VolMounts++; + update_media_record(db, &mr); Pmsg3(0, _("End of all Volumes. VolFiles=%u VolBlocks=%u VolBytes=%s\n"), mr.VolFiles, - mr.VolBlocks, edit_uint64_with_commas(mr.VolBytes, ec1)); - break; + mr.VolBlocks, edit_uint64_with_commas(mr.VolBytes, ec1)); + break; default: - break; + break; } /* end switch */ - return 1; + return true; } mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime); if (!mjcr) { if (mr.VolJobs > 0) { Pmsg2(000, _("Could not find Job for SessId=%d SessTime=%d record.\n"), - rec->VolSessionId, rec->VolSessionTime); + rec->VolSessionId, rec->VolSessionTime); } else { - ignored_msgs++; + ignored_msgs++; } - return 1; + return true; } - dcr = mjcr->dcr; + dcr = mjcr->read_dcr; if (dcr->VolFirstIndex == 0) { dcr->VolFirstIndex = block->FirstIndex; } /* File Attributes stream */ switch (rec->Stream) { - case STREAM_UNIX_ATTRIBUTES: - case STREAM_UNIX_ATTRIBUTES_EX: + case STREAM_UNIX_ATTRIBUTES: + case STREAM_UNIX_ATTRIBUTES_EX: if (!unpack_attributes_record(bjcr, rec->Stream, rec->data, attr)) { Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n")); @@ -593,25 +642,27 @@ static int record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec) if (attr->file_index != rec->FileIndex) { Emsg2(M_ERROR_TERM, 0, _("Record header file index %ld not equal record index %ld\n"), - rec->FileIndex, attr->file_index); + rec->FileIndex, attr->file_index); } - + if (verbose > 1) { - decode_stat(attr->attr, &attr->statp, &attr->LinkFI); - build_attr_output_fnames(bjcr, attr); - print_ls_output(bjcr, attr); + decode_stat(attr->attr, &attr->statp, &attr->LinkFI); + build_attr_output_fnames(bjcr, attr); + print_ls_output(bjcr, attr); } fr.JobId = mjcr->JobId; fr.FileId = 0; num_files++; - if (db_get_file_attributes_record(bjcr, db, attr->fname, NULL, &fr)) { - if (verbose > 1) { - Pmsg1(000, _("File record already exists for: %s\n"), attr->fname); - } - } else { - create_file_attributes_record(db, mjcr, attr->fname, attr->lname, - attr->type, attr->attr, rec); + if (verbose && (num_files & 0x7FFF) == 0) { + char ed1[30], ed2[30], ed3[30], ed4[30]; + Pmsg4(000, _("%s file records. At file:blk=%s:%s bytes=%s\n"), + edit_uint64_with_commas(num_files, ed1), + edit_uint64_with_commas(rec->File, ed2), + edit_uint64_with_commas(rec->Block, ed3), + edit_uint64_with_commas(mr.VolBytes, ed4)); } + create_file_attributes_record(db, mjcr, attr->fname, attr->lname, + attr->type, attr->attr, rec); free_jcr(mjcr); break; @@ -619,48 +670,87 @@ static int record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec) case STREAM_WIN32_DATA: case STREAM_FILE_DATA: case STREAM_SPARSE_DATA: + case STREAM_ENCRYPTED_FILE_DATA: + case STREAM_ENCRYPTED_WIN32_DATA: + case STREAM_ENCRYPTED_MACOS_FORK_DATA: + /* + * For encrypted stream, this is an approximation. + * The data must be decrypted to know the correct length. + */ mjcr->JobBytes += rec->data_len; if (rec->Stream == STREAM_SPARSE_DATA) { - mjcr->JobBytes -= sizeof(uint64_t); + mjcr->JobBytes -= sizeof(uint64_t); } - - free_jcr(mjcr); /* done using JCR */ + + free_jcr(mjcr); /* done using JCR */ break; case STREAM_GZIP_DATA: - mjcr->JobBytes += rec->data_len; /* No correct, we should expand it */ - free_jcr(mjcr); /* done using JCR */ + case STREAM_ENCRYPTED_FILE_GZIP_DATA: + case STREAM_ENCRYPTED_WIN32_GZIP_DATA: + /* No correct, we should (decrypt and) expand it + done using JCR + */ + mjcr->JobBytes += rec->data_len; + free_jcr(mjcr); break; case STREAM_SPARSE_GZIP_DATA: mjcr->JobBytes += rec->data_len - sizeof(uint64_t); /* No correct, we should expand it */ - free_jcr(mjcr); /* done using JCR */ + free_jcr(mjcr); /* done using JCR */ break; /* Win32 GZIP stream */ case STREAM_WIN32_GZIP_DATA: mjcr->JobBytes += rec->data_len; - free_jcr(mjcr); /* done using JCR */ + free_jcr(mjcr); /* done using JCR */ + break; + + case STREAM_MD5_DIGEST: + bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_MD5_SIZE, true); + if (verbose > 1) { + Pmsg1(000, _("Got MD5 record: %s\n"), digest); + } + update_digest_record(db, digest, rec, CRYPTO_DIGEST_MD5); + break; + + case STREAM_SHA1_DIGEST: + bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_SHA1_SIZE, true); + if (verbose > 1) { + Pmsg1(000, _("Got SHA1 record: %s\n"), digest); + } + update_digest_record(db, digest, rec, CRYPTO_DIGEST_SHA1); + break; + + case STREAM_SHA256_DIGEST: + bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_SHA256_SIZE, true); + if (verbose > 1) { + Pmsg1(000, _("Got SHA256 record: %s\n"), digest); + } + update_digest_record(db, digest, rec, CRYPTO_DIGEST_SHA256); break; - case STREAM_MD5_SIGNATURE: - char MD5buf[50]; - bin_to_base64(MD5buf, (char *)rec->data, 16); /* encode 16 bytes */ + case STREAM_SHA512_DIGEST: + bin_to_base64(digest, sizeof(digest), (char *)rec->data, CRYPTO_DIGEST_SHA512_SIZE, true); if (verbose > 1) { - Pmsg1(000, _("Got MD5 record: %s\n"), MD5buf); + Pmsg1(000, _("Got SHA512 record: %s\n"), digest); } - update_SIG_record(db, MD5buf, rec, MD5_SIG); + update_digest_record(db, digest, rec, CRYPTO_DIGEST_SHA512); break; - case STREAM_SHA1_SIGNATURE: - char SIGbuf[50]; - bin_to_base64(SIGbuf, (char *)rec->data, 20); /* encode 20 bytes */ + case STREAM_ENCRYPTED_SESSION_DATA: + // TODO landonf: Investigate crypto support in bscan if (verbose > 1) { - Pmsg1(000, _("Got SHA1 record: %s\n"), SIGbuf); + Pmsg0(000, _("Got signed digest record\n")); } - update_SIG_record(db, SIGbuf, rec, SHA1_SIG); break; + case STREAM_SIGNED_DIGEST: + // TODO landonf: Investigate crypto support in bscan + if (verbose > 1) { + Pmsg0(000, _("Got signed digest record\n")); + } + break; case STREAM_PROGRAM_NAMES: if (verbose) { @@ -673,11 +763,17 @@ static int record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec) Pmsg0(000, _("Got Prog Data Stream record.\n")); } break; + + case STREAM_UNIX_ATTRIBUTES_ACCESS_ACL: /* Standard ACL attributes on UNIX */ + case STREAM_UNIX_ATTRIBUTES_DEFAULT_ACL: /* Default ACL attributes on UNIX */ + /* Ignore Unix attributes */ + break; + default: - Pmsg2(0, _("Unknown stream type!!! stream=%d data=%s\n"), rec->Stream, rec->data); + Pmsg2(0, _("Unknown stream type!!! stream=%d len=%i\n"), rec->Stream, rec->data_len); break; } - return 1; + return true; } /* @@ -687,7 +783,7 @@ static int record_cb(JCR *bjcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec) */ static void bscan_free_jcr(JCR *jcr) { - Dmsg0(200, "Start dird free_jcr\n"); + Dmsg0(200, "Start bscan free_jcr\n"); if (jcr->file_bsock) { Dmsg0(200, "Close File bsock\n"); @@ -704,7 +800,11 @@ static void bscan_free_jcr(JCR *jcr) free_dcr(jcr->dcr); jcr->dcr = NULL; } - Dmsg0(200, "End dird free_jcr\n"); + if (jcr->read_dcr) { + free_dcr(jcr->read_dcr); + jcr->read_dcr = NULL; + } + Dmsg0(200, "End bscan free_jcr\n"); } /* @@ -712,10 +812,10 @@ static void bscan_free_jcr(JCR *jcr) * record, and then create the attributes record. */ static int create_file_attributes_record(B_DB *db, JCR *mjcr, - char *fname, char *lname, int type, - char *ap, DEV_RECORD *rec) + char *fname, char *lname, int type, + char *ap, DEV_RECORD *rec) { - DCR *dcr = mjcr->dcr; + DCR *dcr = mjcr->read_dcr; ar.fname = fname; ar.link = lname; ar.ClientId = mjcr->ClientId; @@ -740,7 +840,7 @@ static int create_file_attributes_record(B_DB *db, JCR *mjcr, mjcr->FileId = ar.FileId; if (verbose > 1) { - Pmsg1(000, _("Created File record: %s\n"), fname); + Pmsg1(000, _("Created File record: %s\n"), fname); } return 1; } @@ -756,6 +856,7 @@ static int create_media_record(B_DB *db, MEDIA_DBR *mr, VOLUME_LABEL *vl) /* We mark Vols as Archive to keep them from being re-written */ bstrncpy(mr->VolStatus, "Archive", sizeof(mr->VolStatus)); mr->VolRetention = 365 * 3600 * 24; /* 1 year */ + mr->Enabled = 1; if (vl->VerNum >= 11) { mr->FirstWritten = btime_to_utime(vl->write_btime); mr->LabelDate = btime_to_utime(vl->label_btime); @@ -794,21 +895,21 @@ static int create_media_record(B_DB *db, MEDIA_DBR *mr, VOLUME_LABEL *vl) /* * Called at end of media to update it */ -static int update_media_record(B_DB *db, MEDIA_DBR *mr) +static bool update_media_record(B_DB *db, MEDIA_DBR *mr) { if (!update_db && !update_vol_info) { - return 1; + return true; } mr->LastWritten = lasttime; if (!db_update_media_record(bjcr, db, mr)) { Pmsg1(0, _("Could not update media record. ERR=%s\n"), db_strerror(db)); - return 0; + return false;; } if (verbose) { Pmsg1(000, _("Updated Media record at end of Volume: %s\n"), mr->VolumeName); } - return 1; + return true; } @@ -835,7 +936,7 @@ static int create_pool_record(B_DB *db, POOL_DBR *pr) /* - * Called from SOS to create a client for the current Job + * Called from SOS to create a client for the current Job */ static int create_client_record(B_DB *db, CLIENT_DBR *cr) { @@ -868,9 +969,9 @@ static int create_fileset_record(B_DB *db, FILESET_DBR *fsr) } } else { if (!db_create_fileset_record(bjcr, db, fsr)) { - Pmsg2(0, _("Could not create FileSet record \"%s\". ERR=%s\n"), - fsr->FileSet, db_strerror(db)); - return 0; + Pmsg2(0, _("Could not create FileSet record \"%s\". ERR=%s\n"), + fsr->FileSet, db_strerror(db)); + return 0; } if (verbose) { Pmsg1(000, _("Created FileSet record \"%s\"\n"), fsr->FileSet); @@ -884,16 +985,16 @@ static int create_fileset_record(B_DB *db, FILESET_DBR *fsr) * the Job record and to update it when the Job actually * begins running. */ -static JCR *create_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *label, - DEV_RECORD *rec) +static JCR *create_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *label, + DEV_RECORD *rec) { JCR *mjcr; struct date_time dt; struct tm tm; jr->JobId = label->JobId; - jr->Type = label->JobType; - jr->Level = label->JobLevel; + jr->JobType = label->JobType; + jr->JobLevel = label->JobLevel; jr->JobStatus = JS_Created; bstrncpy(jr->Name, label->JobName, sizeof(jr->Name)); bstrncpy(jr->Job, label->Job, sizeof(jr->Job)); @@ -929,18 +1030,18 @@ static JCR *create_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *label, Pmsg1(0, _("Could not update job start record. ERR=%s\n"), db_strerror(db)); return mjcr; } - Pmsg2(000, _("Created new JobId=%u record for original JobId=%u\n"), jr->JobId, - label->JobId); - mjcr->JobId = jr->JobId; /* set new JobId */ + Pmsg2(000, _("Created new JobId=%u record for original JobId=%u\n"), jr->JobId, + label->JobId); + mjcr->JobId = jr->JobId; /* set new JobId */ return mjcr; } -/* - * Simulate the database call that updates the Job +/* + * Simulate the database call that updates the Job * at Job termination time. */ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel, - DEV_RECORD *rec) + DEV_RECORD *rec) { struct date_time dt; struct tm tm; @@ -949,7 +1050,7 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel, mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime); if (!mjcr) { Pmsg2(000, _("Could not find SessId=%d SessTime=%d for EOS record.\n"), - rec->VolSessionId, rec->VolSessionTime); + rec->VolSessionId, rec->VolSessionTime); return 0; } if (elabel->VerNum >= 11) { @@ -977,17 +1078,18 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel, free_jcr(mjcr); return 1; } - + if (!db_update_job_end_record(bjcr, db, jr)) { Pmsg2(0, _("Could not update JobId=%u record. ERR=%s\n"), jr->JobId, db_strerror(db)); free_jcr(mjcr); return 0; } if (verbose) { - Pmsg1(000, _("Updated Job termination record for new JobId=%u\n"), jr->JobId); + Pmsg3(000, _("Updated Job termination record for JobId=%u Level=%s TermStat=%c\n"), + jr->JobId, job_level_to_str(mjcr->JobLevel), jr->JobStatus); } if (verbose > 1) { - char *term_msg; + const char *term_msg; static char term_code[70]; char sdt[50], edt[50]; char ec1[30], ec2[30], ec3[30]; @@ -995,49 +1097,49 @@ static int update_job_record(B_DB *db, JOB_DBR *jr, SESSION_LABEL *elabel, switch (mjcr->JobStatus) { case JS_Terminated: term_msg = _("Backup OK"); - break; + break; case JS_FatalError: case JS_ErrorTerminated: term_msg = _("*** Backup Error ***"); - break; + break; case JS_Canceled: term_msg = _("Backup Canceled"); - break; + break; default: - term_msg = term_code; + term_msg = term_code; sprintf(term_code, _("Job Termination code: %d"), mjcr->JobStatus); - break; + break; } bstrftime(sdt, sizeof(sdt), mjcr->start_time); bstrftime(edt, sizeof(edt), mjcr->end_time); - Pmsg14(000, _("%s\n\ -JobId: %d\n\ -Job: %s\n\ -FileSet: %s\n\ -Backup Level: %s\n\ -Client: %s\n\ -Start time: %s\n\ -End time: %s\n\ -Files Written: %s\n\ -Bytes Written: %s\n\ -Volume Session Id: %d\n\ -Volume Session Time: %d\n\ -Last Volume Bytes: %s\n\ -Termination: %s\n\n"), - edt, - mjcr->JobId, - mjcr->Job, - mjcr->fileset_name, - job_level_to_str(mjcr->JobLevel), - mjcr->client_name, - sdt, - edt, - edit_uint64_with_commas(mjcr->JobFiles, ec1), - edit_uint64_with_commas(mjcr->JobBytes, ec2), - mjcr->VolSessionId, - mjcr->VolSessionTime, - edit_uint64_with_commas(mr.VolBytes, ec3), - term_msg); + Pmsg14(000, _("%s\n" +"JobId: %d\n" +"Job: %s\n" +"FileSet: %s\n" +"Backup Level: %s\n" +"Client: %s\n" +"Start time: %s\n" +"End time: %s\n" +"Files Written: %s\n" +"Bytes Written: %s\n" +"Volume Session Id: %d\n" +"Volume Session Time: %d\n" +"Last Volume Bytes: %s\n" +"Termination: %s\n\n"), + edt, + mjcr->JobId, + mjcr->Job, + mjcr->fileset_name, + job_level_to_str(mjcr->JobLevel), + mjcr->client_name, + sdt, + edt, + edit_uint64_with_commas(mjcr->JobFiles, ec1), + edit_uint64_with_commas(mjcr->JobBytes, ec2), + mjcr->VolSessionId, + mjcr->VolSessionTime, + edit_uint64_with_commas(mr.VolBytes, ec3), + term_msg); } free_jcr(mjcr); return 1; @@ -1046,21 +1148,23 @@ Termination: %s\n\n"), static int create_jobmedia_record(B_DB *db, JCR *mjcr) { JOBMEDIA_DBR jmr; - DCR *dcr = mjcr->dcr; + DCR *dcr = mjcr->read_dcr; - if (dev->state & ST_TAPE) { + if (dev->is_tape()) { dcr->EndBlock = dev->EndBlock; dcr->EndFile = dev->EndFile; +#ifdef needed } else { dcr->EndBlock = (uint32_t)dev->file_addr; dcr->EndFile = (uint32_t)(dev->file_addr >> 32); - } +#endif + } memset(&jmr, 0, sizeof(jmr)); jmr.JobId = mjcr->JobId; jmr.MediaId = mr.MediaId; jmr.FirstIndex = dcr->VolFirstIndex; - jmr.LastIndex = dcr->FileIndex; + jmr.LastIndex = dcr->VolLastIndex; jmr.StartFile = dcr->StartFile; jmr.EndFile = dcr->EndFile; jmr.StartBlock = dcr->StartBlock; @@ -1076,16 +1180,16 @@ static int create_jobmedia_record(B_DB *db, JCR *mjcr) return 0; } if (verbose) { - Pmsg2(000, _("Created JobMedia record JobId %d, MediaId %d\n"), - jmr.JobId, jmr.MediaId); + Pmsg2(000, _("Created JobMedia record JobId %d, MediaId %d\n"), + jmr.JobId, jmr.MediaId); } return 1; } -/* +/* * Simulate the database call that updates the MD5/SHA1 record */ -static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type) +static int update_digest_record(B_DB *db, char *digest, DEV_RECORD *rec, int type) { JCR *mjcr; @@ -1093,19 +1197,19 @@ static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type) if (!mjcr) { if (mr.VolJobs > 0) { Pmsg2(000, _("Could not find SessId=%d SessTime=%d for MD5/SHA1 record.\n"), - rec->VolSessionId, rec->VolSessionTime); + rec->VolSessionId, rec->VolSessionTime); } else { - ignored_msgs++; + ignored_msgs++; } return 0; } - if (!update_db) { + if (!update_db || mjcr->FileId == 0) { free_jcr(mjcr); return 1; } - - if (!db_add_SIG_to_file_record(bjcr, db, mjcr->FileId, SIGbuf, type)) { + + if (!db_add_digest_to_file_record(bjcr, db, mjcr->FileId, digest, type)) { Pmsg1(0, _("Could not add MD5/SHA1 to File record. ERR=%s\n"), db_strerror(db)); free_jcr(mjcr); return 0; @@ -1118,7 +1222,7 @@ static int update_SIG_record(B_DB *db, char *SIGbuf, DEV_RECORD *rec, int type) } -/* +/* * Create a JCR as if we are really starting the job */ static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId) @@ -1126,11 +1230,11 @@ static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId) JCR *jobjcr; /* * Transfer as much as possible to the Job JCR. Most important is - * the JobId and the ClientId. + * the JobId and the ClientId. */ jobjcr = new_jcr(sizeof(JCR), bscan_free_jcr); - jobjcr->JobType = jr->Type; - jobjcr->JobLevel = jr->Level; + jobjcr->JobType = jr->JobType; + jobjcr->JobLevel = jr->JobLevel; jobjcr->JobStatus = jr->JobStatus; bstrncpy(jobjcr->Job, jr->Job, sizeof(jobjcr->Job)); jobjcr->JobId = JobId; /* this is JobId on tape */ @@ -1139,25 +1243,29 @@ static JCR *create_jcr(JOB_DBR *jr, DEV_RECORD *rec, uint32_t JobId) jobjcr->VolSessionId = rec->VolSessionId; jobjcr->VolSessionTime = rec->VolSessionTime; jobjcr->ClientId = jr->ClientId; - attach_jcr_to_device(dev, jobjcr); - new_dcr(jobjcr, dev); + jobjcr->read_dcr = new_dcr(jobjcr, dev); + return jobjcr; } /* Dummies to replace askdir.c */ -int dir_get_volume_info(JCR *jcr, enum get_vol_info_rw writing) { return 1;} -int dir_find_next_appendable_volume(JCR *jcr) { return 1;} -int dir_update_volume_info(JCR *jcr, DEVICE *dev, int relabel) { return 1; } -int dir_create_jobmedia_record(JCR *jcr) { return 1; } -int dir_ask_sysop_to_create_appendable_volume(JCR *jcr, DEVICE *dev) { return 1; } -int dir_update_file_attributes(JCR *jcr, DEV_RECORD *rec) { return 1;} -int dir_send_job_status(JCR *jcr) {return 1;} - - -int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev) +bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) { return 1;} +bool dir_find_next_appendable_volume(DCR *dcr) { return 1;} +bool dir_update_volume_info(DCR *dcr, bool relabel) { return 1; } +bool dir_create_jobmedia_record(DCR *dcr) { return 1; } +bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { return 1; } +bool dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;} +bool dir_send_job_status(JCR *jcr) {return 1;} +int generate_job_event(JCR *jcr, const char *event) { return 1; } + +bool dir_ask_sysop_to_mount_volume(DCR *dcr) { - fprintf(stderr, _("Mount Volume \"%s\" on device \"%s\" and press return when ready: "), - jcr->VolumeName, dev_name(dev)); - getchar(); - return 1; + DEVICE *dev = dcr->dev; + Dmsg0(20, "Enter dir_ask_sysop_to_mount_volume\n"); + /* Close device so user can use autochanger if desired */ + dev->close(); + fprintf(stderr, _("Mount Volume \"%s\" on device %s and press return when ready: "), + dcr->VolumeName, dev->print_name()); + getchar(); + return true; }