*
*/
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 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
#include "bacula.h"
#include "filed.h"
+#ifdef HAVE_ACL
+#include <sys/acl.h>
+#include <acl/libacl.h>
+#endif
+
static int save_file(FF_PKT *ff_pkt, void *pkt);
+static int send_data(int stream, FF_PKT *ff_pkt, BSOCK *sd, JCR *jcr, struct CHKSUM *chksum);
-/*
+/*
* Find all the requested files and send them
- * to the Storage daemon.
+ * to the Storage daemon.
*
* Note, we normally carry on a one-way
* conversation from this point on with the SD, simply blasting
* also run a "heartbeat" monitor which reads the socket and
* reacts accordingly (at the moment it has nothing to do
* except echo the heartbeat to the Director).
- *
+ *
*/
-int blast_data_to_storage_daemon(JCR *jcr, char *addr)
+bool blast_data_to_storage_daemon(JCR *jcr, char *addr)
{
BSOCK *sd;
- int stat = 1;
+ bool ok = true;
sd = jcr->store_bsock;
- get_backup_privileges(jcr, 0);
-
set_jcr_job_status(jcr, JS_Running);
- Dmsg1(110, "bfiled: opened data connection %d to stored\n", sd->fd);
+ Dmsg1(300, "bfiled: opened data connection %d to stored\n", sd->fd);
- if (!bnet_set_buffer_size(sd, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_WRITE)) {
+ LockRes();
+ CLIENT *client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
+ UnlockRes();
+ uint32_t buf_size;
+ if (client) {
+ buf_size = client->max_network_buffer_size;
+ } else {
+ buf_size = 0; /* use default */
+ }
+ if (!bnet_set_buffer_size(sd, buf_size, BNET_SETBUF_WRITE)) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
+ Jmsg(jcr, M_FATAL, 0, _("Cannot set buffer size FD->SD.\n"));
+ return false;
}
- jcr->buf_size = sd->msglen;
+ jcr->buf_size = sd->msglen;
/* Adjust for compression so that output buffer is
* 12 bytes + 0.1% larger than input buffer plus 18 bytes.
* This gives a bit extra plus room for the sparse addr if any.
jcr->compress_buf_size = jcr->buf_size + ((jcr->buf_size+999) / 1000) + 30;
jcr->compress_buf = get_memory(jcr->compress_buf_size);
- Dmsg1(100, "set_find_options ff=%p\n", jcr->ff);
+ Dmsg1(300, "set_find_options ff=%p\n", jcr->ff);
set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
- Dmsg0(110, "start find files\n");
+ Dmsg0(300, "start find files\n");
start_heartbeat_monitor(jcr);
/* Subroutine save_file() is called for each file */
if (!find_files(jcr, (FF_PKT *)jcr->ff, save_file, (void *)jcr)) {
- stat = 0; /* error */
+ ok = false; /* error */
set_jcr_job_status(jcr, JS_ErrorTerminated);
+// Jmsg(jcr, M_FATAL, 0, _("Find files error.\n"));
}
stop_heartbeat_monitor(jcr);
free_pool_memory(jcr->compress_buf);
jcr->compress_buf = NULL;
}
- Dmsg1(110, "end blast_data stat=%d\n", stat);
- return stat;
-}
+ Dmsg1(300, "end blast_data stat=%d\n", ok);
+ return ok;
+}
-/*
+/*
* Called here by find() for each file included.
*
* *****FIXME***** add FSMs File System Modules
*
* Send the file and its data to the Storage daemon.
+ *
+ * Returns: 1 if OK
+ * 0 if error
+ * -1 to ignore file/directory (not used here)
*/
static int save_file(FF_PKT *ff_pkt, void *vjcr)
{
char attribs[MAXSTRING];
char attribsEx[MAXSTRING];
- int stat, stream;
- struct MD5Context md5c;
- struct SHA1Context sha1c;
- int gotMD5 = 0;
- int gotSHA1 = 0;
- unsigned char signature[30]; /* large enough for either signature */
+ int stat, attr_stream, data_stream;
+ struct CHKSUM chksum;
BSOCK *sd;
JCR *jcr = (JCR *)vjcr;
- POOLMEM *msgsave;
if (job_canceled(jcr)) {
return 0;
case FT_LNK:
Dmsg2(130, "FT_LNK saving: %s -> %s\n", ff_pkt->fname, ff_pkt->link);
break;
- case FT_DIR:
+ case FT_DIRBEGIN:
+ return 1; /* not used */
+ case FT_NORECURSE:
+ case FT_NOFSCHG:
+ case FT_INVALIDFS:
+ case FT_DIREND:
+ if (ff_pkt->type == FT_NORECURSE) {
+ Jmsg(jcr, M_INFO, 1, _(" Recursion turned off. Will not descend into %s\n"),
+ ff_pkt->fname);
+ } else if (ff_pkt->type == FT_NOFSCHG) {
+ Jmsg(jcr, M_INFO, 1, _(" File system change prohibited. Will not descend into %s\n"),
+ ff_pkt->fname);
+ } else if (ff_pkt->type == FT_INVALIDFS) {
+ Jmsg(jcr, M_INFO, 1, _(" Disallowed filesystem. Will not descend into %s\n"),
+ ff_pkt->fname);
+ }
+ ff_pkt->type = FT_DIREND; /* value is used below */
Dmsg1(130, "FT_DIR saving: %s\n", ff_pkt->link);
break;
case FT_SPEC:
case FT_FIFO:
Dmsg1(130, "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));
+ case FT_NOACCESS: {
+ berrno be;
+ be.set_errno(ff_pkt->ff_errno);
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not access %s: ERR=%s\n"), ff_pkt->fname,
+ be.strerror());
+ 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));
+ }
+ case FT_NOFOLLOW: {
+ berrno be;
+ be.set_errno(ff_pkt->ff_errno);
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not follow link %s: ERR=%s\n"), ff_pkt->fname,
+ be.strerror());
+ 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));
+ }
+ case FT_NOSTAT: {
+ berrno be;
+ be.set_errno(ff_pkt->ff_errno);
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not stat %s: ERR=%s\n"), ff_pkt->fname,
+ be.strerror());
+ jcr->Errors++;
return 1;
+ }
case FT_DIRNOCHG:
case FT_NOCHG:
- Jmsg(jcr, M_SKIPPED, -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_NOTSAVED, -1, _(" Archive file not saved: %s\n"), ff_pkt->fname);
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Archive file not saved: %s\n"), ff_pkt->fname);
return 1;
- case FT_NORECURSE:
- Jmsg(jcr, M_SKIPPED, -1, _(" Recursion turned off. Directory skipped: %s\n"),
- ff_pkt->fname);
- return 1;
- case FT_NOFSCHG:
- Jmsg(jcr, M_SKIPPED, -1, _(" File system change prohibited. Directory 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));
+ case FT_NOOPEN: {
+ berrno be;
+ be.set_errno(ff_pkt->ff_errno);
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Could not open directory %s: ERR=%s\n"), ff_pkt->fname,
+ be.strerror());
+ jcr->Errors++;
return 1;
+ }
default:
Jmsg(jcr, M_NOTSAVED, 0, _(" Unknown file type %d; not saved: %s\n"), ff_pkt->type, ff_pkt->fname);
+ jcr->Errors++;
return 1;
}
- binit(&ff_pkt->bfd);
+ Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
- /* Open any file with data that we intend to save */
- 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) {
- btimer_id tid;
- if (ff_pkt->type == FT_FIFO) {
- tid = start_thread_timer(pthread_self(), 60);
- } else {
- tid = NULL;
- }
- if (bopen(&ff_pkt->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,
- berror(&ff_pkt->bfd));
- stop_thread_timer(tid);
- return 1;
- }
- stop_thread_timer(tid);
- }
+ /* Find what data stream we will use, then encode the attributes */
+ data_stream = select_data_stream(ff_pkt);
+ encode_stat(attribs, ff_pkt, data_stream);
+
+ /* Now possibly extend the attributes */
+ attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
+
+ Dmsg3(300, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
- Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);
- encode_stat(attribs, &ff_pkt->statp, ff_pkt->LinkFI);
- stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
- Dmsg3(200, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
-
P(jcr->mutex);
jcr->JobFiles++; /* increment number of files sent */
ff_pkt->FileIndex = jcr->JobFiles; /* return FileIndex */
- pm_strcpy(&jcr->last_fname, ff_pkt->fname);
+ pm_strcpy(jcr->last_fname, ff_pkt->fname);
V(jcr->mutex);
-
+
/*
* Send Attributes header to Storage daemon
* <file-index> <stream> <info>
*/
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
- if (is_bopen(&ff_pkt->bfd)) {
- bclose(&ff_pkt->bfd);
- }
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, attr_stream)) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
return 0;
}
- Dmsg1(100, ">stored: attrhdr %s\n", sd->msg);
+ Dmsg1(300, ">stored: attrhdr %s\n", sd->msg);
/*
* Send file attributes to Storage daemon
* slash. For a linked file, link is the link.
*/
if (ff_pkt->type == FT_LNK || ff_pkt->type == FT_LNKSAVED) {
- Dmsg2(100, "Link %s to %s\n", ff_pkt->fname, ff_pkt->link);
- stat = bnet_fsend(sd, "%ld %d %s%c%s%c%s%c%s%c", jcr->JobFiles,
+ Dmsg2(300, "Link %s to %s\n", ff_pkt->fname, ff_pkt->link);
+ stat = bnet_fsend(sd, "%ld %d %s%c%s%c%s%c%s%c", jcr->JobFiles,
ff_pkt->type, ff_pkt->fname, 0, attribs, 0, ff_pkt->link, 0,
attribsEx, 0);
- } else if (ff_pkt->type == FT_DIR) {
+ } else if (ff_pkt->type == FT_DIREND) {
/* Here link is the canonical filename (i.e. with trailing slash) */
- stat = bnet_fsend(sd, "%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
+ stat = bnet_fsend(sd, "%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
ff_pkt->type, ff_pkt->link, 0, attribs, 0, 0, attribsEx, 0);
} else {
- stat = bnet_fsend(sd, "%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
+ stat = bnet_fsend(sd, "%ld %d %s%c%s%c%c%s%c", jcr->JobFiles,
ff_pkt->type, ff_pkt->fname, 0, attribs, 0, 0, attribsEx, 0);
}
- Dmsg2(100, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg);
+ Dmsg2(300, ">stored: attr len=%d: %s\n", sd->msglen, sd->msg);
if (!stat) {
- if (is_bopen(&ff_pkt->bfd)) {
- bclose(&ff_pkt->bfd);
- }
- set_jcr_job_status(jcr, JS_ErrorTerminated);
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
return 0;
}
bnet_sig(sd, BNET_EOD); /* indicate end of attributes data */
- /*
- * If the file has data, read it and send to the Storage daemon
+ /*
+ * Setup for signature handling.
+ * Then initialise the file descriptor we use for data and other streams.
+ */
+ chksum_init(&chksum, ff_pkt->flags);
+
+ binit(&ff_pkt->bfd);
+ if (ff_pkt->flags & FO_PORTABLE) {
+ set_portable_backup(&ff_pkt->bfd); /* disable Win32 BackupRead() */
+ }
+ if (ff_pkt->reader) {
+ set_prog(&ff_pkt->bfd, ff_pkt->reader, jcr);
+ }
+
+ /*
+ * Open any file with data that we intend to save, then save it.
*
+ * Note, if is_win32_backup, we must open the Directory so that
+ * the BackupRead will save its permissions and ownership streams.
*/
- if (is_bopen(&ff_pkt->bfd)) {
- uint64_t fileAddr = 0; /* file address */
- char *rbuf, *wbuf;
- int rsize = jcr->buf_size; /* read buffer size */
+ 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 ||
+ (!is_portable_backup(&ff_pkt->bfd) && ff_pkt->type == FT_DIREND)) {
+ btimer_t *tid;
+ if (ff_pkt->type == FT_FIFO) {
+ tid = start_thread_timer(pthread_self(), 60);
+ } else {
+ tid = NULL;
+ }
+ if (bopen(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0) < 0) {
+ ff_pkt->ff_errno = errno;
+ berrno be;
+ Jmsg(jcr, M_NOTSAVED, 0, _(" Cannot open %s: ERR=%s.\n"), ff_pkt->fname,
+ be.strerror());
+ jcr->Errors++;
+ if (tid) {
+ stop_thread_timer(tid);
+ tid = NULL;
+ }
+ return 1;
+ }
+ if (tid) {
+ stop_thread_timer(tid);
+ tid = NULL;
+ }
+ stat = send_data(data_stream, ff_pkt, sd, jcr, &chksum);
+ bclose(&ff_pkt->bfd);
+ if (!stat) {
+ return 0;
+ }
+ }
- msgsave = sd->msg;
- rbuf = sd->msg; /* read buffer */
- wbuf = sd->msg; /* write buffer */
+#ifdef HAVE_DARWIN_OS
+ /* Open resource fork if necessary and save content */
+ if (ff_pkt->type != FT_LNKSAVED && (S_ISREG(ff_pkt->statp.st_mode) &&
+ ff_pkt->flags & FO_HFSPLUS)) {
+ if (ff_pkt->hfsinfo.rsrclength > 0) {
+ int flags;
+ if (!bopen_rsrc(&ff_pkt->bfd, ff_pkt->fname, O_RDONLY | O_BINARY, 0) < 0) {
+ ff_pkt->ff_errno = errno;
+ berrno be;
+ Jmsg(jcr, M_NOTSAVED, -1, _(" Cannot open resource fork for %s: ERR=%s.\n"), ff_pkt->fname,
+ be.strerror());
+ jcr->Errors++;
+ if (is_bopen(&ff_pkt->bfd)) {
+ bclose(&ff_pkt->bfd);
+ }
+ return 1;
+ }
+ flags = ff_pkt->flags;
+ ff_pkt->flags &= ~(FO_GZIP|FO_SPARSE);
+ stat = send_data(STREAM_MACOS_FORK_DATA, ff_pkt, sd, jcr, &chksum);
+ ff_pkt->flags = flags;
+ bclose(&ff_pkt->bfd);
+ if (!stat) {
+ return 0;
+ }
+ }
- Dmsg1(100, "Saving data, type=%d\n", ff_pkt->type);
+ Dmsg1(300, "Saving Finder Info for \"%s\"", ff_pkt->fname);
+ bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_HFSPLUS_ATTRIBUTES);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
+ memcpy(sd->msg, ff_pkt->hfsinfo.fndrinfo, 32);
+ sd->msglen = 32;
+ chksum_update(&chksum, (unsigned char *)sd->msg, sd->msglen);
+ bnet_send(sd);
+ bnet_sig(sd, BNET_EOD);
+ }
+#endif
- if (ff_pkt->flags & FO_SPARSE) {
- stream = STREAM_SPARSE_DATA;
+#ifdef HAVE_ACL
+ /*** FIXME ***/
+ /* ACL stream */
+ if (ff_pkt->flags & FO_ACL) {
+ char *acl_text = NULL;
+ char *aclDef_text = NULL;
+
+ /* Read ACLs for files, dirs and links */
+ if (ff_pkt->type == FT_DIREND) {
+ /* Directory: Check for default ACL*/
+ acl_t myDefAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_DEFAULT);
+ /* Check for Access ACL */
+ acl_t myAccAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_ACCESS);
+ if (!myDefAcl || !myAccAcl) {
+ Jmsg1(jcr, M_WARNING, 0, "Error while trying to get ACL of directory: %s!\n", ff_pkt->fname);
+ }
+ if(myDefAcl){
+ aclDef_text = acl_to_any_text(myDefAcl, NULL, ',', TEXT_ABBREVIATE);
+ acl_free(myDefAcl);
+ }
+ if(myAccAcl){
+ acl_text = acl_to_any_text(myAccAcl, NULL, ',', TEXT_ABBREVIATE);
+ acl_free(myAccAcl);
+ }
} else {
- stream = STREAM_FILE_DATA;
+ /* Files or links */
+ acl_t myAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_ACCESS);
+ if (!myAcl) {
+ Jmsg1(jcr, M_WARNING, 0, "Error while trying to get ACL of file: %s!\n", ff_pkt->fname);
+ acl_free(myAcl);
+ }
+ acl_text = acl_to_any_text(myAcl, NULL, ',', TEXT_ABBREVIATE);
+ acl_free(myAcl);
}
-#ifdef HAVE_LIBZ
- uLong compress_len, max_compress_len = 0;
- const Bytef *cbuf = NULL;
+ POOLMEM *msgsave;
+
+ /* If there is an ACL, send it to the Storage daemon */
+ if (acl_text != NULL) {
+ sd = jcr->store_bsock;
+ pm_strcpy(&jcr->last_fname, ff_pkt->fname);
+
- if (ff_pkt->flags & FO_GZIP) {
- if (stream == STREAM_FILE_DATA) {
- stream = STREAM_GZIP_DATA;
+ // Send ACL header
+ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_UNIX_ATTRIBUTES_ACCESS_ACL)) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
+ return 0;
+ }
+
+ /* Send the buffer to the storage deamon */
+ msgsave = sd->msg;
+ sd->msg = acl_text;
+ sd->msglen = strlen(acl_text) + 1;
+ if (!bnet_send(sd)) {
+ berrno be;
+ sd->msg = msgsave;
+ sd->msglen = 0;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
} else {
- stream = STREAM_SPARSE_GZIP_DATA;
+ jcr->JobBytes += sd->msglen;
+ sd->msg = msgsave;
+ if (!bnet_sig(sd, BNET_EOD)) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
+ } else {
+ Dmsg1(200, "ACL of file: %s successfully backed up!\n", ff_pkt->fname);
+ }
+ }
+ }
+ /* If there is an Default ACL, send it to the Storage daemon */
+ if (aclDef_text != NULL) {
+ sd = jcr->store_bsock;
+ pm_strcpy(&jcr->last_fname, ff_pkt->fname);
+
+
+ // Send ACL header
+ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_UNIX_ATTRIBUTES_DEFAULT_ACL)) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
+ return 0;
}
- if (ff_pkt->flags & FO_SPARSE) {
- cbuf = (Bytef *)jcr->compress_buf + SPARSE_FADDR_SIZE;
- max_compress_len = jcr->compress_buf_size - SPARSE_FADDR_SIZE;
+ // Send the buffer to the storage deamon
+ msgsave = sd->msg;
+ sd->msg = aclDef_text;
+ sd->msglen = strlen(aclDef_text) + 1;
+ if (!bnet_send(sd)) {
+ berrno be;
+ sd->msg = msgsave;
+ sd->msglen = 0;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
} else {
- cbuf = (Bytef *)jcr->compress_buf;
- max_compress_len = jcr->compress_buf_size; /* set max length */
+ jcr->JobBytes += sd->msglen;
+ sd->msg = msgsave;
+ if (!bnet_sig(sd, BNET_EOD)) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
+ } else {
+ Dmsg1(200, "ACL of file: %s successfully backed up!\n", ff_pkt->fname);
+ }
}
- wbuf = jcr->compress_buf; /* compressed output here */
}
+ }
#endif
- /*
- * Send Data header to Storage daemon
- * <file-index> <stream> <info>
- */
- if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
- bclose(&ff_pkt->bfd);
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
+ /* Terminate any signature and send it to Storage daemon and the Director */
+ if (chksum.updated) {
+ int stream = 0;
+ chksum_final(&chksum);
+ if (chksum.type == CHKSUM_MD5) {
+ stream = STREAM_MD5_SIGNATURE;
+ } else if (chksum.type == CHKSUM_SHA1) {
+ stream = STREAM_SHA1_SIGNATURE;
+ } else {
+ Jmsg1(jcr, M_WARNING, 0, _("Unknown signature type %i."), chksum.type);
}
- Dmsg1(100, ">stored: datahdr %s\n", sd->msg);
+ if (stream != 0) {
+ bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
+ memcpy(sd->msg, chksum.signature, chksum.length);
+ sd->msglen = chksum.length;
+ bnet_send(sd);
+ bnet_sig(sd, BNET_EOD); /* end of checksum */
+ }
+ }
- if (ff_pkt->flags & FO_MD5) {
- MD5Init(&md5c);
- } else if (ff_pkt->flags & FO_SHA1) {
- SHA1Init(&sha1c);
+ return 1;
+}
+
+/*
+ * Send data read from an already open file descriptor.
+ *
+ * We return 1 on sucess and 0 on errors.
+ *
+ * ***FIXME***
+ * We use ff_pkt->statp.st_size when FO_SPARSE.
+ * Currently this is not a problem as the only other stream, resource forks,
+ * are not handled as sparse files.
+ */
+int send_data(int stream, FF_PKT *ff_pkt, BSOCK *sd, JCR *jcr, struct CHKSUM *chksum)
+{
+ uint64_t fileAddr = 0; /* file address */
+ char *rbuf, *wbuf;
+ int rsize = jcr->buf_size; /* read buffer size */
+ POOLMEM *msgsave;
+
+ msgsave = sd->msg;
+ rbuf = sd->msg; /* read buffer */
+ wbuf = sd->msg; /* write buffer */
+
+
+ Dmsg1(300, "Saving data, type=%d\n", ff_pkt->type);
+
+
+#ifdef HAVE_LIBZ
+ uLong compress_len, max_compress_len = 0;
+ const Bytef *cbuf = NULL;
+
+ if (ff_pkt->flags & FO_GZIP) {
+ if (ff_pkt->flags & FO_SPARSE) {
+ cbuf = (Bytef *)jcr->compress_buf + SPARSE_FADDR_SIZE;
+ max_compress_len = jcr->compress_buf_size - SPARSE_FADDR_SIZE;
+ } else {
+ cbuf = (Bytef *)jcr->compress_buf;
+ max_compress_len = jcr->compress_buf_size; /* set max length */
}
+ wbuf = jcr->compress_buf; /* compressed output here */
+ }
+#endif
+ /*
+ * Send Data header to Storage daemon
+ * <file-index> <stream> <info>
+ */
+ if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, stream)) {
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
+ return 0;
+ }
+ Dmsg1(300, ">stored: datahdr %s\n", sd->msg);
+
+ /*
+ * Make space at beginning of buffer for fileAddr because this
+ * same buffer will be used for writing if compression if off.
+ */
+ if (ff_pkt->flags & FO_SPARSE) {
+ rbuf += SPARSE_FADDR_SIZE;
+ rsize -= SPARSE_FADDR_SIZE;
+#ifdef HAVE_FREEBSD_OS
/*
- * Make space at beginning of buffer for fileAddr because this
- * same buffer will be used for writing if compression if off.
+ * To read FreeBSD partitions, the read size must be
+ * a multiple of 512.
*/
+ rsize = (rsize/512) * 512;
+#endif
+ }
+
+ /*
+ * Read the file data
+ */
+ while ((sd->msglen=(uint32_t)bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
+ int sparseBlock = 0;
+
+ /* Check for sparse blocks */
if (ff_pkt->flags & FO_SPARSE) {
- rbuf += SPARSE_FADDR_SIZE;
- rsize -= SPARSE_FADDR_SIZE;
+ ser_declare;
+ if (sd->msglen == rsize &&
+ (fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size)) {
+ sparseBlock = is_buf_zero(rbuf, rsize);
+ }
+
+ ser_begin(wbuf, SPARSE_FADDR_SIZE);
+ ser_uint64(fileAddr); /* store fileAddr in begin of buffer */
}
- /*
- * Read the file data
- */
- while ((sd->msglen=bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
- int sparseBlock = 0;
+ jcr->ReadBytes += sd->msglen; /* count bytes read */
+ fileAddr += sd->msglen;
- /* Check for sparse blocks */
- if (ff_pkt->flags & FO_SPARSE) {
- ser_declare;
- if (sd->msglen == rsize &&
- (fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size)) {
- sparseBlock = is_buf_zero(rbuf, rsize);
- }
-
- ser_begin(wbuf, SPARSE_FADDR_SIZE);
- ser_uint64(fileAddr); /* store fileAddr in begin of buffer */
- }
-
- jcr->ReadBytes += sd->msglen; /* count bytes read */
- fileAddr += sd->msglen;
-
- /* Update MD5 if requested */
- if (ff_pkt->flags & FO_MD5) {
- MD5Update(&md5c, (unsigned char *)rbuf, sd->msglen);
- gotMD5 = 1;
- } else if (ff_pkt->flags & FO_SHA1) {
- SHA1Update(&sha1c, (unsigned char *)rbuf, sd->msglen);
- gotSHA1 = 1;
- }
+ /* Update checksum if requested */
+ chksum_update(chksum, (unsigned char *)rbuf, sd->msglen);
#ifdef HAVE_LIBZ
- /* Do compression if turned on */
- if (!sparseBlock && ff_pkt->flags & FO_GZIP) {
- int zstat;
- compress_len = max_compress_len;
- Dmsg4(400, "cbuf=0x%x len=%u rbuf=0x%x len=%u\n", cbuf, compress_len,
- rbuf, sd->msglen);
- /* NOTE! This call modifies compress_len !!! */
- if ((zstat=compress2((Bytef *)cbuf, &compress_len,
- (const Bytef *)rbuf, (uLong)sd->msglen,
- ff_pkt->GZIP_level)) != Z_OK) {
- Jmsg(jcr, M_FATAL, 0, _("Compression error: %d\n"), zstat);
- sd->msg = msgsave;
- sd->msglen = 0;
- bclose(&ff_pkt->bfd);
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
- }
- Dmsg2(400, "compressed len=%d uncompressed len=%d\n",
- compress_len, sd->msglen);
-
- sd->msglen = compress_len; /* set compressed length */
+ /* Do compression if turned on */
+ if (!sparseBlock && ff_pkt->flags & FO_GZIP) {
+ int zstat;
+ compress_len = max_compress_len;
+ Dmsg4(400, "cbuf=0x%x len=%u rbuf=0x%x len=%u\n", cbuf, compress_len,
+ rbuf, sd->msglen);
+ /* NOTE! This call modifies compress_len !!! */
+ if ((zstat=compress2((Bytef *)cbuf, &compress_len,
+ (const Bytef *)rbuf, (uLong)sd->msglen,
+ ff_pkt->GZIP_level)) != Z_OK) {
+ Jmsg(jcr, M_FATAL, 0, _("Compression error: %d\n"), zstat);
+ sd->msg = msgsave;
+ sd->msglen = 0;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ return 0;
}
+ Dmsg2(400, "compressed len=%d uncompressed len=%d\n",
+ compress_len, sd->msglen);
+
+ sd->msglen = compress_len; /* set compressed length */
+ }
#endif
- /* #ifndef FD_NO_SEND_TEST */
- /* Send the buffer to the Storage daemon */
- if (!sparseBlock) {
- if (ff_pkt->flags & FO_SPARSE) {
- sd->msglen += SPARSE_FADDR_SIZE; /* include fileAddr in size */
- }
- sd->msg = wbuf; /* set correct write buffer */
- if (!bnet_send(sd)) {
- sd->msg = msgsave; /* restore bnet buffer */
- sd->msglen = 0;
- bclose(&ff_pkt->bfd);
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
- }
+ /* Send the buffer to the Storage daemon */
+ if (!sparseBlock) {
+ if (ff_pkt->flags & FO_SPARSE) {
+ sd->msglen += SPARSE_FADDR_SIZE; /* include fileAddr in size */
}
- Dmsg1(130, "Send data to SD len=%d\n", sd->msglen);
- /* #endif */
- jcr->JobBytes += sd->msglen; /* count bytes saved possibly compressed */
- sd->msg = msgsave; /* restore read buffer */
-
- } /* end while read file data */
+ sd->msg = wbuf; /* set correct write buffer */
+ if (!bnet_send(sd)) {
+ berrno be;
+ Jmsg2(jcr, M_FATAL, 0, _("Network send error %d to SD. ERR=%s\n"),
+ sd->msglen, bnet_strerror(sd));
+ sd->msg = msgsave; /* restore bnet buffer */
+ sd->msglen = 0;
+ return 0;
+ }
+ }
+ Dmsg1(130, "Send data to SD len=%d\n", sd->msglen);
+ /* #endif */
+ jcr->JobBytes += sd->msglen; /* count bytes saved possibly compressed */
+ sd->msg = msgsave; /* restore read buffer */
+ } /* end while read file data */
- if (sd->msglen < 0) {
- Jmsg(jcr, M_ERROR, 0, _("Read error on file %s. ERR=%s\n"),
- ff_pkt->fname, berror(&ff_pkt->bfd));
- }
- bclose(&ff_pkt->bfd); /* close file */
- if (!bnet_sig(sd, BNET_EOD)) { /* indicate end of file data */
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
- }
+ if (sd->msglen < 0) {
+ berrno be;
+ be.set_errno(ff_pkt->bfd.berrno);
+ Jmsg(jcr, M_ERROR, 0, _("Read error on file %s. ERR=%s\n"),
+ ff_pkt->fname, be.strerror());
}
-
- /* Terminate any MD5 signature and send it to Storage daemon and the Director */
- if (gotMD5 && ff_pkt->flags & FO_MD5) {
- MD5Final(signature, &md5c);
- bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_MD5_SIGNATURE);
- Dmsg1(100, "bfiled>stored:header %s\n", sd->msg);
- memcpy(sd->msg, signature, 16);
- sd->msglen = 16;
- bnet_send(sd);
- bnet_sig(sd, BNET_EOD); /* end of MD5 */
- gotMD5 = 0;
- } else if (gotSHA1 && ff_pkt->flags & FO_SHA1) {
- /* Terminate any SHA1 signature and send it to Storage daemon and the Director */
- SHA1Final(&sha1c, signature);
- bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, STREAM_SHA1_SIGNATURE);
- Dmsg1(100, "bfiled>stored:header %s\n", sd->msg);
- memcpy(sd->msg, signature, 20);
- sd->msglen = 20;
- bnet_send(sd);
- bnet_sig(sd, BNET_EOD); /* end of SHA1 */
- gotMD5 = 0;
+ if (!bnet_sig(sd, BNET_EOD)) { /* indicate end of file data */
+ berrno be;
+ Jmsg1(jcr, M_FATAL, 0, _("Network send error to SD. ERR=%s\n"),
+ bnet_strerror(sd));
+ return 0;
}
+
return 1;
}
projects / bacula / bacula / blobdiff