*
*/
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 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
#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);
/*
* 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;
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->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);
- set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime, jcr->mtime_only);
- Dmsg0(110, "start find files\n");
+ Dmsg1(300, "set_find_options ff=%p\n", jcr->ff);
+ set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
+ 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;
}
/*
* *****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)
{
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_DIREND:
Dmsg1(130, "FT_DIR saving: %s\n", ff_pkt->link);
break;
case FT_SPEC:
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_DIR)) {
- btimer_id tid;
+ (!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 {
/* Now possibly extend the attributes */
attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
- Dmsg3(200, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
+ Dmsg3(300, "File %s\nattribs=%s\nattribsEx=%s\n", ff_pkt->fname, attribs, attribsEx);
P(jcr->mutex);
jcr->JobFiles++; /* increment number of files sent */
set_jcr_job_status(jcr, JS_ErrorTerminated);
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);
+ 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,
ff_pkt->type, ff_pkt->link, 0, attribs, 0, 0, attribsEx, 0);
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);
+ Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n"));
return 0;
}
bnet_sig(sd, BNET_EOD); /* indicate end of attributes data */
wbuf = sd->msg; /* write buffer */
- Dmsg1(100, "Saving data, type=%d\n", ff_pkt->type);
+ Dmsg1(300, "Saving data, type=%d\n", ff_pkt->type);
#ifdef HAVE_LIBZ
if (!bnet_fsend(sd, "%ld %d 0", jcr->JobFiles, data_stream)) {
bclose(&ff_pkt->bfd);
set_jcr_job_status(jcr, JS_ErrorTerminated);
+ Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n"));
return 0;
}
- Dmsg1(100, ">stored: datahdr %s\n", sd->msg);
+ Dmsg1(300, ">stored: datahdr %s\n", sd->msg);
if (ff_pkt->flags & FO_MD5) {
MD5Init(&md5c);
if (ff_pkt->flags & FO_SPARSE) {
rbuf += SPARSE_FADDR_SIZE;
rsize -= SPARSE_FADDR_SIZE;
+#ifdef HAVE_FREEBSD_OS
+ /*
+ * 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=bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
+ while ((sd->msglen=(uint32_t)bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
int sparseBlock = 0;
/* Check for sparse blocks */
sd->msglen = 0;
bclose(&ff_pkt->bfd);
set_jcr_job_status(jcr, JS_ErrorTerminated);
+ Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n"));
return 0;
}
}
bclose(&ff_pkt->bfd); /* close file */
if (!bnet_sig(sd, BNET_EOD)) { /* indicate end of file data */
set_jcr_job_status(jcr, JS_ErrorTerminated);
+ Jmsg0(jcr, M_FATAL, 0, _("Network send error.\n"));
return 0;
}
}
+
+#ifdef HAVE_ACL
+ /* ACL stream */
+ if (ff_pkt->flags & FO_ACL) {
+ char *acl_text;
+ /* Read ACLs for files, dirs and links */
+ if (ff_pkt->type == FT_DIREND) {
+ /* Directory: Try for default ACL*/
+ acl_t myAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_DEFAULT);
+ if (!myAcl) {
+ Dmsg1(200, "No default ACL defined for directory: %s!\n", ff_pkt->fname);
+ /* If there is no default ACL get standard ACL */
+ myAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_ACCESS);
+ if (!myAcl) {
+ Emsg1(M_WARNING, 0, "Error while trying to get ACL of directory: %s!\n", ff_pkt->fname);
+ }
+ }
+ acl_text = acl_to_any_text(myAcl, NULL, ',', TEXT_ABBREVIATE);
+ /* Free memory */
+ acl_free(myAcl);
+ } else {
+ /* Files or links */
+ acl_t myAcl = acl_get_file(ff_pkt->fname, ACL_TYPE_ACCESS);
+ if (!myAcl) {
+ Emsg1(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);
+ }
+
+ /* If there is an ACL, send it to the Storage daemon */
+ if (acl_text) {
+ 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_ACL)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ 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)) {
+ sd->msg = msgsave;
+ sd->msglen = 0;
+ bclose(&ff_pkt->bfd);
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ Emsg1(M_WARNING, 0, "Error while trying to send ACL of %s to SD!\n", ff_pkt->fname);
+ } else {
+ jcr->JobBytes += sd->msglen;
+ sd->msg = msgsave;
+ bclose(&ff_pkt->bfd);
+ if (!bnet_sig(sd, BNET_EOD)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ } else {
+ Dmsg1(200, "ACL of file: %s successfully backed up!\n", ff_pkt->fname);
+ }
+ }
+ }
+ }
+#endif
/* 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);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
memcpy(sd->msg, signature, 16);
sd->msglen = 16;
bnet_send(sd);
/* 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);
+ Dmsg1(300, "bfiled>stored:header %s\n", sd->msg);
memcpy(sd->msg, signature, 20);
sd->msglen = 20;
bnet_send(sd);
projects / bacula / bacula / blobdiff