*
*/
/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ Copyright (C) 2000-2005 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
extern char my_name[];
extern CLIENT *me; /* our client resource */
-
+
/* Imported functions */
extern int status_cmd(JCR *jcr);
-
+extern int qstatus_cmd(JCR *jcr);
+
/* Forward referenced functions */
static int backup_cmd(JCR *jcr);
static int bootstrap_cmd(JCR *jcr);
/* Exported functions */
struct s_cmds {
- char *cmd;
+ const char *cmd;
int (*func)(JCR *);
+ int monitoraccess; /* specify if monitors have access to this function */
};
-/*
- * The following are the recognized commands from the Director.
+/*
+ * The following are the recognized commands from the Director.
*/
static struct s_cmds cmds[] = {
- {"backup", backup_cmd},
- {"cancel", cancel_cmd},
- {"setdebug=", setdebug_cmd},
- {"estimate", estimate_cmd},
- {"exclude", exclude_cmd},
- {"Hello", hello_cmd},
- {"include", include_cmd},
- {"fileset", fileset_cmd},
- {"JobId=", job_cmd},
- {"level = ", level_cmd},
- {"restore", restore_cmd},
- {"session", session_cmd},
- {"status", status_cmd},
- {"storage ", storage_cmd},
- {"verify", verify_cmd},
- {"bootstrap", bootstrap_cmd},
- {"RunBeforeJob", runbefore_cmd},
- {"RunAfterJob", runafter_cmd},
+ {"backup", backup_cmd, 0},
+ {"cancel", cancel_cmd, 0},
+ {"setdebug=", setdebug_cmd, 0},
+ {"estimate", estimate_cmd, 0},
+ {"exclude", exclude_cmd, 0},
+ {"Hello", hello_cmd, 1},
+ {"include", include_cmd, 0},
+ {"fileset", fileset_cmd, 0},
+ {"JobId=", job_cmd, 0},
+ {"level = ", level_cmd, 0},
+ {"restore", restore_cmd, 0},
+ {"session", session_cmd, 0},
+ {"status", status_cmd, 1},
+ {".status", qstatus_cmd, 1},
+ {"storage ", storage_cmd, 0},
+ {"verify", verify_cmd, 0},
+ {"bootstrap", bootstrap_cmd, 0},
+ {"RunBeforeJob", runbefore_cmd, 0},
+ {"RunAfterJob", runafter_cmd, 0},
{NULL, NULL} /* list terminator */
};
/* Responses sent to Director */
static char errmsg[] = "2999 Invalid command\n";
static char no_auth[] = "2998 No Authorization\n";
+static char illegal_cmd[] = "2997 Illegal command for a Director with Monitor directive enabled\n";
static char OKinc[] = "2000 OK include\n";
static char OKest[] = "2000 OK estimate files=%u bytes=%s\n";
static char OKexc[] = "2000 OK exclude\n";
static char read_data[] = "read data %d\n";
static char read_close[] = "read close session %d\n";
-/*
+/*
* Accept requests from a Director
*
* NOTE! We are running as a separate thread
*/
void *handle_client_request(void *dirp)
{
- int i;
+ int i;
bool found, quit;
JCR *jcr;
BSOCK *dir = (BSOCK *)dirp;
jcr->last_fname = get_pool_memory(PM_FNAME);
jcr->last_fname[0] = 0;
jcr->client_name = get_memory(strlen(my_name) + 1);
- pm_strcpy(&jcr->client_name, my_name);
+ pm_strcpy(jcr->client_name, my_name);
dir->jcr = jcr;
enable_backup_privileges(NULL, 1 /* ignore_errors */);
/* Read command */
if (bnet_recv(dir) < 0) {
- break; /* connection terminated */
+ break; /* connection terminated */
}
dir->msg[dir->msglen] = 0;
Dmsg1(100, "<dird: %s", dir->msg);
found = false;
for (i=0; cmds[i].cmd; i++) {
if (strncmp(cmds[i].cmd, dir->msg, strlen(cmds[i].cmd)) == 0) {
+ found = true; /* indicate command found */
if (!jcr->authenticated && cmds[i].func != hello_cmd) {
bnet_fsend(dir, no_auth);
+ bnet_sig(dir, BNET_EOD);
+ break;
+ }
+ if ((jcr->authenticated) && (!cmds[i].monitoraccess) && (jcr->director->monitor)) {
+ Dmsg1(100, "Command %s illegal.\n", cmds[i].cmd);
+ bnet_fsend(dir, illegal_cmd);
+ bnet_sig(dir, BNET_EOD);
break;
}
- found = true; /* indicate command found */
Dmsg1(100, "Executing %s command.\n", cmds[i].cmd);
- if (!cmds[i].func(jcr)) { /* do command */
- quit = true; /* error or fully terminated, get out */
+ if (!cmds[i].func(jcr)) { /* do command */
+ quit = true; /* error or fully terminated, get out */
Dmsg0(20, "Quit command loop due to command error or Job done.\n");
}
break;
}
}
- if (!found) { /* command not found */
+ if (!found) { /* command not found */
bnet_fsend(dir, errmsg);
quit = true;
break;
if (jcr->RunAfterJob && !job_canceled(jcr)) {
run_cmd(jcr, jcr->RunAfterJob, "ClientRunAfterJob");
}
+ dequeue_messages(jcr); /* send any queued messages */
/* Inform Director that we are done */
bnet_sig(dir, BNET_TERMINATE);
FF_PKT *ff = (FF_PKT *)jcr->ff;
findFILESET *fileset = ff->fileset;
if (fileset) {
- int i, j;
+ int i, j, k;
/* Delete FileSet Include lists */
for (i=0; i<fileset->include_list.size(); i++) {
findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i);
for (j=0; j<incexe->opts_list.size(); j++) {
findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
+ for (k=0; k<fo->regex.size(); k++) {
+ regfree((regex_t *)fo->regex.get(k));
+ }
fo->regex.destroy();
+ fo->regexdir.destroy();
+ fo->regexfile.destroy();
fo->wild.destroy();
+ fo->wilddir.destroy();
+ fo->wildfile.destroy();
fo->base.destroy();
+ fo->fstype.destroy();
+ if (fo->reader) {
+ free(fo->reader);
+ }
+ if (fo->writer) {
+ free(fo->writer);
+ }
}
incexe->opts_list.destroy();
incexe->name_list.destroy();
for (j=0; j<incexe->opts_list.size(); j++) {
findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
fo->regex.destroy();
+ fo->regexdir.destroy();
+ fo->regexfile.destroy();
fo->wild.destroy();
+ fo->wilddir.destroy();
+ fo->wildfile.destroy();
fo->base.destroy();
+ fo->fstype.destroy();
}
incexe->opts_list.destroy();
incexe->name_list.destroy();
}
/*
- * Hello from Director he must identify himself and provide his
+ * Hello from Director he must identify himself and provide his
* password.
*/
static int hello_cmd(JCR *jcr)
return 0;
}
Dmsg0(120, "OK Authenticate\n");
- jcr->authenticated = TRUE;
+ jcr->authenticated = true;
return 1;
}
P(cjcr->mutex);
cjcr->store_bsock->timed_out = 1;
cjcr->store_bsock->terminated = 1;
-/*
+/*
* #if !defined(HAVE_CYGWIN) && !defined(HAVE_WIN32)
*/
#if !defined(HAVE_CYGWIN)
Dmsg1(110, "setdebug_cmd: %s", dir->msg);
if (sscanf(dir->msg, "setdebug=%d trace=%d", &level, &trace_flag) != 2 || level < 0) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
bnet_fsend(dir, "2991 Bad setdebug command: %s\n", jcr->errmsg);
- return 0;
+ return 0;
}
debug_level = level;
set_trace(trace_flag);
char ed2[50];
if (sscanf(dir->msg, estimatecmd, &jcr->listing) != 1) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_FATAL, 0, _("Bad estimate command: %s"), jcr->errmsg);
bnet_fsend(dir, "2992 Bad estimate command.\n");
return 0;
}
make_estimate(jcr);
- bnet_fsend(dir, OKest, jcr->num_files_examined,
+ bnet_fsend(dir, OKest, jcr->num_files_examined,
edit_uint64_with_commas(jcr->JobBytes, ed2));
bnet_sig(dir, BNET_EOD);
return 1;
POOLMEM *sd_auth_key;
sd_auth_key = get_memory(dir->msglen);
- if (sscanf(dir->msg, jobcmd, &jcr->JobId, jcr->Job,
+ if (sscanf(dir->msg, jobcmd, &jcr->JobId, jcr->Job,
&jcr->VolSessionId, &jcr->VolSessionTime,
sd_auth_key) != 5) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_FATAL, 0, _("Bad Job Command: %s"), jcr->errmsg);
bnet_fsend(dir, BADjob);
free_pool_memory(sd_auth_key);
Dmsg1(100, "runbefore_cmd: %s", dir->msg);
if (sscanf(dir->msg, runbefore, cmd) != 1) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad RunBeforeJob command: %s\n"), jcr->errmsg);
bnet_fsend(dir, "2905 Bad RunBeforeJob command.\n");
free_memory(cmd);
Dmsg1(100, "runafter_cmd: %s", dir->msg);
if (sscanf(dir->msg, runafter, msg) != 1) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad RunAfter command: %s\n"), jcr->errmsg);
bnet_fsend(dir, "2905 Bad RunAfterJob command.\n");
free_memory(msg);
free_pool_memory(jcr->RunAfterJob);
}
jcr->RunAfterJob = get_pool_memory(PM_FNAME);
- pm_strcpy(&jcr->RunAfterJob, msg);
+ pm_strcpy(jcr->RunAfterJob, msg);
free_pool_memory(msg);
return bnet_fsend(dir, OKRunAfter);
}
int status;
BPIPE *bpipe;
char line[MAXSTRING];
-
+
ecmd = edit_job_codes(jcr, ecmd, cmd, "");
bpipe = open_bpipe(ecmd, 0, "r");
free_pool_memory(ecmd);
if (bpipe == NULL) {
- Jmsg(jcr, M_FATAL, 0, _("%s could not execute\n"), name);
- set_jcr_job_status(jcr, JS_FatalError);
+ berrno be;
+ Jmsg(jcr, M_FATAL, 0, _("%s could not execute. ERR=%s\n"), name,
+ be.strerror());
return 0;
}
while (fgets(line, sizeof(line), bpipe->rfd)) {
+ int len = strlen(line);
+ if (len > 0 && line[len-1] != '\n') {
+ bstrncat(line, "\n", sizeof(line));
+ }
Jmsg(jcr, M_INFO, 0, _("%s: %s"), name, line);
}
status = close_bpipe(bpipe);
if (status != 0) {
- Jmsg(jcr, M_FATAL, 0, _("%s returned non-zero status=%d\n"), name,
- status);
- set_jcr_job_status(jcr, JS_FatalError);
+ berrno be;
+ Jmsg(jcr, M_FATAL, 0, _("%s returned non-zero status=%d. ERR=%s\n"), name,
+ status, be.strerror(status));
return 0;
}
return 1;
case '<':
p++; /* skip over < */
if ((ffd = fopen(p, "r")) == NULL) {
+ berrno be;
Jmsg(jcr, M_FATAL, 0, _("Cannot open %s file: %s. ERR=%s\n"),
- list==INC_LIST?"included":"excluded", p, strerror(errno));
+ list==INC_LIST?"included":"excluded", p, be.strerror());
return;
}
/* Copy File options */
}
}
-/*
- *
+/*
+ *
* Get list of files/directories to include from Director
*
*/
return bnet_fsend(dir, OKinc);
}
-static bool init_fileset(JCR *jcr)
+static bool init_fileset(JCR *jcr)
{
FF_PKT *ff;
findFILESET *fileset;
- if (!jcr->ff) {
+ if (!jcr->ff) {
return false;
}
ff = (FF_PKT *)jcr->ff;
findFOPTS *fo = (findFOPTS *)malloc(sizeof(findFOPTS));
memset(fo, 0, sizeof(findFOPTS));
fo->regex.init(1, true);
+ fo->regexdir.init(1, true);
+ fo->regexfile.init(1, true);
fo->wild.init(1, true);
+ fo->wilddir.init(1, true);
+ fo->wildfile.init(1, true);
fo->base.init(1, true);
+ fo->fstype.init(1, true);
incexe->current_opts = fo;
incexe->opts_list.append(fo);
}
case '<':
p++; /* skip over < */
if ((ffd = fopen(p, "r")) == NULL) {
+ berrno be;
Jmsg(jcr, M_FATAL, 0, _("Cannot open FileSet input file: %s. ERR=%s\n"),
- p, strerror(errno));
+ p, be.strerror());
return;
}
while (fgets(buf, sizeof(buf), ffd)) {
}
}
-
+
static void add_fileset(JCR *jcr, const char *item)
{
FF_PKT *ff = (FF_PKT *)jcr->ff;
int state = fileset->state;
findFOPTS *current_opts;
+ /* Get code, optional subcode, and position item past the dividing space */
Dmsg1(100, "%s\n", item);
int code = item[0];
- if (item[1] == ' ') { /* If string follows */
- item += 2; /* point to string */
+ if (code != '\0') {
+ ++item;
+ }
+ int subcode = ' '; /* A space is always a valid subcode */
+ if (item[0] != '\0' && item[0] != ' ') {
+ subcode = item[0];
+ ++item;
+ }
+ if (*item == ' ') {
+ ++item;
}
+ /* Skip all lines we receive after an error */
if (state == state_error) {
return;
}
+
+ /*
+ * The switch tests the code for validity.
+ * The subcode is always good if it is a space, otherwise we must confirm.
+ * We set state to state_error first assuming the subcode is invalid,
+ * requiring state to be set in cases below that handle subcodes.
+ */
+ if (subcode != ' ') {
+ state = state_error;
+ }
switch (code) {
case 'I':
/* New include */
break;
case 'R':
current_opts = start_options(ff);
- current_opts->regex.append(bstrdup(item));
+ regex_t *preg;
+ int rc;
+ char prbuf[500];
+ preg = (regex_t *)malloc(sizeof(regex_t));
+ if (current_opts->flags & FO_IGNORECASE) {
+ rc = regcomp(preg, item, REG_EXTENDED|REG_ICASE);
+ } else {
+ rc = regcomp(preg, item, REG_EXTENDED);
+ }
+ if (rc != 0) {
+ regerror(rc, preg, prbuf, sizeof(prbuf));
+ regfree(preg);
+ free(preg);
+ Jmsg(jcr, M_FATAL, 0, "REGEX %s compile error. ERR=%s\n", item, prbuf);
+ state = state_error;
+ break;
+ }
state = state_options;
+ if (subcode == ' ') {
+ current_opts->regex.append(preg);
+ } else if (subcode == 'D') {
+ current_opts->regexdir.append(preg);
+ } else if (subcode == 'F') {
+ current_opts->regexfile.append(preg);
+ } else {
+ state = state_error;
+ }
break;
case 'B':
current_opts = start_options(ff);
current_opts->base.append(bstrdup(item));
state = state_options;
break;
+ case 'X':
+ current_opts = start_options(ff);
+ current_opts->fstype.append(bstrdup(item));
+ state = state_options;
+ break;
case 'W':
current_opts = start_options(ff);
- current_opts->wild.append(bstrdup(item));
state = state_options;
+ if (subcode == ' ') {
+ current_opts->wild.append(bstrdup(item));
+ } else if (subcode == 'D') {
+ current_opts->wilddir.append(bstrdup(item));
+ } else if (subcode == 'F') {
+ current_opts->wildfile.append(bstrdup(item));
+ } else {
+ state = state_error;
+ }
break;
- case 'O':
+ case 'O':
current_opts = start_options(ff);
set_options(current_opts, item);
state = state_options;
break;
+ case 'D':
+ current_opts = start_options(ff);
+ current_opts->reader = bstrdup(item);
+ state = state_options;
+ break;
+ case 'T':
+ current_opts = start_options(ff);
+ current_opts->writer = bstrdup(item);
+ state = state_options;
+ break;
default:
Jmsg(jcr, M_FATAL, 0, "Invalid FileSet command: %s\n", item);
state = state_error;
for (k=0; k<fo->regex.size(); k++) {
Dmsg1(400, "R %s\n", (char *)fo->regex.get(k));
}
+ for (k=0; k<fo->regexdir.size(); k++) {
+ Dmsg1(400, "RD %s\n", (char *)fo->regexdir.get(k));
+ }
+ for (k=0; k<fo->regexfile.size(); k++) {
+ Dmsg1(400, "RF %s\n", (char *)fo->regexfile.get(k));
+ }
for (k=0; k<fo->wild.size(); k++) {
Dmsg1(400, "W %s\n", (char *)fo->wild.get(k));
}
+ for (k=0; k<fo->wilddir.size(); k++) {
+ Dmsg1(400, "WD %s\n", (char *)fo->wilddir.get(k));
+ }
+ for (k=0; k<fo->wildfile.size(); k++) {
+ Dmsg1(400, "WF %s\n", (char *)fo->wildfile.get(k));
+ }
for (k=0; k<fo->base.size(); k++) {
Dmsg1(400, "B %s\n", (char *)fo->base.get(k));
}
+ for (k=0; k<fo->fstype.size(); k++) {
+ Dmsg1(400, "X %s\n", (char *)fo->fstype.get(k));
+ }
+ if (fo->reader) {
+ Dmsg1(400, "D %s\n", fo->reader);
+ }
+ if (fo->writer) {
+ Dmsg1(400, "T %s\n", fo->writer);
+ }
}
for (j=0; j<incexe->name_list.size(); j++) {
Dmsg1(400, "F %s\n", (char *)incexe->name_list.get(j));
for (k=0; k<fo->regex.size(); k++) {
Dmsg1(400, "R %s\n", (char *)fo->regex.get(k));
}
+ for (k=0; k<fo->regexdir.size(); k++) {
+ Dmsg1(400, "RD %s\n", (char *)fo->regexdir.get(k));
+ }
+ for (k=0; k<fo->regexfile.size(); k++) {
+ Dmsg1(400, "RF %s\n", (char *)fo->regexfile.get(k));
+ }
for (k=0; k<fo->wild.size(); k++) {
Dmsg1(400, "W %s\n", (char *)fo->wild.get(k));
}
+ for (k=0; k<fo->wilddir.size(); k++) {
+ Dmsg1(400, "WD %s\n", (char *)fo->wilddir.get(k));
+ }
+ for (k=0; k<fo->wildfile.size(); k++) {
+ Dmsg1(400, "WF %s\n", (char *)fo->wildfile.get(k));
+ }
for (k=0; k<fo->base.size(); k++) {
Dmsg1(400, "B %s\n", (char *)fo->base.get(k));
}
+ for (k=0; k<fo->fstype.size(); k++) {
+ Dmsg1(400, "X %s\n", (char *)fo->fstype.get(k));
+ }
}
for (j=0; j<incexe->name_list.size(); j++) {
Dmsg1(400, "F %s\n", (char *)incexe->name_list.get(j));
case 'h': /* no recursion */
fo->flags |= FO_NO_RECURSION;
break;
+ case 'H': /* no hard link handling */
+ fo->flags |= FO_NO_HARDLINK;
+ break;
+ case 'i':
+ fo->flags |= FO_IGNORECASE;
+ break;
case 'M': /* MD5 */
fo->flags |= FO_MD5;
break;
case 'p': /* use portable data format */
fo->flags |= FO_PORTABLE;
break;
+ case 'R': /* Resource forks and Finder Info */
+ fo->flags |= FO_HFSPLUS;
case 'r': /* read fifo */
fo->flags |= FO_READFIFO;
break;
case 'k':
fo->flags |= FO_KEEPATIME;
break;
+ case 'A':
+ fo->flags |= FO_ACL;
+ break;
case 'V': /* verify options */
/* Copy Verify Options */
for (j=0; *p && *p != ':'; p++) {
break;
}
}
-}
+}
/*
- * Director is passing his Fileset
+ * Director is passing his Fileset
*/
static int fileset_cmd(JCR *jcr)
{
unlink(jcr->RestoreBootstrap);
free_pool_memory(jcr->RestoreBootstrap);
}
- Mmsg(&fname, "%s/%s.%s.bootstrap", me->working_directory, me->hdr.name,
+ Mmsg(fname, "%s/%s.%s.bootstrap", me->working_directory, me->hdr.name,
jcr->Job);
Dmsg1(400, "bootstrap=%s\n", fname);
jcr->RestoreBootstrap = fname;
bs = fopen(fname, "a+"); /* create file */
if (!bs) {
- /*
+ berrno be;
+ /*
* Suck up what he is sending to us so that he will then
* read our error message.
*/
{ }
Jmsg(jcr, M_FATAL, 0, _("Could not create bootstrap file %s: ERR=%s\n"),
- jcr->RestoreBootstrap, strerror(errno));
+ jcr->RestoreBootstrap, be.strerror());
free_pool_memory(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
set_jcr_job_status(jcr, JS_ErrorTerminated);
/* Base backup requested? */
if (strcmp(level, "base") == 0) {
jcr->JobLevel = L_BASE;
- /* Full backup requested? */
+ /* Full backup requested? */
} else if (strcmp(level, "full") == 0) {
jcr->JobLevel = L_FULL;
- /*
+ /*
* Backup requested since <date> <time>
* This form is also used for incremental and differential
* This code is deprecated. See since_utime for new code.
*/
} else if (strcmp(level, "since") == 0) {
jcr->JobLevel = L_SINCE;
- if (sscanf(dir->msg, "level = since %d-%d-%d %d:%d:%d mtime_only=%d",
+ if (sscanf(dir->msg, "level = since %d-%d-%d %d:%d:%d mtime_only=%d",
&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
&tm.tm_hour, &tm.tm_min, &tm.tm_sec, &mtime_only) != 7) {
goto bail_out;
}
tm.tm_year -= 1900;
tm.tm_mon -= 1;
- tm.tm_wday = tm.tm_yday = 0;
+ tm.tm_wday = tm.tm_yday = 0;
tm.tm_isdst = -1;
mtime = mktime(&tm);
Dmsg2(100, "Got since time: %s mtime_only=%d\n", ctime(&mtime), mtime_only);
utime_t since_time, adj;
btime_t his_time, bt_start, rt=0, bt_adj=0;
jcr->JobLevel = L_SINCE;
- if (sscanf(dir->msg, "level = since_utime %s mtime_only=%d",
- buf, &mtime_only) != 2) {
+ if (sscanf(dir->msg, "level = since_utime %s mtime_only=%d",
+ buf, &mtime_only) != 2) {
goto bail_out;
}
since_time = str_to_uint64(buf); /* this is the since time */
char ed1[50], ed2[50];
- /*
- * Sync clocks by polling him for the time. We take
+ /*
+ * Sync clocks by polling him for the time. We take
* 10 samples of his time throwing out the first two.
*/
for (int i=0; i<10; i++) {
Dmsg2(100, "adj = %d since_time=%d\n", (int)adj, (int)since_time);
jcr->incremental = 1; /* set incremental or decremental backup */
- jcr->mtime = since_time; /* set since time */
+ jcr->mtime = (time_t)since_time; /* set since time */
} else {
Jmsg1(jcr, M_FATAL, 0, "Unknown backup level: %s\n", level);
free_memory(level);
return bnet_fsend(dir, OKlevel);
bail_out:
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad level command: %s\n"), jcr->errmsg);
free_memory(level);
if (buf) {
Dmsg1(100, "SessionCmd: %s", dir->msg);
if (sscanf(dir->msg, sessioncmd, jcr->VolumeName,
&jcr->VolSessionId, &jcr->VolSessionTime,
- &jcr->StartFile, &jcr->EndFile,
+ &jcr->StartFile, &jcr->EndFile,
&jcr->StartBlock, &jcr->EndBlock) != 7) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_FATAL, 0, "Bad session command: %s", jcr->errmsg);
return 0;
}
Dmsg1(100, "StorageCmd: %s", dir->msg);
if (sscanf(dir->msg, storaddr, &jcr->stored_addr, &stored_port, &enable_ssl) != 3) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_FATAL, 0, _("Bad storage command: %s"), jcr->errmsg);
return 0;
}
Dmsg3(110, "Open storage: %s:%d ssl=%d\n", jcr->stored_addr, stored_port, enable_ssl);
/* Open command communications with Storage daemon */
/* Try to connect for 1 hour at 10 second intervals */
- sd = bnet_connect(jcr, 10, me->SDConnectTimeout, _("Storage daemon"),
+ sd = bnet_connect(jcr, 10, (int)me->SDConnectTimeout, _("Storage daemon"),
jcr->stored_addr, NULL, stored_port, 1);
if (sd == NULL) {
Jmsg(jcr, M_FATAL, 0, _("Failed to connect to Storage daemon: %s:%d\n"),
jcr->stored_addr, stored_port);
return 0;
}
+ Dmsg0(110, "Connection OK to SD.\n");
jcr->store_bsock = sd;
}
-/*
+/*
* Do a backup. For now, we handle only Full and Incremental.
*/
static int backup_cmd(JCR *jcr)
-{
+{
BSOCK *dir = jcr->dir_bsock;
BSOCK *sd = jcr->store_bsock;
int ok = 0;
bnet_fsend(dir, OKbackup);
Dmsg1(110, "bfiled>dird: %s", dir->msg);
- /*
+ /*
* Send Append Open Session to Storage daemon
*/
bnet_fsend(sd, append_open);
Dmsg1(110, ">stored: %s", sd->msg);
- /*
+ /*
* Expect to receive back the Ticket number
*/
if (bget_msg(sd) >= 0) {
goto cleanup;
}
- /*
+ /*
* Send Append data command to Storage daemon
*/
bnet_fsend(sd, append_data, jcr->Ticket);
Dmsg1(110, ">stored: %s", sd->msg);
- /*
- * Expect to get OK data
+ /*
+ * Expect to get OK data
*/
Dmsg1(110, "<stored: %s", sd->msg);
if (!response(jcr, sd, OK_data, "Append Data")) {
goto cleanup;
}
-
+
/*
* Send Files to Storage daemon
*/
bnet_suppress_error_messages(sd, 1);
goto cleanup; /* bail out now */
}
- /*
+ /*
* Expect to get response to append_data from Storage daemon
*/
if (!response(jcr, sd, OK_append, "Append Data")) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
goto cleanup;
}
-
- /*
+
+ /*
* Send Append End Data to Storage daemon
*/
bnet_fsend(sd, append_end, jcr->Ticket);
}
cleanup:
- bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles,
- edit_uint64(jcr->ReadBytes, ed1),
- edit_uint64(jcr->JobBytes, ed2), jcr->Errors);
+ bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles,
+ edit_uint64(jcr->ReadBytes, ed1),
+ edit_uint64(jcr->JobBytes, ed2), jcr->Errors);
Dmsg1(110, "End FD msg: %s\n", dir->msg);
return 0; /* return and stop command loop */
}
-/*
+/*
* Do a Verify for Director
*
*/
static int verify_cmd(JCR *jcr)
-{
+{
BSOCK *dir = jcr->dir_bsock;
BSOCK *sd = jcr->store_bsock;
char level[100], ed1[50], ed2[50];
jcr->JobType = JT_VERIFY;
if (sscanf(dir->msg, verifycmd, level) != 1) {
bnet_fsend(dir, "2994 Bad verify command: %s\n", dir->msg);
- return 0;
+ return 0;
}
if (strcasecmp(level, "init") == 0) {
jcr->JobLevel = L_VERIFY_INIT;
jcr->JobLevel = L_VERIFY_DATA;
} else if (strcasecmp(level, "disk_to_catalog") == 0) {
jcr->JobLevel = L_VERIFY_DISK_TO_CATALOG;
- } else {
+ } else {
bnet_fsend(dir, "2994 Bad verify level: %s\n", dir->msg);
- return 0;
+ return 0;
}
bnet_fsend(dir, OKverify);
start_dir_heartbeat(jcr);
do_verify_volume(jcr);
stop_dir_heartbeat(jcr);
- /*
+ /*
* Send Close session command to Storage daemon
*/
bnet_fsend(sd, read_close, jcr->Ticket);
break;
default:
bnet_fsend(dir, "2994 Bad verify level: %s\n", dir->msg);
- return 0;
+ return 0;
}
bnet_sig(dir, BNET_EOD);
/* Send termination status back to Dir */
- bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles,
- edit_uint64(jcr->ReadBytes, ed1),
- edit_uint64(jcr->JobBytes, ed2), jcr->Errors);
+ bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles,
+ edit_uint64(jcr->ReadBytes, ed1),
+ edit_uint64(jcr->JobBytes, ed2), jcr->Errors);
/* Inform Director that we are done */
bnet_sig(dir, BNET_TERMINATE);
return 0; /* return and terminate command loop */
}
-/*
+/*
* Do a Restore for Director
*
*/
static int restore_cmd(JCR *jcr)
-{
+{
BSOCK *dir = jcr->dir_bsock;
BSOCK *sd = jcr->store_bsock;
POOLMEM *where;
if (sscanf(dir->msg, restorecmd, &replace, &prefix_links, where) != 3) {
if (sscanf(dir->msg, restorecmd1, &replace, &prefix_links) != 2) {
- pm_strcpy(&jcr->errmsg, dir->msg);
+ pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_FATAL, 0, _("Bad replace command. CMD=%s\n"), jcr->errmsg);
return 0;
}
if (where[0] == '/' && where[1] == 0) {
where[0] = 0;
}
-
+
Dmsg2(150, "Got replace %c, where=%s\n", replace, where);
unbash_spaces(where);
jcr->where = bstrdup(where);
set_jcr_job_status(jcr, JS_Running);
- /*
+ /*
* Do restore of files and data
*/
start_dir_heartbeat(jcr);
do_restore(jcr);
stop_dir_heartbeat(jcr);
-
+
set_jcr_job_status(jcr, JS_Terminated);
if (jcr->JobStatus != JS_Terminated) {
bnet_suppress_error_messages(sd, 1);
}
- /*
+ /*
* Send Close session command to Storage daemon
*/
bnet_fsend(sd, read_close, jcr->Ticket);
set_jcr_job_status(jcr, JS_ErrorTerminated);
}
/* Send termination status back to Dir */
- bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles,
- edit_uint64(jcr->ReadBytes, ed1),
- edit_uint64(jcr->JobBytes, ed2), jcr->Errors);
+ bnet_fsend(dir, EndJob, jcr->JobStatus, jcr->JobFiles,
+ edit_uint64(jcr->ReadBytes, ed1),
+ edit_uint64(jcr->JobBytes, ed2), jcr->Errors);
/* Inform Director that we are done */
bnet_sig(dir, BNET_TERMINATE);
Dmsg4(120, "VolSessId=%ld VolsessT=%ld SF=%ld EF=%ld\n",
jcr->VolSessionId, jcr->VolSessionTime, jcr->StartFile, jcr->EndFile);
Dmsg2(120, "JobId=%d vol=%s\n", jcr->JobId, "DummyVolume");
- /*
+ /*
* Open Read Session with Storage daemon
*/
bnet_fsend(sd, read_open, jcr->VolumeName,
- jcr->VolSessionId, jcr->VolSessionTime, jcr->StartFile, jcr->EndFile,
+ jcr->VolSessionId, jcr->VolSessionTime, jcr->StartFile, jcr->EndFile,
jcr->StartBlock, jcr->EndBlock);
Dmsg1(110, ">stored: %s", sd->msg);
- /*
+ /*
* Get ticket number
*/
if (bget_msg(sd) >= 0) {
return 0;
}
- /*
+ /*
* Start read of data with Storage daemon
*/
bnet_fsend(sd, read_data, jcr->Ticket);
Dmsg1(110, ">stored: %s", sd->msg);
- /*
+ /*
* Get OK data
*/
if (!response(jcr, sd, OK_data, "Read Data")) {
return 1;
}
-/*
+/*
* Destroy the Job Control Record and associated
* resources (sockets).
*/
-static void filed_free_jcr(JCR *jcr)
+static void filed_free_jcr(JCR *jcr)
{
if (jcr->store_bsock) {
bnet_close(jcr->store_bsock);
free_pool_memory(jcr->RunAfterJob);
}
-
+
return;
}
if (strcmp(sd->msg, resp) == 0) {
return 1;
}
- }
+ }
if (job_canceled(jcr)) {
return 0; /* if canceled avoid useless error messages */
}
FILE *bs;
char buf[2000];
BSOCK *sd = jcr->store_bsock;
- char *bootstrap = "bootstrap\n";
+ const char *bootstrap = "bootstrap\n";
int stat = 0;
Dmsg1(400, "send_bootstrap_file: %s\n", jcr->RestoreBootstrap);
}
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));
+ berrno be;
+ Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"),
+ jcr->RestoreBootstrap, be.strerror());
set_jcr_job_status(jcr, JS_ErrorTerminated);
goto bail_out;
}
- pm_strcpy(&sd->msg, bootstrap);
- sd->msglen = strlen(sd->msg);
+ sd->msglen = pm_strcpy(sd->msg, bootstrap);
bnet_send(sd);
while (fgets(buf, sizeof(buf), bs)) {
- sd->msglen = Mmsg(&sd->msg, "%s", buf);
- bnet_send(sd);
+ sd->msglen = Mmsg(sd->msg, "%s", buf);
+ bnet_send(sd);
}
bnet_sig(sd, BNET_EOD);
fclose(bs);
projects / bacula / bacula / blobdiff