/* 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);
{"restore", restore_cmd},
{"session", session_cmd},
{"status", status_cmd},
+ {".status", qstatus_cmd},
{"storage ", storage_cmd},
{"verify", verify_cmd},
{"bootstrap", bootstrap_cmd},
static void bsock_sendit(const char *msg, int len, void *arg);
static const char *level_to_str(int level);
+/* Static variables */
+static char qstatus[] = ".status %s\n";
+
+static char OKqstatus[] = "2000 OK .status\n";
+static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
static int privs = 0;
return 1;
}
+/*
+ * .status command from Director
+ */
+int qstatus_cmd(JCR *jcr)
+{
+ BSOCK *dir = jcr->dir_bsock;
+ char time[dir->msglen+1];
+ JCR *njcr;
+ s_last_job* job;
+
+ if (sscanf(dir->msg, qstatus, time) != 1) {
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
+ bnet_fsend(dir, "2900 Bad .status command, missing argument.\n");
+ bnet_sig(dir, BNET_EOD);
+ return 0;
+ }
+ unbash_spaces(time);
+
+ if (strcmp(time, "current") == 0) {
+ bnet_fsend(dir, OKqstatus, time);
+ lock_jcr_chain();
+ foreach_jcr(njcr) {
+ if (njcr->JobId != 0) {
+ bnet_fsend(dir, DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
+ }
+ free_locked_jcr(njcr);
+ }
+ unlock_jcr_chain();
+ }
+ else if (strcmp(time, "last") == 0) {
+ bnet_fsend(dir, OKqstatus, time);
+ if ((last_jobs) && (last_jobs->size() > 0)) {
+ job = (s_last_job*)last_jobs->last();
+ bnet_fsend(dir, DotStatusJob, job->JobId, job->JobStatus, job->Errors);
+ }
+ }
+ else {
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
+ bnet_fsend(dir, "2900 Bad .status command, wrong argument.\n");
+ bnet_sig(dir, BNET_EOD);
+ return 0;
+ }
+
+ bnet_sig(dir, BNET_EOD);
+ return 1;
+}
/*
* Convert Job Level into a string
extern void terminate_child();
extern int job_cmd(JCR *jcr);
extern int status_cmd(JCR *sjcr);
+extern int qstatus_cmd(JCR *jcr);
/* Forward referenced functions */
static int label_cmd(JCR *jcr);
{"mount", mount_cmd},
{"unmount", unmount_cmd},
{"status", status_cmd},
+ {".status", qstatus_cmd},
{"autochanger", autochanger_cmd},
{"release", release_cmd},
{"readlabel", readlabel_cmd},
/* Static variables */
+static char qstatus[] = ".status %s\n";
+
+static char OKqstatus[] = "2000 OK .status\n";
+static char DotStatusJob[] = "JobId=%d JobStatus=%c JobErrors=%d\n";
/* Forward referenced functions */
user->msglen = len+1;
bnet_send(user);
}
+
+/*
+ * .status command from Director
+ */
+int qstatus_cmd(JCR *jcr)
+{
+ BSOCK *dir = jcr->dir_bsock;
+ char time[dir->msglen+1];
+ JCR *njcr;
+ s_last_job* job;
+
+ if (sscanf(dir->msg, qstatus, time) != 1) {
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
+ bnet_fsend(dir, "2900 Bad .status command, missing argument.\n");
+ bnet_sig(dir, BNET_EOD);
+ return 0;
+ }
+ unbash_spaces(time);
+
+ if (strcmp(time, "current") == 0) {
+ bnet_fsend(dir, OKqstatus, time);
+ lock_jcr_chain();
+ foreach_jcr(njcr) {
+ if (njcr->JobId != 0) {
+ bnet_fsend(dir, DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
+ }
+ free_locked_jcr(njcr);
+ }
+ unlock_jcr_chain();
+ }
+ else if (strcmp(time, "last") == 0) {
+ bnet_fsend(dir, OKqstatus, time);
+ if ((last_jobs) && (last_jobs->size() > 0)) {
+ job = (s_last_job*)last_jobs->last();
+ bnet_fsend(dir, DotStatusJob, job->JobId, job->JobStatus, job->Errors);
+ }
+ }
+ else {
+ pm_strcpy(&jcr->errmsg, dir->msg);
+ Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
+ bnet_fsend(dir, "2900 Bad .status command, wrong argument.\n");
+ bnet_sig(dir, BNET_EOD);
+ return 0;
+ }
+
+ bnet_sig(dir, BNET_EOD);
+ return 1;
+}