/* 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.
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 num;
fd = jcr->file_bsock;
fileset = jcr->fileset;
- fd->msglen = sprintf(fd->msg, inc);
- bnet_send(fd);
- for (int 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];
int optlen, stat;
INCEXE *ie;
- ie = fileset->include_items[i];
+ 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++) {
+ switch (*p) {
case '|':
fd->msg = edit_job_codes(jcr, fd->msg, p, "");
bpipe = open_bpipe(fd->msg, 0, "r");
optlen = strlen(buf);
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);
+ 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;
}
break;
case '<':
+ p++; /* skip over < */
if ((ffd = fopen(p, "r")) == NULL) {
- Jmsg(jcr, M_FATAL, 0, _("Cannot open included file: %s. ERR=%s\n"),
- p, strerror(errno));
+ 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 */
}
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);
} else {
pm_strcpy(&fd->msg, "0 ");
}
- pm_strcat(&fd->msg, ie->name_list[j]);
- Dmsg1(000, "Include name=%s\n", fd->msg);
+ 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"));
}
}
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;
+ 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;
- 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 (int i=0; i < fileset->num_excludes; i++) {
- INCEXE *ie;
- ie = fileset->exclude_items[i];
- for (int j=0; j<ie->num_names; j++) {
- pm_strcpy(&fd->msg, ie->name_list[j]);
- fd->msglen = strlen(fd->msg);
- Dmsg1(200, "Exclude name: %s\n", fd->msg);
- 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);
- 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
*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;
projects / bacula / bacula / blobdiff