static int unmount_cmd(JCR *jcr);
static int autochanger_cmd(JCR *sjcr);
static int do_label(JCR *jcr, int relabel);
-static bool find_device(JCR *jcr, char *dname);
+static DEVICE *find_device(JCR *jcr, char *dname);
static void read_volume_label(JCR *jcr, DEVICE *dev, int Slot);
static void label_volume_if_ok(JCR *jcr, DEVICE *dev, char *oldname,
char *newname, char *poolname,
int Slot, int relabel);
struct s_cmds {
- char *cmd;
+ const char *cmd;
int (*func)(JCR *jcr);
};
* - We execute the command
* - We continue or exit depending on the return status
*/
-void *connection_request(void *arg)
+void *handle_connection_request(void *arg)
{
BSOCK *bs = (BSOCK *)arg;
JCR *jcr;
if (bnet_recv(bs) <= 0) {
Emsg0(M_ERROR, 0, _("Connection request failed.\n"));
+ bnet_close(bs);
return NULL;
}
*/
if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)-25) {
Emsg1(M_ERROR, 0, _("Invalid Dir connection. Len=%d\n"), bs->msglen);
+ bnet_close(bs);
+ return NULL;
}
/*
* See if this is a File daemon connection. If so
* call FD handler.
*/
- if (sscanf(bs->msg, "Hello Start Job %127s calling\n", name) == 1) {
+ Dmsg1(110, "Conn: %s", bs->msg);
+ if (sscanf(bs->msg, "Hello Start Job %127s", name) == 1) {
handle_filed_connection(bs, name);
return NULL;
}
+ Dmsg0(110, "Start Dir Job\n");
jcr = new_jcr(sizeof(JCR), stored_free_jcr); /* create Job Control Record */
jcr->dir_bsock = bs; /* save Director bsock */
jcr->dir_bsock->jcr = jcr;
+ /* Initialize FD start condition variable */
+ int errstat = pthread_cond_init(&jcr->job_start_wait, NULL);
+ if (errstat != 0) {
+ Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+ free_jcr(jcr);
+ return NULL;
+ }
Dmsg0(1000, "stored in start_job\n");
bnet_sig(jcr->file_bsock, BNET_TERMINATE);
}
/* If thread waiting on mount, wake him */
- if (jcr->device && jcr->device->dev &&
- (jcr->device->dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
- jcr->device->dev->dev_blocked == BST_UNMOUNTED ||
- jcr->device->dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) {
- pthread_cond_signal(&jcr->device->dev->wait_next_vol);
+ if (jcr->dcr && jcr->dcr->dev &&
+ (jcr->dcr->dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
+ jcr->dcr->dev->dev_blocked == BST_UNMOUNTED ||
+ jcr->dcr->dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) {
+ pthread_cond_signal(&jcr->dcr->dev->wait_next_vol);
}
bnet_fsend(dir, _("3000 Job %s marked to be canceled.\n"), jcr->Job);
free_jcr(jcr);
unbash_spaces(oldname);
unbash_spaces(poolname);
unbash_spaces(mtype);
- if (find_device(jcr, dname)) {
+ dev = find_device(jcr, dname);
+ if (dev) {
/******FIXME**** compare MediaTypes */
- dev = jcr->device->dev;
-
P(dev->mutex); /* Use P to avoid indefinite block */
if (!(dev->state & ST_OPENED)) {
label_volume_if_ok(jcr, dev, oldname, newname, poolname, slot, relabel);
/* Fall through wanted! */
case VOL_IO_ERROR:
case VOL_NO_LABEL:
- if (!write_volume_label_to_dev(jcr, jcr->device, newname, poolname)) {
+ if (!write_new_volume_label_to_dev(jcr, dev, newname, poolname)) {
bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
break;
}
return stat;
}
-static bool find_device(JCR *jcr, char *dname)
+static DEVICE *find_device(JCR *jcr, char *dname)
{
DEVRES *device = NULL;
bool found = false;
}
}
if (found) {
+ /*
+ * ****FIXME***** device->dev may not point to right device
+ * if there are multiple devices open
+ */
jcr->dcr = new_dcr(jcr, device->dev);
+ UnlockRes();
+ return jcr->dcr->dev;
}
UnlockRes();
- return found;
+ return NULL;
}
dname = get_memory(dir->msglen+1);
if (sscanf(dir->msg, "mount %s", dname) == 1) {
- if (find_device(jcr, dname)) {
+ dev = find_device(jcr, dname);
+ if (dev) {
DEV_BLOCK *block;
- dev = jcr->device->dev;
P(dev->mutex); /* Use P to avoid indefinite block */
switch (dev->dev_blocked) { /* device blocked? */
case BST_WAITING_FOR_SYSOP:
dname = get_memory(dir->msglen+1);
if (sscanf(dir->msg, "unmount %s", dname) == 1) {
- if (find_device(jcr, dname)) {
- dev = jcr->device->dev;
+ dev = find_device(jcr, dname);
+ if (dev) {
P(dev->mutex); /* Use P to avoid indefinite block */
if (!(dev->state & ST_OPENED)) {
Dmsg0(90, "Device already unmounted\n");
dname = get_memory(dir->msglen+1);
if (sscanf(dir->msg, "release %s", dname) == 1) {
- if (find_device(jcr, dname)) {
- dev = jcr->device->dev;
+ dev = find_device(jcr, dname);
+ if (dev) {
P(dev->mutex); /* Use P to avoid indefinite block */
if (!(dev->state & ST_OPENED)) {
Dmsg0(90, "Device already released\n");
dname = get_memory(dir->msglen+1);
if (sscanf(dir->msg, "autochanger list %s ", dname) == 1) {
- if (find_device(jcr, dname)) {
- dev = jcr->device->dev;
+ dev = find_device(jcr, dname);
+ if (dev) {
P(dev->mutex); /* Use P to avoid indefinite block */
if (!dev_is_tape(dev)) {
bnet_fsend(dir, _("3995 Device %s is not an autochanger.\n"), dev_name(dev));
dname = get_memory(dir->msglen+1);
if (sscanf(dir->msg, "readlabel %s Slot=%d", dname, &Slot) == 2) {
- if (find_device(jcr, dname)) {
- dev = jcr->device->dev;
-
+ dev = find_device(jcr, dname);
+ if (dev) {
P(dev->mutex); /* Use P to avoid indefinite block */
if (!dev_state(dev, ST_OPENED)) {
read_volume_label(jcr, dev, Slot);
dev->state &= ~ST_LABEL; /* force read of label */
switch (read_dev_volume_label(jcr, dev, block)) {
case VOL_OK:
- bnet_fsend(dir, _("3001 Volume=\"%s\" Slot=%d\n"), dev->VolHdr.VolName, Slot);
+ /* DO NOT add quotes around the Volume name. It is scanned in the DIR */
+ bnet_fsend(dir, _("3001 Volume=%s Slot=%d\n"), dev->VolHdr.VolName, Slot);
Dmsg1(100, "Volume: %s\n", dev->VolHdr.VolName);
break;
default: