*
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
*/
void do_verify(JCR *jcr)
{
- BSOCK *dir = jcr->dir_bsock;
-
- jcr->buf_size = MAX_NETWORK_BUFFER_SIZE;
+ set_jcr_job_status(jcr, JS_Running);
+ jcr->buf_size = DEFAULT_NETWORK_BUFFER_SIZE;
if ((jcr->big_buf = (char *) malloc(jcr->buf_size)) == NULL) {
- Emsg1(M_ABORT, 0, _("Cannot malloc %d network read buffer\n"), MAX_NETWORK_BUFFER_SIZE);
+ Jmsg1(jcr, M_ABORT, 0, _("Cannot malloc %d network read buffer\n"),
+ DEFAULT_NETWORK_BUFFER_SIZE);
}
- set_find_options(jcr->ff, jcr->incremental, jcr->mtime);
+ set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
Dmsg0(10, "Start find files\n");
/* Subroutine verify_file() is called for each file */
- find_files(jcr->ff, verify_file, (void *)jcr);
+ find_files(jcr, (FF_PKT *)jcr->ff, verify_file, (void *)jcr);
Dmsg0(10, "End find files\n");
- bnet_sig(dir, BNET_EOD); /* signal end of data */
-
if (jcr->big_buf) {
free(jcr->big_buf);
jcr->big_buf = NULL;
}
+ set_jcr_job_status(jcr, JS_Terminated);
}
/*
* Called here by find() for each file.
-
- *****FIXME***** add FSMs File System Modules
-
*
- * Find the file, compute the MD5 and send it back to the Director
+ * Find the file, compute the MD5 or SHA1 and send it back to the Director
*/
static int verify_file(FF_PKT *ff_pkt, void *pkt)
{
char attribs[MAXSTRING];
- int32_t n;
- int fid, stat, len;
+ int64_t n;
+ int stat;
+ BFILE bfd;
struct MD5Context md5c;
- unsigned char signature[16];
+ struct SHA1Context sha1c;
+ unsigned char signature[25]; /* large enough for either */
BSOCK *dir;
JCR *jcr = (JCR *)pkt;
- if (job_cancelled(jcr)) {
+ if (job_canceled(jcr)) {
return 0;
}
case FT_LNK:
Dmsg2(30, "FT_LNK saving: %s -> %s\n", ff_pkt->fname, ff_pkt->link);
break;
- case FT_DIR:
+ case FT_DIRBEGIN:
+ return 1; /* ignored */
+ case FT_DIREND:
Dmsg1(30, "FT_DIR saving: %s\n", ff_pkt->fname);
break;
case FT_SPEC:
Dmsg1(30, "FT_SPEC saving: %s\n", ff_pkt->fname);
break;
+ case FT_RAW:
+ Dmsg1(30, "FT_RAW saving: %s\n", ff_pkt->fname);
+ break;
+ case FT_FIFO:
+ Dmsg1(30, "FT_FIFO saving: %s\n", ff_pkt->fname);
+ break;
case FT_NOACCESS:
Jmsg(jcr, M_NOTSAVED, -1, _(" Could not access %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
case FT_NOFOLLOW:
Jmsg(jcr, M_NOTSAVED, -1, _(" Could not follow link %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
case FT_NOSTAT:
- Jmsg(jcr, M_NOTSAVED, -1, _(" Could not stat %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ Jmsg(jcr, M_NOTSAVED, -1, _(" Could not stat %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
case FT_DIRNOCHG:
case FT_NOCHG:
- Jmsg(jcr, M_INFO, -1, _(" Unchanged file skipped: %s\n"), ff_pkt->fname);
+ Jmsg(jcr, M_SKIPPED, -1, _(" Unchanged file skipped: %s\n"), ff_pkt->fname);
return 1;
case FT_ISARCH:
Jmsg(jcr, M_SKIPPED, -1, _(" Archive file skipped: %s\n"), ff_pkt->fname);
return 1;
case FT_NOOPEN:
Jmsg(jcr, M_NOTSAVED, -1, _(" Could not open directory %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ jcr->Errors++;
return 1;
default:
Jmsg(jcr, M_NOTSAVED, 0, _(" Unknown file type %d: %s\n"), ff_pkt->type, ff_pkt->fname);
+ jcr->Errors++;
return 1;
}
+ binit(&bfd);
- if (ff_pkt->type != FT_LNKSAVED && S_ISREG(ff_pkt->statp.st_mode) &&
- ff_pkt->statp.st_size > 0) {
- if ((fid = open(ff_pkt->fname, O_RDONLY | O_BINARY)) < 0) {
+ if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) &&
+ ff_pkt->statp.st_size > 0) ||
+ ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) {
+ if ((bopen(&bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0)) < 0) {
ff_pkt->ff_errno = errno;
- Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open %s: ERR=%s.\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open %s: ERR=%s.\n"),
+ ff_pkt->fname, berror(&bfd));
+ jcr->Errors++;
return 1;
}
- } else {
- fid = -1;
}
- encode_stat(attribs, &ff_pkt->statp);
+ encode_stat(attribs, ff_pkt, 0);
+ P(jcr->mutex);
jcr->JobFiles++; /* increment number of files sent */
- len = strlen(ff_pkt->fname);
- jcr->last_fname = check_pool_memory_size(jcr->last_fname, len + 1);
- jcr->last_fname[len] = 0; /* terminate properly before copy */
- strcpy(jcr->last_fname, ff_pkt->fname);
-
- if (ff_pkt->VerifyOpts[0] == 0) {
- ff_pkt->VerifyOpts[0] = 'V';
- ff_pkt->VerifyOpts[1] = 0;
- }
-
+ pm_strcpy(&jcr->last_fname, ff_pkt->fname);
+ V(jcr->mutex);
/*
* Send file attributes to Director
stat = bnet_fsend(dir, "%d %d %s %s%c%s%c%s%c", jcr->JobFiles,
STREAM_UNIX_ATTRIBUTES, ff_pkt->VerifyOpts, ff_pkt->fname,
0, attribs, 0, ff_pkt->link, 0);
+ } else if (ff_pkt->type == FT_DIREND) {
+ /* Here link is the canonical filename (i.e. with trailing slash) */
+ stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", jcr->JobFiles,
+ STREAM_UNIX_ATTRIBUTES, ff_pkt->VerifyOpts, ff_pkt->link,
+ 0, attribs, 0, 0);
} else {
stat = bnet_fsend(dir,"%d %d %s %s%c%s%c%c", jcr->JobFiles,
STREAM_UNIX_ATTRIBUTES, ff_pkt->VerifyOpts, ff_pkt->fname,
}
Dmsg2(20, "bfiled>bdird: attribs len=%d: msg=%s\n", dir->msglen, dir->msg);
if (!stat) {
- Jmsg(jcr, M_ERROR, 0, _("Network error in send to Director: ERR=%s\n"), bnet_strerror(dir));
- if (fid >= 0) {
- close(fid);
+ Jmsg(jcr, M_FATAL, 0, _("Network error in send to Director: ERR=%s\n"), bnet_strerror(dir));
+ if (is_bopen(&bfd)) {
+ bclose(&bfd);
}
return 0;
}
- /* If file opened, compute MD5 */
- if (fid >= 0 && ff_pkt->flags & FO_MD5) {
- char MD5buf[50]; /* 24 should do */
-
+ /* If file opened, compute MD5 or SHA1 hash */
+ if (is_bopen(&bfd) && ff_pkt->flags & FO_MD5) {
+ char MD5buf[40]; /* 24 should do */
MD5Init(&md5c);
-
- while ((n=read(fid, jcr->big_buf, jcr->buf_size)) > 0) {
- MD5Update(&md5c, ((unsigned char *) jcr->big_buf), n);
+ while ((n=bread(&bfd, jcr->big_buf, jcr->buf_size)) > 0) {
+ MD5Update(&md5c, ((unsigned char *)jcr->big_buf), (int)n);
jcr->JobBytes += n;
+ jcr->ReadBytes += n;
}
if (n < 0) {
- Jmsg(jcr, M_WARNING, -1, _(" Error reading file %s: ERR=%s\n"), ff_pkt->fname, strerror(ff_pkt->ff_errno));
+ Jmsg(jcr, M_ERROR, -1, _("Error reading file %s: ERR=%s\n"),
+ ff_pkt->fname, berror(&bfd));
+ jcr->Errors++;
}
-
MD5Final(signature, &md5c);
bin_to_base64(MD5buf, (char *)signature, 16); /* encode 16 bytes */
bnet_fsend(dir, "%d %d %s *MD5-%d*", jcr->JobFiles, STREAM_MD5_SIGNATURE, MD5buf,
jcr->JobFiles);
Dmsg2(20, "bfiled>bdird: MD5 len=%d: msg=%s\n", dir->msglen, dir->msg);
+ } else if (is_bopen(&bfd) && ff_pkt->flags & FO_SHA1) {
+ char SHA1buf[40]; /* 24 should do */
+ SHA1Init(&sha1c);
+ while ((n=bread(&bfd, jcr->big_buf, jcr->buf_size)) > 0) {
+ SHA1Update(&sha1c, ((unsigned char *)jcr->big_buf), (int)n);
+ jcr->JobBytes += n;
+ jcr->ReadBytes += n;
+ }
+ if (n < 0) {
+ Jmsg(jcr, M_ERROR, -1, _("Error reading file %s: ERR=%s\n"),
+ ff_pkt->fname, berror(&bfd));
+ jcr->Errors++;
+ }
+ SHA1Final(&sha1c, signature);
+
+ bin_to_base64(SHA1buf, (char *)signature, 20); /* encode 20 bytes */
+ Dmsg2(400, "send inx=%d SHA1=%s\n", jcr->JobFiles, SHA1buf);
+ bnet_fsend(dir, "%d %d %s *SHA1-%d*", jcr->JobFiles, STREAM_SHA1_SIGNATURE,
+ SHA1buf, jcr->JobFiles);
+ Dmsg2(20, "bfiled>bdird: SHA1 len=%d: msg=%s\n", dir->msglen, dir->msg);
}
- if (fid >= 0) {
- close(fid);
+ if (is_bopen(&bfd)) {
+ bclose(&bfd);
}
return 1;
}
projects / bacula / bacula / blobdiff