}
+
/*
* Read the attributes from the File daemon for
* a Verify job and store them in the catalog.
BSOCK *fd;
int n = 0;
ATTR_DBR *ar = NULL;
+ char digest[MAXSTRING];
fd = jcr->file_bsock;
jcr->jr.FirstIndex = 1;
jcr->FileIndex = 0;
+ /* Start transaction allocates jcr->attr and jcr->ar if needed */
+ db_start_transaction(jcr, jcr->db); /* start transaction if not already open */
+ ar = jcr->ar;
Dmsg0(120, "bdird: waiting to receive file attributes\n");
/* Pickup file attributes and digest */
while (!fd->errors && (n = bget_dirmsg(fd)) > 0) {
uint32_t file_index;
int stream, len;
- char *attr, *p, *fn;
- char Opts_Digest[MAXSTRING]; /* either Verify opts or MD5/SHA1 digest */
- char digest[CRYPTO_DIGEST_MAX_SIZE];
+ char *p, *fn;
+ char Digest[MAXSTRING]; /* either Verify opts or MD5/SHA1 digest */
jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
- if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Opts_Digest)) != 3) {
+ if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Digest)) != 3) {
Jmsg(jcr, M_FATAL, 0, _("<filed: bad attributes, expected 3 fields got %d\n"
"msglen=%d msg=%s\n"), len, fd->msglen, fd->msg);
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
- /* Start transaction allocates jcr->attr and jcr->ar if needed */
- db_start_transaction(jcr, jcr->db); /* start transaction if not already open */
- ar = jcr->ar;
p = fd->msg;
/* The following three fields were sscanf'ed above so skip them */
skip_nonspaces(&p); /* skip FileIndex */
skip_spaces(&p);
skip_nonspaces(&p); /* skip Opts_Digest */
p++; /* skip space */
+ Dmsg1(dbglvl, "Stream=%d\n", stream);
if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) {
if (jcr->cached_attribute) {
- Dmsg2(dbglvl, "Cached attr. Stream=%d fname=%s\n", ar->Stream, ar->fname);
+ Dmsg3(dbglvl, "Cached attr. Stream=%d fname=%s\n", ar->Stream, ar->fname,
+ ar->attr);
if (!db_create_file_attributes_record(jcr, jcr->db, ar)) {
Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
}
while (*p != 0) {
*fn++ = *p++; /* copy filename */
}
- *fn = *p++; /* term filename and point to attribs */
- attr = p;
- len = strlen(attr);
- jcr->attr = check_pool_memory_size(jcr->attr, len);
- memcpy(jcr->attr, attr, len);
+ *fn = *p++; /* term filename and point p to attribs */
+ pm_strcpy(jcr->attr, p); /* save attributes */
jcr->JobFiles++;
jcr->FileIndex = file_index;
- ar->attr = attr;
+ ar->attr = jcr->attr;
ar->fname = jcr->fname;
ar->FileIndex = file_index;
ar->Stream = stream;
jcr->cached_attribute = true;
Dmsg2(dbglvl, "dird<filed: stream=%d %s\n", stream, jcr->fname);
- Dmsg1(dbglvl, "dird<filed: attr=%s\n", attr);
+ Dmsg1(dbglvl, "dird<filed: attr=%s\n", ar->attr);
jcr->FileId = ar->FileId;
/*
* First, get STREAM_UNIX_ATTRIBUTES and fill ATTR_DBR structure
stream_to_ascii(stream), file_index, jcr->FileIndex);
continue;
}
- db_escape_string(digest, Opts_Digest, strlen(Opts_Digest));
ar->Digest = digest;
ar->DigestType = crypto_digest_stream_type(stream);
- Dmsg3(dbglvl, "DigestLen=%d Digest=%s type=%d\n", strlen(digest), digest,
- ar->DigestType);
- if (jcr->cached_attribute) {
- Dmsg2(dbglvl, "Cached attr with digest. Stream=%d fname=%s\n", ar->Stream, ar->fname);
- if (!db_create_file_attributes_record(jcr, jcr->db, ar)) {
- Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
- }
- jcr->cached_attribute = false;
- } else {
- if (!db_add_digest_to_file_record(jcr, jcr->db, ar->FileId,
- ar->Digest, ar->DigestType)) {
- Jmsg(jcr, M_ERROR, 0, _("Catalog error updating file digest. %s"),
- db_strerror(jcr->db));
- }
- }
+ db_escape_string(digest, Digest, strlen(Digest));
+ Dmsg4(dbglvl, "stream=%d DigestLen=%d Digest=%s type=%d\n", stream,
+ strlen(digest), digest, ar->DigestType);
}
jcr->jr.JobFiles = jcr->JobFiles = file_index;
jcr->jr.LastIndex = file_index;
}
if (is_bnet_error(fd)) {
Jmsg1(jcr, M_FATAL, 0, _("<filed: Network error getting attributes. ERR=%s\n"),
- bnet_strerror(fd));
+ fd->bstrerror());
return 0;
}
-
+ if (jcr->cached_attribute) {
+ Dmsg3(dbglvl, "Cached attr with digest. Stream=%d fname=%s attr=%s\n", ar->Stream,
+ ar->fname, ar->attr);
+ if (!db_create_file_attributes_record(jcr, jcr->db, ar)) {
+ Jmsg1(jcr, M_FATAL, 0, _("Attribute create error. %s"), db_strerror(jcr->db));
+ }
+ jcr->cached_attribute = false;
+ }
set_jcr_job_status(jcr, JS_Terminated);
return 1;
}