/* Responses received from File daemon */
-static char OKinc[] = "2000 OK include\n";
-static char OKexc[] = "2000 OK exclude\n";
-static char OKjob[] = "2000 OK Job";
+static char OKinc[] = "2000 OK include\n";
+static char OKexc[] = "2000 OK exclude\n";
+static char OKjob[] = "2000 OK Job";
+static char OKbootstrap[] = "2000 OK bootstrap\n";
/* Forward referenced functions */
extern DIRRES *director;
extern int FDConnectTimeout;
+#define INC_LIST 0
+#define EXC_LIST 1
+
/*
* Open connection with File daemon.
* Try connecting every 10 seconds, give up after 1 hour.
*/
bnet_fsend(fd, jobcmd, jcr->JobId, jcr->Job, jcr->VolSessionId,
jcr->VolSessionTime, jcr->sd_auth_key);
- memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
- Dmsg1(110, ">filed: %s", fd->msg);
+ if (strcmp(jcr->sd_auth_key, "dummy") != 0) {
+ memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
+ }
+ Dmsg1(100, ">filed: %s", fd->msg);
if (bnet_recv(fd) > 0) {
Dmsg1(110, "<filed: %s", fd->msg);
if (strncmp(fd->msg, OKjob, strlen(OKjob)) != 0) {
- Jmsg(jcr, M_FATAL, 0, _("File daemon rejected Job command: %s\n"), fd->msg);
+ Jmsg(jcr, M_FATAL, 0, _("File daemon \"%s\" rejected Job command: %s\n"),
+ jcr->client->hdr.name, fd->msg);
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
} else {
- /***** ***FIXME***** update Client Uname */
+ CLIENT_DBR cr;
+ memset(&cr, 0, sizeof(cr));
+ bstrncpy(cr.Name, jcr->client->hdr.name, sizeof(cr.Name));
+ cr.AutoPrune = jcr->client->AutoPrune;
+ cr.FileRetention = jcr->client->FileRetention;
+ cr.JobRetention = jcr->client->JobRetention;
+ bstrncpy(cr.Uname, fd->msg+strlen(OKjob)+1, sizeof(cr.Uname));
+ if (!db_update_client_record(jcr, jcr->db, &cr)) {
+ Jmsg(jcr, M_WARNING, 0, _("Error updating Client record. ERR=%s\n"),
+ db_strerror(jcr->db));
+ }
}
} else {
- Jmsg(jcr, M_FATAL, 0, _("<filed: bad response to JobId command: %s\n"),
+ Jmsg(jcr, M_FATAL, 0, _("FD gave bad response to JobId command: %s\n"),
bnet_strerror(fd));
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
/*
- * Send include list to File daemon
+ * Send either an Included or an Excluded list to FD
*/
-int send_include_list(JCR *jcr)
+static int send_list(JCR *jcr, int list)
{
FILESET *fileset;
BSOCK *fd;
- int i, j;
- char *msgsave;
+ int num;
fd = jcr->file_bsock;
fileset = jcr->fileset;
- fd->msglen = sprintf(fd->msg, inc);
- bnet_send(fd);
- for (i=0; i < fileset->num_includes; i++) {
+ if (list == INC_LIST) {
+ num = fileset->num_includes;
+ } else {
+ num = fileset->num_excludes;
+ }
+
+ for (int i=0; i < num; i++) {
BPIPE *bpipe;
FILE *ffd;
char buf[1000];
- char *o, *p, *q;
+ char *p;
int optlen, stat;
+ INCEXE *ie;
- Dmsg1(120, "dird>filed: include file: %s\n", fileset->include_array[i]);
- o = p = fileset->include_array[i];
- skip_nonspaces(&p); /* skip options */
- skip_spaces(&p);
- q = p; /* save end of options */
- switch (*p++) {
- case '|':
- fd->msg = edit_job_codes(jcr, fd->msg, p, "");
- bpipe = open_bpipe(fd->msg, 0, "r");
- if (!bpipe) {
- Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"),
- p, strerror(errno));
- goto bail_out;
- }
- /* Copy File options */
- optlen = q - o;
- for (j=0; j < optlen; j++) {
- buf[j] = *o++;
- }
- while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) {
- fd->msglen = Mmsg(&fd->msg, "%s", buf);
- Dmsg2(200, "Including len=%d: %s", fd->msglen, fd->msg);
- if (!bnet_send(fd)) {
- Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n"));
+ if (list == INC_LIST) {
+ ie = fileset->include_items[i];
+ } else {
+ ie = fileset->exclude_items[i];
+ }
+ for (int j=0; j<ie->num_names; j++) {
+ p = ie->name_list[j];
+ switch (*p) {
+ case '|':
+ fd->msg = edit_job_codes(jcr, fd->msg, p, "");
+ bpipe = open_bpipe(fd->msg, 0, "r");
+ if (!bpipe) {
+ Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"),
+ p, strerror(errno));
goto bail_out;
}
- }
- if ((stat=close_bpipe(bpipe)) != 0) {
- Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. RtnStat=%d ERR=%s\n"),
- p, stat, strerror(errno));
- goto bail_out;
- }
- break;
- case '<':
- if ((ffd = fopen(p, "r")) == NULL) {
- Jmsg(jcr, M_FATAL, 0, _("Cannot open included file: %s. ERR=%s\n"),
- p, strerror(errno));
- goto bail_out;
- }
- /* Copy File options */
- optlen = q - o;
- for (j=0; j < optlen; j++) {
- buf[j] = *o++;
- }
- while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) {
- fd->msglen = Mmsg(&fd->msg, "%s", buf);
+ /* Copy File options */
+ if (ie->num_opts) {
+ strcpy(buf, ie->opts_list[0]->opts);
+ strcat(buf, " ");
+ } else {
+ strcpy(buf, "0 ");
+ }
+ optlen = strlen(buf);
+ while (fgets(buf+optlen, sizeof(buf)-optlen, bpipe->rfd)) {
+ fd->msglen = Mmsg(&fd->msg, "%s", buf);
+ Dmsg2(200, "Inc/exc len=%d: %s", fd->msglen, fd->msg);
+ if (!bnet_send(fd)) {
+ Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n"));
+ goto bail_out;
+ }
+ }
+ if ((stat=close_bpipe(bpipe)) != 0) {
+ Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. RtnStat=%d ERR=%s\n"),
+ p, stat, strerror(errno));
+ goto bail_out;
+ }
+ break;
+ case '<':
+ p++; /* skip over < */
+ if ((ffd = fopen(p, "r")) == NULL) {
+ Jmsg(jcr, M_FATAL, 0, _("Cannot open %s file: %s. ERR=%s\n"),
+ list==INC_LIST?"included":"excluded", p, strerror(errno));
+ goto bail_out;
+ }
+ /* Copy File options */
+ if (ie->num_opts) {
+ strcpy(buf, ie->opts_list[0]->opts);
+ strcat(buf, " ");
+ } else {
+ strcpy(buf, "0 ");
+ }
+ optlen = strlen(buf);
+ while (fgets(buf+optlen, sizeof(buf)-optlen, ffd)) {
+ fd->msglen = Mmsg(&fd->msg, "%s", buf);
+ if (!bnet_send(fd)) {
+ Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n"));
+ goto bail_out;
+ }
+ }
+ fclose(ffd);
+ break;
+ case '\\':
+ p++; /* skip over \ */
+ /* Note, fall through wanted */
+ default:
+ if (ie->num_opts) {
+ pm_strcpy(&fd->msg, ie->opts_list[0]->opts);
+ pm_strcat(&fd->msg, " ");
+ } else {
+ pm_strcpy(&fd->msg, "0 ");
+ }
+ pm_strcat(&fd->msg, p);
+ Dmsg1(100, "Inc/Exc name=%s\n", fd->msg);
+ fd->msglen = strlen(fd->msg);
if (!bnet_send(fd)) {
Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n"));
goto bail_out;
}
+ break;
}
- fclose(ffd);
- break;
- default:
- msgsave = fd->msg;
- fd->msg = fileset->include_array[i];
- fd->msglen = strlen(fileset->include_array[i]);
- if (!bnet_send(fd)) {
- Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n"));
- goto bail_out;
- }
- fd->msg = msgsave;
- break;
}
}
bnet_sig(fd, BNET_EOD); /* end of data */
- if (!response(fd, OKinc, "Include")) {
- goto bail_out;
+ if (list == INC_LIST) {
+ if (!response(jcr, fd, OKinc, "Include", DISPLAY_ERROR)) {
+ goto bail_out;
+ }
+ } else if (!response(jcr, fd, OKexc, "Exclude", DISPLAY_ERROR)) {
+ goto bail_out;
}
return 1;
}
+/*
+ * Send include list to File daemon
+ */
+int send_include_list(JCR *jcr)
+{
+ BSOCK *fd = jcr->file_bsock;
+ fd->msglen = sprintf(fd->msg, inc);
+ bnet_send(fd);
+ return send_list(jcr, INC_LIST);
+}
+
+
/*
* Send exclude list to File daemon
*/
int send_exclude_list(JCR *jcr)
{
- FILESET *fileset;
- BSOCK *fd;
- int i;
- char *msgsave;
+ BSOCK *fd = jcr->file_bsock;
+ fd->msglen = sprintf(fd->msg, exc);
+ bnet_send(fd);
+ return send_list(jcr, EXC_LIST);
+}
- fd = jcr->file_bsock;
- fileset = jcr->fileset;
- msgsave = fd->msg;
- fd->msglen = sprintf(fd->msg, exc);
+/*
+ * Send bootstrap file if any to the File daemon.
+ * This is used for restore and verify VolumeToCatalog
+ */
+int send_bootstrap_file(JCR *jcr)
+{
+ FILE *bs;
+ char buf[1000];
+ BSOCK *fd = jcr->file_bsock;
+ char *bootstrap = "bootstrap\n";
+
+ Dmsg1(400, "send_bootstrap_file: %s\n", jcr->RestoreBootstrap);
+ if (!jcr->RestoreBootstrap) {
+ return 1;
+ }
+ bs = fopen(jcr->RestoreBootstrap, "r");
+ if (!bs) {
+ Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"),
+ jcr->RestoreBootstrap, strerror(errno));
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ return 0;
+ }
+ strcpy(fd->msg, bootstrap);
+ fd->msglen = strlen(fd->msg);
bnet_send(fd);
- for (i=0; i < fileset->num_excludes; i++) {
- fd->msglen = strlen(fileset->exclude_array[i]);
- Dmsg1(120, "dird>filed: exclude file: %s\n", fileset->exclude_array[i]);
- fd->msg = fileset->exclude_array[i];
- if (!bnet_send(fd)) {
- Jmsg(jcr, M_FATAL, 0, _(">filed: write error on socket\n"));
- set_jcr_job_status(jcr, JS_ErrorTerminated);
- return 0;
- }
+ while (fgets(buf, sizeof(buf), bs)) {
+ fd->msglen = Mmsg(&fd->msg, "%s", buf);
+ bnet_send(fd);
}
bnet_sig(fd, BNET_EOD);
- fd->msg = msgsave;
- if (!response(fd, OKexc, "Exclude")) {
+ fclose(bs);
+ if (!response(jcr, fd, OKbootstrap, "Bootstrap", DISPLAY_ERROR)) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
return 0;
}
Dmsg0(120, "bdird: waiting to receive file attributes\n");
/* Pickup file attributes and signature */
- while (!fd->errors && (n = bget_msg(fd, 0)) > 0) {
+ while (!fd->errors && (n = bget_dirmsg(fd)) > 0) {
/*****FIXME****** improve error handling to stop only on
* really fatal problems, or the number of errors is too
long file_index;
int stream, len;
char *attr, *p, *fn;
- char Opts_MD5[MAXSTRING]; /* either Verify opts or MD5 signature */
- char MD5[MAXSTRING];
+ char Opts_SIG[MAXSTRING]; /* either Verify opts or MD5/SHA1 signature */
+ char SIG[MAXSTRING];
jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
- if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Opts_MD5)) != 3) {
+ if ((len = sscanf(fd->msg, "%ld %d %s", &file_index, &stream, Opts_SIG)) != 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);
skip_spaces(&p);
skip_nonspaces(&p); /* skip Stream */
skip_spaces(&p);
- skip_nonspaces(&p); /* skip Opts_MD5 */
+ skip_nonspaces(&p); /* skip Opts_SHA1 */
p++; /* skip space */
fn = jcr->fname;
while (*p != 0) {
*fn = *p++; /* term filename and point to attribs */
attr = p;
- if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_WIN32_ATTRIBUTES) {
+ if (stream == STREAM_UNIX_ATTRIBUTES || stream == STREAM_UNIX_ATTRIBUTES_EX) {
jcr->JobFiles++;
jcr->FileIndex = file_index;
ar.attr = attr;
continue;
}
jcr->FileId = ar.FileId;
- } else if (stream == STREAM_MD5_SIGNATURE) {
+ } else if (stream == STREAM_MD5_SIGNATURE || stream == STREAM_SHA1_SIGNATURE) {
if (jcr->FileIndex != (uint32_t)file_index) {
- Jmsg2(jcr, M_ERROR, 0, _("MD5 index %d not same as attributes %d\n"),
+ Jmsg2(jcr, M_ERROR, 0, _("MD5/SHA1 index %d not same as attributes %d\n"),
file_index, jcr->FileIndex);
set_jcr_job_status(jcr, JS_Error);
continue;
}
- db_escape_string(MD5, Opts_MD5, strlen(Opts_MD5));
- Dmsg2(120, "MD5len=%d MD5=%s\n", strlen(MD5), MD5);
- if (!db_add_MD5_to_file_record(jcr, jcr->db, jcr->FileId, MD5)) {
+ db_escape_string(SIG, Opts_SIG, strlen(Opts_SIG));
+ Dmsg2(120, "SIGlen=%d SIG=%s\n", strlen(SIG), SIG);
+ if (!db_add_SIG_to_file_record(jcr, jcr->db, jcr->FileId, SIG,
+ stream==STREAM_MD5_SIGNATURE?MD5_SIG:SHA1_SIG)) {
Jmsg1(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
set_jcr_job_status(jcr, JS_Error);
}
projects / bacula / bacula / blobdiff