]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/stored/dircmd.c
11Apr07
[bacula/bacula] / bacula / src / stored / dircmd.c
index 43569da2b773436f69bfaddd64e0d53f88ec3edb..77ff63e0587ee8166e08ee151e29d12941013ffa 100644 (file)
@@ -1,41 +1,50 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 /*
  *  This file handles accepting Director Commands
  *
- *    Most Director commands are handled here, with the 
- *    exception of the Job command command and subsequent 
+ *    Most Director commands are handled here, with the
+ *    exception of the Job command command and subsequent
  *    subcommands that are handled
- *    in job.c.  
+ *    in job.c.
  *
  *    N.B. in this file, in general we must use P(dev->mutex) rather
- *     than lock_device(dev) so that we can examine the blocked
- *      state rather than blocking ourselves. In some "safe" cases,
- *     we can do things to a blocked device. CAREFUL!!!!
+ *      than dev->r_lock() so that we can examine the blocked
+ *      state rather than blocking ourselves because a Job
+ *      thread has the device blocked. In some "safe" cases,
+ *      we can do things to a blocked device. CAREFUL!!!!
  *
  *    File daemon commands are handled in fdcmd.c
  *
  *     Kern Sibbald, May MMI
  *
  *   Version $Id$
- *  
- */
-/*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
-
+ *
  */
 
 #include "bacula.h"
 extern BSOCK *filed_chan;
 extern int r_first, r_last;
 extern struct s_res resources[];
-extern char my_name[];
-extern time_t daemon_start_time;
 extern struct s_last_job last_job;
+extern bool init_done;
 
 /* Static variables */
-static char derrmsg[]       = "3900 Invalid command\n";
-static char OKsetdebug[]   = "3000 OK setdebug=%d\n";
-
+static char derrmsg[]     = "3900 Invalid command\n";
+static char OKsetdebug[]  = "3000 OK setdebug=%d\n";
+static char invalid_cmd[] = "3997 Invalid command for a Director with Monitor directive enabled.\n";
 
 /* Imported functions */
 extern void terminate_child();
-extern int job_cmd(JCR *jcr);
-extern int status_cmd(JCR *sjcr);
+extern bool job_cmd(JCR *jcr);
+extern bool use_cmd(JCR *jcr);
+extern bool run_cmd(JCR *jcr);
+extern bool status_cmd(JCR *sjcr);
+extern bool qstatus_cmd(JCR *jcr);
+//extern bool query_cmd(JCR *jcr);
 
 /* Forward referenced functions */
-static int label_cmd(JCR *jcr);
-static int relabel_cmd(JCR *jcr);
-static int readlabel_cmd(JCR *jcr);
-static int release_cmd(JCR *jcr);
-static int setdebug_cmd(JCR *jcr);
-static int cancel_cmd(JCR *cjcr);
-static int mount_cmd(JCR *jcr);
-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 bool label_cmd(JCR *jcr);
+static bool die_cmd(JCR *jcr);
+static bool relabel_cmd(JCR *jcr);
+static bool readlabel_cmd(JCR *jcr);
+static bool release_cmd(JCR *jcr);
+static bool setdebug_cmd(JCR *jcr);
+static bool cancel_cmd(JCR *cjcr);
+static bool mount_cmd(JCR *jcr);
+static bool unmount_cmd(JCR *jcr);
+static bool bootstrap_cmd(JCR *jcr);
+static bool changer_cmd(JCR *sjcr);
+static bool do_label(JCR *jcr, int relabel);
+static DCR *find_device(JCR *jcr, POOL_MEM &dev_name, int drive);
 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);
+static void label_volume_if_ok(DCR *dcr, char *oldname,
+                               char *newname, char *poolname,
+                               int Slot, int relabel);
+static bool try_autoload_device(JCR *jcr, int slot, const char *VolName);
+static void send_dir_busy_message(BSOCK *dir, DEVICE *dev);
 
 struct s_cmds {
-   char *cmd;
-   int (*func)(JCR *jcr);
+   const char *cmd;
+   bool (*func)(JCR *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[] = {
-   {"JobId=",    job_cmd},            /* start Job */
-   {"setdebug=", setdebug_cmd},       /* set debug level */
-   {"cancel",    cancel_cmd},
-   {"label",     label_cmd},          /* label a tape */
-   {"relabel",   relabel_cmd},        /* relabel a tape */
-   {"mount",     mount_cmd},
-   {"unmount",   unmount_cmd},
-   {"status",    status_cmd},
-   {"autochanger", autochanger_cmd},
-   {"release",   release_cmd},
-   {"readlabel", readlabel_cmd},
-   {NULL,       NULL}                /* list terminator */
+   {"JobId=",      job_cmd,         0},     /* start Job */
+   {"autochanger", changer_cmd,     0},
+   {"bootstrap",   bootstrap_cmd,   0},
+   {"cancel",      cancel_cmd,      0},
+   {".die",        die_cmd,         0},
+   {"label",       label_cmd,       0},     /* label a tape */
+   {"mount",       mount_cmd,       0},
+   {"readlabel",   readlabel_cmd,   0},
+   {"release",     release_cmd,     0},
+   {"relabel",     relabel_cmd,     0},     /* relabel a tape */
+   {"setdebug=",   setdebug_cmd,    0},     /* set debug level */
+   {"status",      status_cmd,      1},
+   {".status",     qstatus_cmd,     1},
+   {"unmount",     unmount_cmd,     0},
+   {"use storage=", use_cmd,        0},
+   {"run",         run_cmd,         0},
+// {"query",       query_cmd,       0},
+   {NULL,        NULL}                      /* list terminator */
 };
 
 
-/* 
- * Connection request. We accept connections either from the 
+/*
+ * Connection request. We accept connections either from the
  *  Director or a Client (File daemon).
- * 
+ *
  * Note, we are running as a seperate thread of the Storage daemon.
  *  and it is because a Director has made a connection with
- *  us on the "Message" channel.    
+ *  us on the "Message" channel.
  *
- * Basic tasks done here:  
+ * Basic tasks done here:
  *  - Create a JCR record
  *  - If it was from the FD, call handle_filed_connection()
  *  - Authenticate the Director
@@ -118,7 +141,7 @@ static struct s_cmds cmds[] = {
  *  - 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;
@@ -127,29 +150,45 @@ void *connection_request(void *arg)
    int bnet_stat = 0;
    char name[MAX_NAME_LENGTH];
 
-   if (bnet_recv(bs) <= 0) {
+   if (bs->recv() <= 0) {
       Emsg0(M_ERROR, 0, _("Connection request failed.\n"));
+      bnet_close(bs);
       return NULL;
    }
 
-   /* 
+   /*
     * Do a sanity check on the message received
     */
    if (bs->msglen < 25 || bs->msglen > (int)sizeof(name)-25) {
-      Emsg1(M_ERROR, 0, _("Invalid Dir connection. Len=%d\n"), bs->msglen);
+      Emsg1(M_ERROR, 0, _("Invalid connection. Len=%d\n"), bs->msglen);
+      bnet_close(bs);
+      return NULL;
    }
-   /* 
+   /*
     * See if this is a File daemon connection. If so
-    *  call FD handler.
+    *   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) {
+      Dmsg0(110, "Got a FD connection\n");
       handle_filed_connection(bs, name);
       return NULL;
    }
-   
-   jcr = new_jcr(sizeof(JCR), stored_free_jcr);     /* create Job Control Record */
-   jcr->dir_bsock = bs;              /* save Director bsock */
-   jcr->dir_bsock->jcr = jcr;
+
+   /* 
+    * This is a connection from the Director, so setup a JCR 
+    */
+   Dmsg0(110, "Got a DIR connection\n");
+   jcr = new_jcr(sizeof(JCR), stored_free_jcr); /* create Job Control Record */
+   jcr->dir_bsock = bs;               /* save Director bsock */
+   jcr->dir_bsock->set_jcr(jcr);
+   jcr->dcrs = New(alist(10, not_owned_by_alist));
+   /* 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));
+      goto bail_out;
+   }
 
    Dmsg0(1000, "stored in start_job\n");
 
@@ -158,51 +197,81 @@ void *connection_request(void *arg)
     */
    if (!authenticate_director(jcr)) {
       Jmsg(jcr, M_FATAL, 0, _("Unable to authenticate Director\n"));
-      free_jcr(jcr);
-      return NULL;
+      goto bail_out;
    }
    Dmsg0(90, "Message channel init completed.\n");
 
-   for (quit=0; !quit;) {
+   for (quit=false; !quit;) {
       /* Read command */
-      if ((bnet_stat = bnet_recv(bs)) <= 0) {
-        break;                       /* connection terminated */
+      if ((bnet_stat = bs->recv()) <= 0) {
+         break;               /* connection terminated */
+      }
+      Dmsg1(199, "<dird: %s\n", bs->msg);
+      /* Ensure that device initialization is complete */
+      while (!init_done) {
+         bmicrosleep(1, 0);
       }
-      Dmsg1(9, "<dird: %s\n", bs->msg);
       found = false;
       for (i=0; cmds[i].cmd; i++) {
-        if (strncmp(cmds[i].cmd, bs->msg, strlen(cmds[i].cmd)) == 0) {
-           if (!cmds[i].func(jcr)) {    /* do command */
-              quit = true;              /* error, get out */
-               Dmsg1(90, "Command %s requsts quit\n", cmds[i].cmd);
-           }
-           found = true;            /* indicate command found */
-           break;
-        }
+        if (strncmp(cmds[i].cmd, bs->msg, strlen(cmds[i].cmd)) == 0) {
+           if ((!cmds[i].monitoraccess) && (jcr->director->monitor)) {
+              Dmsg1(100, "Command \"%s\" is invalid.\n", cmds[i].cmd);
+              bnet_fsend(bs, invalid_cmd);
+              bs->signal(BNET_EOD);
+              break;
+           }
+           Dmsg1(200, "Do command: %s\n", cmds[i].cmd);
+           if (!cmds[i].func(jcr)) { /* do command */
+              quit = true; /* error, get out */
+              Dmsg1(190, "Command %s reqeusts quit\n", cmds[i].cmd);
+           }
+           found = true;             /* indicate command found */
+           break;
+        }
       }
-      if (!found) {                  /* command not found */
-        bnet_fsend(bs, derrmsg);
-        quit = true;
-        break;
+      if (!found) {                   /* command not found */
+        bnet_fsend(bs, derrmsg);
+        break;
       }
    }
+bail_out:
+   generate_daemon_event(jcr, "JobEnd");
+   dequeue_messages(jcr);             /* send any queued messages */
    bnet_sig(bs, BNET_TERMINATE);
    free_jcr(jcr);
    return NULL;
 }
 
+
+/*
+ * Force SD to die, and hopefully dump itself.  Turned on only
+ *  in development version.
+ */
+static bool die_cmd(JCR *jcr)
+{
+#ifdef DEVELOPER
+   JCR *djcr = NULL;
+   int a;
+   Pmsg0(000, "I have been requested to die ...");
+   a = djcr->JobId;   /* ref NULL pointer */
+#endif
+   return 0;
+}
+
+     
+
 /*
  * Set debug level as requested by the Director
  *
  */
-static int setdebug_cmd(JCR *jcr)
+static bool setdebug_cmd(JCR *jcr)
 {
    BSOCK *dir = jcr->dir_bsock;
    int level, trace_flag;
 
    Dmsg1(10, "setdebug_cmd: %s", dir->msg);
    if (sscanf(dir->msg, "setdebug=%d trace=%d", &level, &trace_flag) != 2 || level < 0) {
-      bnet_fsend(dir, "3991 Bad setdebug command: %s\n", dir->msg);
+      bnet_fsend(dir, _("3991 Bad setdebug command: %s\n"), dir->msg);
       return 0;
    }
    debug_level = level;
@@ -214,7 +283,7 @@ static int setdebug_cmd(JCR *jcr)
 /*
  * Cancel a Job
  */
-static int cancel_cmd(JCR *cjcr)
+static bool cancel_cmd(JCR *cjcr)
 {
    BSOCK *dir = cjcr->dir_bsock;
    int oldStatus;
@@ -223,72 +292,80 @@ static int cancel_cmd(JCR *cjcr)
 
    if (sscanf(dir->msg, "cancel Job=%127s", Job) == 1) {
       if (!(jcr=get_jcr_by_full_name(Job))) {
-         bnet_fsend(dir, _("3992 Job %s not found.\n"), Job);
+         bnet_fsend(dir, _("3904 Job %s not found.\n"), Job);
       } else {
-        P(jcr->mutex);
-        oldStatus = jcr->JobStatus;
-        set_jcr_job_status(jcr, JS_Canceled);
-        if (!jcr->authenticated && oldStatus == JS_WaitFD) {
-           pthread_cond_signal(&jcr->job_start_wait); /* wake waiting thread */
-        }
-        V(jcr->mutex);
-        if (jcr->file_bsock) {
-           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);
-        }
+         jcr->lock();
+         oldStatus = jcr->JobStatus;
+         set_jcr_job_status(jcr, JS_Canceled);
+         if (!jcr->authenticated && oldStatus == JS_WaitFD) {
+            pthread_cond_signal(&jcr->job_start_wait); /* wake waiting thread */
+         }
+         jcr->unlock();
+         if (jcr->file_bsock) {
+            bnet_sig(jcr->file_bsock, BNET_TERMINATE);
+         }
+         /* If thread waiting on mount, wake him */
+         if (jcr->dcr && jcr->dcr->dev && jcr->dcr->dev->waiting_for_mount()) {
+            pthread_cond_broadcast(&jcr->dcr->dev->wait_next_vol);
+            pthread_cond_broadcast(&wait_device_release);
+         }
+         if (jcr->read_dcr && jcr->read_dcr->dev && jcr->read_dcr->dev->waiting_for_mount()) {
+            pthread_cond_broadcast(&jcr->read_dcr->dev->wait_next_vol);
+            pthread_cond_broadcast(&wait_device_release);
+         }
+         Jmsg(jcr, M_INFO, 0, _("Job %s marked to be canceled.\n"), jcr->Job);
          bnet_fsend(dir, _("3000 Job %s marked to be canceled.\n"), jcr->Job);
-        free_jcr(jcr);
+         free_jcr(jcr);
       }
    } else {
-      bnet_fsend(dir, _("3993 Error scanning cancel command.\n"));
+      bnet_fsend(dir, _("3903 Error scanning cancel command.\n"));
    }
    bnet_sig(dir, BNET_EOD);
    return 1;
 }
 
 /*
- * Label a tape
+ * Label a Volume
  *
  */
-static int label_cmd(JCR *jcr) 
+static bool label_cmd(JCR *jcr)
 {
    return do_label(jcr, 0);
 }
 
-static int relabel_cmd(JCR *jcr) 
+static bool relabel_cmd(JCR *jcr)
 {
    return do_label(jcr, 1);
 }
 
-static int do_label(JCR *jcr, int relabel)  
+static bool do_label(JCR *jcr, int relabel)
 {
-   POOLMEM *dname, *newname, *oldname, *poolname, *mtype;
+   POOLMEM *newname, *oldname, *poolname, *mtype;
+   POOL_MEM dev_name;
    BSOCK *dir = jcr->dir_bsock;
+   DCR *dcr;
    DEVICE *dev;
    bool ok = false;
-   int slot;   
+   int slot;
+   int drive;
 
-   dname = get_memory(dir->msglen+1);
    newname = get_memory(dir->msglen+1);
    oldname = get_memory(dir->msglen+1);
    poolname = get_memory(dir->msglen+1);
    mtype = get_memory(dir->msglen+1);
    if (relabel) {
-      if (sscanf(dir->msg, "relabel %s OldName=%s NewName=%s PoolName=%s MediaType=%s Slot=%d",
-         dname, oldname, newname, poolname, mtype, &slot) == 6) {
-        ok = true;
+      if (sscanf(dir->msg, "relabel %127s OldName=%127s NewName=%127s PoolName=%127s "
+                 "MediaType=%127s Slot=%d drive=%d",
+                  dev_name.c_str(), oldname, newname, poolname, mtype, 
+                  &slot, &drive) == 7) {
+         ok = true;
       }
    } else {
       *oldname = 0;
-      if (sscanf(dir->msg, "label %s VolumeName=%s PoolName=%s MediaType=%s Slot=%d",
-         dname, newname, poolname, mtype, &slot) == 5) {
-        ok = true;
+      if (sscanf(dir->msg, "label %127s VolumeName=%127s PoolName=%127s "
+                 "MediaType=%127s Slot=%d drive=%d", 
+          dev_name.c_str(), newname, poolname, mtype, &slot, &drive) == 6) {
+         ok = true;
       }
    }
    if (ok) {
@@ -296,366 +373,484 @@ static int do_label(JCR *jcr, int relabel)
       unbash_spaces(oldname);
       unbash_spaces(poolname);
       unbash_spaces(mtype);
-      if (find_device(jcr, dname)) {
-        /******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);
-           force_close_dev(dev);
+      dcr = find_device(jcr, dev_name, drive);
+      if (dcr) {
+         dev = dcr->dev;
+         dev->dlock();                 /* Use P to avoid indefinite block */
+         if (!dev->is_open()) {
+            Dmsg1(400, "Can %slabel. Device is not open\n", relabel?"re":"");
+            label_volume_if_ok(dcr, oldname, newname, poolname, slot, relabel);
+            dev->close();
          /* Under certain "safe" conditions, we can steal the lock */
-        } else if (dev->dev_blocked && 
-                   (dev->dev_blocked == BST_UNMOUNTED ||
-                    dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
-                    dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) {
-           label_volume_if_ok(jcr, dev, oldname, newname, poolname, slot, relabel);
-        } else if (dev_state(dev, ST_READ) || dev->num_writers) {
-           if (dev_state(dev, ST_READ)) {
-                bnet_fsend(dir, _("3911 Device %s is busy with 1 reader.\n"),
-                  dev_name(dev));
-           } else {
-                bnet_fsend(dir, _("3912 Device %s is busy with %d writer(s).\n"),
-                  dev_name(dev), dev->num_writers);
-           }
-        } else {                     /* device not being used */
-           label_volume_if_ok(jcr, dev, oldname, newname, poolname, slot, relabel);
-        }
-        V(dev->mutex);
+         } else if (dev->can_steal_lock()) {
+            Dmsg0(400, "Can relabel. can_steal_lock\n");
+            label_volume_if_ok(dcr, oldname, newname, poolname, slot, relabel);
+         } else if (dev->is_busy() || dev->is_blocked()) {
+            send_dir_busy_message(dir, dev);
+         } else {                     /* device not being used */
+            Dmsg0(400, "Can relabel. device not used\n");
+            label_volume_if_ok(dcr, oldname, newname, poolname, slot, relabel);
+         }
+         dev->dunlock();
+         free_dcr(dcr);
+         jcr->dcr = NULL;
       } else {
-         bnet_fsend(dir, _("3999 Device %s not found\n"), dname);
+         bnet_fsend(dir, _("3999 Device \"%s\" not found or could not be opened.\n"), dev_name.c_str());
       }
    } else {
       /* NB dir->msg gets clobbered in bnet_fsend, so save command */
-      pm_strcpy(&jcr->errmsg, dir->msg);
+      pm_strcpy(jcr->errmsg, dir->msg);
       bnet_fsend(dir, _("3903 Error scanning label command: %s\n"), jcr->errmsg);
    }
-   free_memory(dname);
    free_memory(oldname);
    free_memory(newname);
    free_memory(poolname);
    free_memory(mtype);
    bnet_sig(dir, BNET_EOD);
-   return 1;
+   return true;
 }
 
-/* 
+/*
  * Read the tape label and determine if we can safely
  * label the tape (not a Bacula volume), then label it.
  *
  *  Enter with the mutex set
  */
-static void label_volume_if_ok(JCR *jcr, DEVICE *dev, char *oldname, 
-                              char *newname, char *poolname,
-                              int slot, int relabel)
+static void label_volume_if_ok(DCR *dcr, char *oldname,
+                               char *newname, char *poolname,
+                               int slot, int relabel)
 {
-   BSOCK *dir = jcr->dir_bsock;
-   DEV_BLOCK *block;
+   BSOCK *dir = dcr->jcr->dir_bsock;
    bsteal_lock_t hold;
-   
+   DEVICE *dev = dcr->dev;
+   int label_status;
+   int mode;
+   const char *volname = (relabel == 1) ? oldname : newname;
+   char ed1[50];
+
    steal_device_lock(dev, &hold, BST_WRITING_LABEL);
-   block = new_block(dev);
-   
-   pm_strcpy(&jcr->VolumeName, newname);
-   jcr->VolCatInfo.Slot = slot;
-   if (autoload_device(jcr, dev, 0, dir) < 0) {    /* autoload if possible */
-      goto bail_out;
+   Dmsg1(100, "Stole device %s lock, writing label.\n", dev->print_name());
+
+
+   Dmsg0(90, "try_autoload_device - looking for volume_info\n");
+   if (!try_autoload_device(dcr->jcr, slot, volname)) {
+      goto bail_out;                  /* error */
    }
 
    /* Ensure that the device is open -- autoload_device() closes it */
-   for ( ; !(dev->state & ST_OPENED); ) {
-      if (open_dev(dev, jcr->VolumeName, OPEN_READ_WRITE) < 0) {
-         bnet_fsend(dir, _("3910 Unable to open device %s. ERR=%s\n"), 
-           dev_name(dev), strerror_dev(dev));
-        goto bail_out;
-      }
+   if (dev->is_tape()) {
+      mode = OPEN_READ_WRITE;
+   } else {
+      mode = CREATE_READ_WRITE;
+   }
+
+   if (relabel) {
+      dev->truncating = true;         /* let open() know we will truncate it */
+   }
+   /* Set old volume name for open if relabeling */
+   bstrncpy(dcr->VolCatInfo.VolCatName, volname, sizeof(dcr->VolCatInfo.VolCatName));
+   if (dev->open(dcr, mode) < 0) {
+      bnet_fsend(dir, _("3910 Unable to open device %s: ERR=%s\n"),
+         dev->print_name(), dev->strerror());
+      goto bail_out;      
    }
 
    /* See what we have for a Volume */
-   switch (read_dev_volume_label(jcr, dev, block)) {               
+   label_status = read_dev_volume_label(dcr);
+   
+   /* Set new volume name */
+   bstrncpy(dcr->VolCatInfo.VolCatName, newname, sizeof(dcr->VolCatInfo.VolCatName));
+   switch(label_status) {
    case VOL_NAME_ERROR:
    case VOL_VERSION_ERROR:
    case VOL_LABEL_ERROR:
    case VOL_OK:
       if (!relabel) {
-        bnet_fsend(dir, _(
-            "3911 Cannot label Volume because it is already labeled: \"%s\"\n"), 
-            dev->VolHdr.VolName);
-        break;
+         bnet_fsend(dir, _(
+            "3920 Cannot label Volume because it is already labeled: \"%s\"\n"),
+             dev->VolHdr.VolumeName);
+         break;
       }
+
       /* Relabel request. If oldname matches, continue */
-      if (strcmp(oldname, dev->VolHdr.VolName) != 0) {
-         bnet_fsend(dir, _("Wrong volume mounted.\n"));
-        break;
+      if (strcmp(oldname, dev->VolHdr.VolumeName) != 0) {
+         bnet_fsend(dir, _("3921 Wrong volume mounted.\n"));
+         break;
+      }
+      if (dev->label_type != B_BACULA_LABEL) {
+         bnet_fsend(dir, _("3922 Cannot relabel an ANSI/IBM labeled Volume.\n"));
+         break;
       }
       /* Fall through wanted! */
    case VOL_IO_ERROR:
    case VOL_NO_LABEL:
-      if (!write_volume_label_to_dev(jcr, jcr->device, newname, poolname)) {
-         bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
-        break;
+      if (!write_new_volume_label_to_dev(dcr, newname, poolname, 
+           relabel, true /* write dvd now */)) {
+         bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), dev->bstrerror());
+         break;
       }
-      pm_strcpy(&jcr->VolumeName, newname);
-      bnet_fsend(dir, _("3000 OK label. Volume=%s Device=%s\n"), 
-        newname, dev_name(dev));
+      bstrncpy(dcr->VolumeName, newname, sizeof(dcr->VolumeName));
+      /* The following 3000 OK label. string is scanned in ua_label.c */
+      bnet_fsend(dir, "3000 OK label. VolBytes=%s DVD=%d Volume=\"%s\" Device=%s\n",
+                 edit_uint64(dev->VolCatInfo.VolCatBytes, ed1),
+                 dev->is_dvd()?1:0, newname, dev->print_name());
       break;
    case VOL_NO_MEDIA:
-      bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), strerror_dev(dev));
+      bnet_fsend(dir, _("3914 Failed to label Volume (no media): ERR=%s\n"), dev->bstrerror());
       break;
    default:
-      bnet_fsend(dir, _("3913 Cannot label Volume. \
-Unknown status %d from read_volume_label()\n"), jcr->label_status);
+      bnet_fsend(dir, _("3913 Cannot label Volume. "
+"Unknown status %d from read_volume_label()\n"), label_status);
       break;
    }
+
 bail_out:
-   free_block(block);
+   if (!dev->is_open()) {
+      dev->clear_volhdr();
+   }
    give_back_device_lock(dev, &hold);
-
    return;
 }
 
 
-/* 
+/*
  * Read the tape label
  *
  *  Enter with the mutex set
  */
-static int read_label(JCR *jcr, DEVICE *dev)
+static bool read_label(DCR *dcr)
 {
-   int stat;
+   int ok;
+   JCR *jcr = dcr->jcr;
    BSOCK *dir = jcr->dir_bsock;
-   DEV_BLOCK *block;
    bsteal_lock_t hold;
-   
+   DEVICE *dev = dcr->dev;
+
    steal_device_lock(dev, &hold, BST_DOING_ACQUIRE);
-   
-   jcr->VolumeName[0] = 0;
-   block = new_block(dev);
-   dev->state &= ~ST_LABEL;          /* force read of label */
-   switch (read_dev_volume_label(jcr, dev, block)) {               
+
+   dcr->VolumeName[0] = 0;
+   dev->clear_labeled();              /* force read of label */
+   switch (read_dev_volume_label(dcr)) {
    case VOL_OK:
-      bnet_fsend(dir, _("3001 Mounted Volume: %s\n"), dev->VolHdr.VolName);
-      stat = 1;
+      bnet_fsend(dir, _("3001 Mounted Volume: %s\n"), dev->VolHdr.VolumeName);
+      ok = true;
       break;
    default:
-      bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device \"%s\" because:\n%s"),
-        dev_name(dev), jcr->errmsg);
-      stat = 0;
+      bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device %s because:\n%s"),
+         dev->print_name(), jcr->errmsg);
+      ok = false;
       break;
    }
-   free_block(block);
    give_back_device_lock(dev, &hold);
-   return stat;
+   return ok;
 }
 
-static bool find_device(JCR *jcr, char *dname)
+/* 
+ * Searches for device by name, and if found, creates a dcr and
+ *  returns it.
+ */
+static DCR *find_device(JCR *jcr, POOL_MEM &devname, int drive)
 {
-   DEVRES *device = NULL;
+   DEVRES *device;
+   AUTOCHANGER *changer;
    bool found = false;
+   DCR *dcr = NULL;
 
-   unbash_spaces(dname);
-   LockRes();
-   while ((device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device))) {
+   unbash_spaces(devname);
+   foreach_res(device, R_DEVICE) {
       /* Find resource, and make sure we were able to open it */
-      if (strcmp(device->hdr.name, dname) == 0 && device->dev) {
+      if (fnmatch(device->hdr.name, devname.c_str(), 0) == 0) {
+         if (!device->dev) {
+            device->dev = init_dev(jcr, device);
+         }
+         if (!device->dev) {
+            Jmsg(jcr, M_WARNING, 0, _("\n"
+               "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"),
+                 devname.c_str());
+            continue;
+         }
          Dmsg1(20, "Found device %s\n", device->hdr.name);
-        jcr->device = device;
-        found = true;
-        break;
+         found = true;
+         break;
+      }
+   }
+   if (!found) {
+      foreach_res(changer, R_AUTOCHANGER) {
+         /* Find resource, and make sure we were able to open it */
+         if (fnmatch(devname.c_str(), changer->hdr.name, 0) == 0) {
+            /* Try each device in this AutoChanger */
+            foreach_alist(device, changer->device) {
+               Dmsg1(100, "Try changer device %s\n", device->hdr.name);
+               if (!device->dev) {
+                  device->dev = init_dev(jcr, device);
+               }
+               if (!device->dev) {
+                  Dmsg1(100, "Device %s could not be opened. Skipped\n", devname.c_str());
+                  Jmsg(jcr, M_WARNING, 0, _("\n"
+                     "     Device \"%s\" in changer \"%s\" requested by DIR could not be opened or does not exist.\n"),
+                       device->hdr.name, devname.c_str());
+                  continue;
+               }
+               if (!device->dev->autoselect) {
+                  Dmsg1(100, "Device %s not autoselect skipped.\n", devname.c_str());
+                  continue;              /* device is not available */
+               }
+               if (drive < 0 || drive == (int)device->dev->drive_index) {
+                  Dmsg1(20, "Found changer device %s\n", device->hdr.name);
+                  found = true;
+                  break;
+               }
+               Dmsg3(100, "Device %s drive wrong: want=%d got=%d skipping\n",
+                  devname.c_str(), drive, (int)device->dev->drive_index);
+            }
+            break;                    /* we found it but could not open a device */
+         }
       }
    }
+
    if (found) {
-      jcr->dcr = new_dcr(jcr, device->dev);
+      Dmsg1(100, "Found device %s\n", device->hdr.name);
+      dcr = new_dcr(jcr, device->dev);
+      dcr->device = device;
+      jcr->dcr = dcr;
    }
-   UnlockRes();
-   return found;
+   return dcr;
 }
 
 
 /*
  * Mount command from Director
  */
-static int mount_cmd(JCR *jcr)
+static bool mount_cmd(JCR *jcr)
 {
-   POOLMEM *dname;
+   POOL_MEM devname;
    BSOCK *dir = jcr->dir_bsock;
    DEVICE *dev;
-
-   dname = get_memory(dir->msglen+1);
-   if (sscanf(dir->msg, "mount %s", dname) == 1) {
-      if (find_device(jcr, dname)) {
-        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:
-           /* Someone is waiting, wake him */
+   DCR *dcr;
+   int drive;
+   int slot = 0;
+   bool ok;
+
+   ok = sscanf(dir->msg, "mount %127s drive=%d slot=%d", devname.c_str(), 
+               &drive, &slot) == 3;
+   if (!ok) {
+      ok = sscanf(dir->msg, "mount %127s drive=%d", devname.c_str(), &drive) == 2;
+   }
+   if (ok) {
+      dcr = find_device(jcr, devname, drive);
+      if (dcr) {
+         dev = dcr->dev;
+         dev->dlock();                 /* Use P to avoid indefinite block */
+         Dmsg1(100, "mount cmd blocked=%d\n", dev->blocked());
+         switch (dev->blocked()) {         /* device blocked? */
+         case BST_WAITING_FOR_SYSOP:
+            /* Someone is waiting, wake him */
             Dmsg0(100, "Waiting for mount. Attempting to wake thread\n");
-           dev->dev_blocked = BST_MOUNT;
-            bnet_fsend(dir, "3001 OK mount. Device=%s\n", dev_name(dev));
-           pthread_cond_signal(&dev->wait_next_vol);
-           break;
-
-        /* In both of these two cases, we (the user) unmounted the Volume */
-        case BST_UNMOUNTED_WAITING_FOR_SYSOP:
-        case BST_UNMOUNTED:
-           /* We freed the device, so reopen it and wake any waiting threads */
-           if (open_dev(dev, NULL, OPEN_READ_WRITE) < 0) {
-               bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"), 
-                 strerror_dev(dev));
-              break;
-           }
-           block = new_block(dev);
-           read_dev_volume_label(jcr, dev, block);
-           free_block(block);
-           if (dev->dev_blocked == BST_UNMOUNTED) {
-              /* We blocked the device, so unblock it */
+            dev->set_blocked(BST_MOUNT);
+            bnet_fsend(dir, "3001 OK mount. Device=%s\n", 
+               dev->print_name());
+            pthread_cond_broadcast(&dev->wait_next_vol);
+            pthread_cond_broadcast(&wait_device_release);
+            break;
+
+         /* In both of these two cases, we (the user) unmounted the Volume */
+         case BST_UNMOUNTED_WAITING_FOR_SYSOP:
+         case BST_UNMOUNTED:
+            if (dev->is_autochanger() && slot > 0) {
+               try_autoload_device(jcr, slot, "");
+            }
+            /* We freed the device, so reopen it and wake any waiting threads */
+            if (dev->open(dcr, OPEN_READ_ONLY) < 0) {
+               bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"),
+                  dev->bstrerror());
+               if (dev->blocked() == BST_UNMOUNTED) {
+                  /* We blocked the device, so unblock it */
+                  Dmsg0(100, "Unmounted. Unblocking device\n");
+                  unblock_device(dev);
+               }
+               break;
+            }
+            read_dev_volume_label(dcr);
+            if (dev->blocked() == BST_UNMOUNTED) {
+               /* We blocked the device, so unblock it */
                Dmsg0(100, "Unmounted. Unblocking device\n");
-              read_label(jcr, dev);  /* this should not be necessary */
-              unblock_device(dev);
-           } else {
+               read_label(dcr);       /* this should not be necessary */
+               unblock_device(dev);
+            } else {
                Dmsg0(100, "Unmounted waiting for mount. Attempting to wake thread\n");
-              dev->dev_blocked = BST_MOUNT;
-           }
-           if (dev_state(dev, ST_LABEL)) {
-               bnet_fsend(dir, _("3001 Device %s is mounted with Volume \"%s\"\n"), 
-                 dev_name(dev), dev->VolHdr.VolName);
-           } else {
+               dev->set_blocked(BST_MOUNT);
+            }
+            if (dev->is_labeled()) {
+               bnet_fsend(dir, _("3001 Device %s is mounted with Volume \"%s\"\n"),
+                  dev->print_name(), dev->VolHdr.VolumeName);
+            } else {
                bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
                                  "If this is not a blank tape, try unmounting and remounting the Volume.\n"),
-                         dev_name(dev));
-           }
-           pthread_cond_signal(&dev->wait_next_vol);
-           break;
-
-        case BST_DOING_ACQUIRE:
-            bnet_fsend(dir, _("3001 Device %s is mounted; doing acquire.\n"), 
-                      dev_name(dev));
-           break;
-
-        case BST_WRITING_LABEL:
-            bnet_fsend(dir, _("3903 Device %s is being labeled.\n"), dev_name(dev));
-           break;
-
-        case BST_NOT_BLOCKED:
-           if (dev_state(dev, ST_OPENED)) {
-              if (dev_state(dev, ST_LABEL)) {
+                          dev->print_name());
+            }
+            pthread_cond_broadcast(&dev->wait_next_vol);
+            pthread_cond_broadcast(&wait_device_release);
+            break;
+
+         case BST_DOING_ACQUIRE:
+            bnet_fsend(dir, _("3001 Device %s is doing acquire.\n"),
+                       dev->print_name());
+            break;
+
+         case BST_WRITING_LABEL:
+            bnet_fsend(dir, _("3903 Device %s is being labeled.\n"), 
+               dev->print_name());
+            break;
+
+         case BST_NOT_BLOCKED:
+            if (dev->is_autochanger() && slot > 0) {
+               try_autoload_device(jcr, slot, "");
+            }
+            if (dev->is_open()) {
+               if (dev->is_labeled()) {
                   bnet_fsend(dir, _("3001 Device %s is mounted with Volume \"%s\"\n"),
-                    dev_name(dev), dev->VolHdr.VolName);
-              } else {
-                  bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"   
+                     dev->print_name(), dev->VolHdr.VolumeName);
+               } else {
+                  bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
                                  "If this is not a blank tape, try unmounting and remounting the Volume.\n"),
-                            dev_name(dev));
-              }
-           } else {
-              if (!dev_is_tape(dev)) {
-                  bnet_fsend(dir, _("3906 cannot mount non-tape.\n"));
-                 break;
-              }
-              if (open_dev(dev, NULL, OPEN_READ_WRITE) < 0) {
-                  bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"), 
-                    strerror_dev(dev));
-                 break;
-              }
-              read_label(jcr, dev);
-              if (dev_state(dev, ST_LABEL)) {
-                  bnet_fsend(dir, _("3001 Device %s is already mounted with Volume \"%s\"\n"), 
-                    dev_name(dev), dev->VolHdr.VolName);
-              } else {
+                             dev->print_name());
+               }
+            } else if (dev->is_tape()) {
+               if (dev->open(dcr, OPEN_READ_ONLY) < 0) {
+                  bnet_fsend(dir, _("3901 open device failed: ERR=%s\n"),
+                     dev->bstrerror());
+                  break;
+               }
+               read_label(dcr);
+               if (dev->is_labeled()) {
+                  bnet_fsend(dir, _("3001 Device %s is already mounted with Volume \"%s\"\n"),
+                     dev->print_name(), dev->VolHdr.VolumeName);
+               } else {
                   bnet_fsend(dir, _("3905 Device %s open but no Bacula volume is mounted.\n"
                                     "If this is not a blank tape, try unmounting and remounting the Volume.\n"),
-                            dev_name(dev));
-              }
-           }
-           break;
-
-        default:
-            bnet_fsend(dir, _("3905 Bizarre wait state %d\n"), dev->dev_blocked);
-           break;
-        }
-        V(dev->mutex);
+                             dev->print_name());
+               }
+            } else if (dev->is_dvd()) {
+               if (dev->mount(1)) {
+                  bnet_fsend(dir, _("3002 Device %s is mounted.\n"), 
+                     dev->print_name());
+               } else {
+                  bnet_fsend(dir, _("3907 %s"), dev->bstrerror());
+               } 
+            } else { /* must be file */
+               bnet_fsend(dir, _("3906 File device %s is always mounted.\n"),
+                  dev->print_name());
+            }
+            break;
+
+         default:
+            bnet_fsend(dir, _("3905 Bizarre wait state %d\n"), dev->blocked());
+            break;
+         }
+         dev->dunlock();
+         free_dcr(dcr);
+         jcr->dcr = NULL;
       } else {
-         bnet_fsend(dir, _("3999 Device %s not found\n"), dname);
+         bnet_fsend(dir, _("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str());
       }
    } else {
-      pm_strcpy(&jcr->errmsg, dir->msg);
+      pm_strcpy(jcr->errmsg, dir->msg);
       bnet_fsend(dir, _("3909 Error scanning mount command: %s\n"), jcr->errmsg);
    }
-   free_memory(dname);
    bnet_sig(dir, BNET_EOD);
-   return 1;
+   return true;
 }
 
 /*
  * unmount command from Director
  */
-static int unmount_cmd(JCR *jcr)
+static bool unmount_cmd(JCR *jcr)
 {
-   POOLMEM *dname;
+   POOL_MEM devname;
    BSOCK *dir = jcr->dir_bsock;
    DEVICE *dev;
-
-   dname = get_memory(dir->msglen+1);
-   if (sscanf(dir->msg, "unmount %s", dname) == 1) {
-      if (find_device(jcr, dname)) {
-        dev = jcr->device->dev;
-        P(dev->mutex);               /* Use P to avoid indefinite block */
-        if (!(dev->state & ST_OPENED)) {
-            Dmsg0(90, "Device already unmounted\n");
-            bnet_fsend(dir, _("3901 Device \"%s\" is already unmounted.\n"), dev_name(dev));
-
-        } else if (dev->dev_blocked == BST_WAITING_FOR_SYSOP) {
+   DCR *dcr;
+   int drive;
+
+   if (sscanf(dir->msg, "unmount %127s drive=%d", devname.c_str(), &drive) == 2) {
+      dcr = find_device(jcr, devname, drive);
+      if (dcr) {
+         dev = dcr->dev;
+         dev->dlock();                 /* Use P to avoid indefinite block */
+         if (!dev->is_open()) {
+            if (!dev->is_busy()) {
+               unload_autochanger(dcr, -1);          
+            }
+            if (dev->is_dvd()) {
+               if (dev->unmount(0)) {
+                  bnet_fsend(dir, _("3002 Device %s unmounted.\n"), 
+                     dev->print_name());
+               } else {
+                  bnet_fsend(dir, _("3907 %s"), dev->bstrerror());
+               } 
+            } else {
+               Dmsg0(90, "Device already unmounted\n");
+               bnet_fsend(dir, _("3901 Device %s is already unmounted.\n"), 
+                  dev->print_name());
+            }
+         } else if (dev->blocked() == BST_WAITING_FOR_SYSOP) {
             Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting,
-              dev->dev_blocked);
-           open_dev(dev, NULL, 0);     /* fake open for close */
-           offline_or_rewind_dev(dev);
-           force_close_dev(dev);
-           dev->dev_blocked = BST_UNMOUNTED_WAITING_FOR_SYSOP;
-            bnet_fsend(dir, _("3001 Device \"%s\" unmounted.\n"), dev_name(dev));
-
-        } else if (dev->dev_blocked == BST_DOING_ACQUIRE) {
-            bnet_fsend(dir, _("3902 Device \"%s\" is busy in acquire.\n"), dev_name(dev));
-
-        } else if (dev->dev_blocked == BST_WRITING_LABEL) {
-            bnet_fsend(dir, _("3903 Device \"%s\" is being labeled.\n"), dev_name(dev));
-
-        } else if (dev_state(dev, ST_READ) || dev->num_writers) {
-           if (dev_state(dev, ST_READ)) {
-                Dmsg0(90, "Device in read mode\n");
-                bnet_fsend(dir, _("3904 Device \"%s\" is busy reading.\n"), dev_name(dev));
-           } else {
-                Dmsg1(90, "Device busy with %d writers\n", dev->num_writers);
-                bnet_fsend(dir, _("3905 Device %s is busy with %d writer(s).\n"),
-                  dev_name(dev), dev->num_writers);
-           }
-
-        } else {                     /* device not being used */
+               dev->blocked());
+            if (!unload_autochanger(dcr, -1)) {
+               /* ***FIXME**** what is this ????  */
+               dev->close();
+            }
+            if (dev->is_dvd() && !dev->unmount(0)) {
+               bnet_fsend(dir, _("3907 %s"), dev->bstrerror());
+            } else {
+               dev->set_blocked(BST_UNMOUNTED_WAITING_FOR_SYSOP);
+               bnet_fsend(dir, _("3001 Device %s unmounted.\n"), 
+                  dev->print_name());
+            }
+
+         } else if (dev->blocked() == BST_DOING_ACQUIRE) {
+            bnet_fsend(dir, _("3902 Device %s is busy in acquire.\n"), 
+               dev->print_name());
+
+         } else if (dev->blocked() == BST_WRITING_LABEL) {
+            bnet_fsend(dir, _("3903 Device %s is being labeled.\n"), 
+               dev->print_name());
+
+         } else if (dev->is_busy()) {
+            send_dir_busy_message(dir, dev);
+         } else {                     /* device not being used */
             Dmsg0(90, "Device not in use, unmounting\n");
-           /* On FreeBSD, I am having ASSERT() failures in block_device()
-            * and I can only imagine that the thread id that we are
-            * leaving in no_wait_id is being re-used. So here,
-            * we simply do it by hand.  Gross, but a solution.
-            */
-           /*  block_device(dev, BST_UNMOUNTED); replace with 2 lines below */
-           dev->dev_blocked = BST_UNMOUNTED;
-           dev->no_wait_id = 0;
-           open_dev(dev, NULL, 0);     /* fake open for close */
-           offline_or_rewind_dev(dev);
-           force_close_dev(dev);
-            bnet_fsend(dir, _("3002 Device %s unmounted.\n"), dev_name(dev));
-        }
-        V(dev->mutex);
+            /* On FreeBSD, I am having ASSERT() failures in block_device()
+             * and I can only imagine that the thread id that we are
+             * leaving in no_wait_id is being re-used. So here,
+             * we simply do it by hand.  Gross, but a solution.
+             */
+            /*  block_device(dev, BST_UNMOUNTED); replace with 2 lines below */
+            dev->set_blocked(BST_UNMOUNTED);
+            dev->no_wait_id = 0;
+            if (!unload_autochanger(dcr, -1)) {
+               dev->close();
+            }
+            if (dev->is_dvd() && !dev->unmount(0)) {
+               bnet_fsend(dir, _("3907 %s"), dev->bstrerror());
+            } else {
+               bnet_fsend(dir, _("3002 Device %s unmounted.\n"), 
+                  dev->print_name());
+            }
+         }
+         dev->dunlock();
+         free_dcr(dcr);
+         jcr->dcr = NULL;
       } else {
-         bnet_fsend(dir, _("3999 Device %s not found\n"), dname);
+         bnet_fsend(dir, _("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str());
       }
    } else {
       /* NB dir->msg gets clobbered in bnet_fsend, so save command */
-      pm_strcpy(&jcr->errmsg, dir->msg);
+      pm_strcpy(jcr->errmsg, dir->msg);
       bnet_fsend(dir, _("3907 Error scanning unmount command: %s\n"), jcr->errmsg);
    }
-   free_memory(dname);
    bnet_sig(dir, BNET_EOD);
-   return 1;
+   return true;
 }
 
 /*
@@ -665,162 +860,181 @@ static int unmount_cmd(JCR *jcr)
  *   the operator the chance to change the tape anytime before the
  *   next job starts.
  */
-static int release_cmd(JCR *jcr)
+static bool release_cmd(JCR *jcr)
 {
-   POOLMEM *dname;
+   POOL_MEM devname;
    BSOCK *dir = jcr->dir_bsock;
    DEVICE *dev;
-
-   dname = get_memory(dir->msglen+1);
-   if (sscanf(dir->msg, "release %s", dname) == 1) {
-      if (find_device(jcr, dname)) {
-        dev = jcr->device->dev;
-        P(dev->mutex);               /* Use P to avoid indefinite block */
-        if (!(dev->state & ST_OPENED)) {
+   DCR *dcr;
+   int drive;
+
+   if (sscanf(dir->msg, "release %127s drive=%d", devname.c_str(), &drive) == 2) {
+      dcr = find_device(jcr, devname, drive);
+      if (dcr) {
+         dev = dcr->dev;
+         dev->dlock();                 /* Use P to avoid indefinite block */
+         if (!dev->is_open()) {
+            if (!dev->is_busy()) {
+               unload_autochanger(dcr, -1);
+            }
             Dmsg0(90, "Device already released\n");
-            bnet_fsend(dir, _("3911 Device %s already released.\n"), dev_name(dev));
+            bnet_fsend(dir, _("3921 Device %s already released.\n"), 
+               dev->print_name());
+
+         } else if (dev->blocked() == BST_WAITING_FOR_SYSOP) {
+            Dmsg2(90, "%d waiter dev_block=%d.\n", dev->num_waiting,
+               dev->blocked());
+            unload_autochanger(dcr, -1);
+            bnet_fsend(dir, _("3922 Device %s waiting for sysop.\n"), 
+               dev->print_name());
 
-        } else if (dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
-                   dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP) {
+         } else if (dev->blocked() == BST_UNMOUNTED_WAITING_FOR_SYSOP) {
             Dmsg2(90, "%d waiter dev_block=%d. doing unmount\n", dev->num_waiting,
-              dev->dev_blocked);
-            bnet_fsend(dir, _("3912 Device %s waiting for mount.\n"), dev_name(dev));
-
-        } else if (dev->dev_blocked == BST_DOING_ACQUIRE) {
-            bnet_fsend(dir, _("3913 Device %s is busy in acquire.\n"), dev_name(dev));
-
-        } else if (dev->dev_blocked == BST_WRITING_LABEL) {
-            bnet_fsend(dir, _("3914 Device %s is being labeled.\n"), dev_name(dev));
-
-        } else if (dev_state(dev, ST_READ) || dev->num_writers) {
-           if (dev_state(dev, ST_READ)) {
-                Dmsg0(90, "Device in read mode\n");
-                bnet_fsend(dir, _("3915 Device %s is busy with 1 reader.\n"), dev_name(dev));
-           } else {
-                Dmsg1(90, "Device busy with %d writers\n", dev->num_writers);
-                bnet_fsend(dir, _("3916 Device %s is busy with %d writer(s).\n"),
-                  dev_name(dev), dev->num_writers);
-           }
-
-        } else {                     /* device not being used */
-            Dmsg0(90, "Device not in use, unmounting\n");
-           release_volume(jcr, dev);
-            bnet_fsend(dir, _("3012 Device %s released.\n"), dev_name(dev));
-        }
-        V(dev->mutex);
+               dev->blocked());
+            bnet_fsend(dir, _("3922 Device %s waiting for mount.\n"), 
+               dev->print_name());
+
+         } else if (dev->blocked() == BST_DOING_ACQUIRE) {
+            bnet_fsend(dir, _("3923 Device %s is busy in acquire.\n"), 
+               dev->print_name());
+
+         } else if (dev->blocked() == BST_WRITING_LABEL) {
+            bnet_fsend(dir, _("3914 Device %s is being labeled.\n"), 
+               dev->print_name());
+
+         } else if (dev->is_busy()) {
+            send_dir_busy_message(dir, dev);
+         } else {                     /* device not being used */
+            Dmsg0(90, "Device not in use, releaseing\n");
+            unload_autochanger(dcr, -1);
+            release_volume(dcr);
+            bnet_fsend(dir, _("3022 Device %s released.\n"), 
+               dev->print_name());
+         }
+         dev->dunlock();
+         free_dcr(dcr);
+         jcr->dcr = NULL;
       } else {
-         bnet_fsend(dir, _("3999 Device %s not found\n"), dname);
+         bnet_fsend(dir, _("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str());
       }
    } else {
       /* NB dir->msg gets clobbered in bnet_fsend, so save command */
-      pm_strcpy(&jcr->errmsg, dir->msg);
-      bnet_fsend(dir, _("3917 Error scanning release command: %s\n"), jcr->errmsg);
+      pm_strcpy(jcr->errmsg, dir->msg);
+      bnet_fsend(dir, _("3927 Error scanning release command: %s\n"), jcr->errmsg);
    }
-   free_memory(dname);
    bnet_sig(dir, BNET_EOD);
-   return 1;
+   return true;
 }
 
 
+static bool bootstrap_cmd(JCR *jcr)
+{
+   return get_bootstrap_file(jcr, jcr->dir_bsock);
+}
 
 /*
  * Autochanger command from Director
  */
-static int autochanger_cmd(JCR *jcr)
+static bool changer_cmd(JCR *jcr)
 {
-   POOLMEM *dname;
+   POOL_MEM devname;
    BSOCK *dir = jcr->dir_bsock;
    DEVICE *dev;
-
-   dname = get_memory(dir->msglen+1);
-   if (sscanf(dir->msg, "autochanger list %s ", dname) == 1) {
-      if (find_device(jcr, dname)) {
-        dev = jcr->device->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));
-        } else if (!(dev->state & ST_OPENED)) {
-           autochanger_list(jcr, dev, dir);
+   DCR *dcr;
+   const char *cmd = NULL;
+   bool ok = false;
+   /*
+    * A safe_cmd may call autochanger script but does not load/unload
+    *    slots so it can be done at the same time that the drive is open.
+    */
+   bool safe_cmd = false;
+
+   if (sscanf(dir->msg, "autochanger list %127s", devname.c_str()) == 1) {
+      cmd = "list";
+      safe_cmd = ok = true;
+   } else if (sscanf(dir->msg, "autochanger slots %127s", devname.c_str()) == 1) {
+      cmd = "slots";
+      safe_cmd = ok = true;
+   } else if (sscanf(dir->msg, "autochanger drives %127s", devname.c_str()) == 1) {
+      cmd = "drives";
+      safe_cmd = ok = true;
+   }
+   if (ok) {
+      dcr = find_device(jcr, devname, -1);
+      if (dcr) {
+         dev = dcr->dev;
+         dev->dlock();                 /* Use P to avoid indefinite block */
+         if (!dev->device->changer_res) {
+            bnet_fsend(dir, _("3995 Device %s is not an autochanger.\n"), 
+               dev->print_name());
          /* Under certain "safe" conditions, we can steal the lock */
-        } else if (dev->dev_blocked && 
-                   (dev->dev_blocked == BST_UNMOUNTED ||
-                    dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
-                    dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) {
-           autochanger_list(jcr, dev, dir);
-        } else if (dev_state(dev, ST_READ) || dev->num_writers) {
-           if (dev_state(dev, ST_READ)) {
-                bnet_fsend(dir, _("3901 Device %s is busy with 1 reader.\n"), dev_name(dev));
-           } else {
-                bnet_fsend(dir, _("3902 Device %s is busy with %d writer(s).\n"),
-                  dev_name(dev), dev->num_writers);
-           }
-        } else {                     /* device not being used */
-           autochanger_list(jcr, dev, dir);
-        }
-        V(dev->mutex);
+         } else if (safe_cmd || !dev->is_open() || dev->can_steal_lock()) {
+            autochanger_cmd(dcr, dir, cmd);
+         } else if (dev->is_busy() || dev->is_blocked()) {
+            send_dir_busy_message(dir, dev);
+         } else {                     /* device not being used */
+            autochanger_cmd(dcr, dir, cmd);
+         }
+         dev->dunlock();
+         free_dcr(dcr);
+         jcr->dcr = NULL;
       } else {
-         bnet_fsend(dir, _("3999 Device %s not found\n"), dname);
+         bnet_fsend(dir, _("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str());
       }
    } else {  /* error on scanf */
-      pm_strcpy(&jcr->errmsg, dir->msg);
-      bnet_fsend(dir, _("3908 Error scanning autocharger list command: %s\n"),
-        jcr->errmsg);
+      pm_strcpy(jcr->errmsg, dir->msg);
+      bnet_fsend(dir, _("3908 Error scanning autocharger drives/list/slots command: %s\n"),
+         jcr->errmsg);
    }
-   free_memory(dname);
-   bnet_sig(dir, BNET_EOD);
-   return 1;
+   dir->signal(BNET_EOD);
+   return true;
 }
 
 /*
  * Read and return the Volume label
  */
-static int readlabel_cmd(JCR *jcr)
+static bool readlabel_cmd(JCR *jcr)
 {
-   POOLMEM *dname;
+   POOL_MEM devname;
    BSOCK *dir = jcr->dir_bsock;
    DEVICE *dev;
+   DCR *dcr;
    int Slot;
-
-   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;
-
-        P(dev->mutex);               /* Use P to avoid indefinite block */
-        if (!dev_state(dev, ST_OPENED)) {
-           read_volume_label(jcr, dev, Slot);
-           force_close_dev(dev);
+   int drive;
+
+   if (sscanf(dir->msg, "readlabel %127s Slot=%d drive=%d", devname.c_str(), 
+       &Slot, &drive) == 3) {
+      dcr = find_device(jcr, devname, drive);
+      if (dcr) {
+         dev = dcr->dev;
+         dev->dlock();                 /* Use P to avoid indefinite block */
+         if (!dev->is_open()) {
+            read_volume_label(jcr, dev, Slot);
+            dev->close();
          /* Under certain "safe" conditions, we can steal the lock */
-        } else if (dev->dev_blocked && 
-                   (dev->dev_blocked == BST_UNMOUNTED ||
-                    dev->dev_blocked == BST_WAITING_FOR_SYSOP ||
-                    dev->dev_blocked == BST_UNMOUNTED_WAITING_FOR_SYSOP)) {
-           read_volume_label(jcr, dev, Slot);
-        } else if (dev_state(dev, ST_READ) || dev->num_writers) {
-           if (dev_state(dev, ST_READ)) {
-                bnet_fsend(dir, _("3911 Device %s is busy with 1 reader.\n"),
-                           dev_name(dev));
-           } else {
-                bnet_fsend(dir, _("3912 Device %s is busy with %d writer(s).\n"),
-                  dev_name(dev), dev->num_writers);
-           }
-        } else {                     /* device not being used */
-           read_volume_label(jcr, dev, Slot);
-        }
-        V(dev->mutex);
+         } else if (dev->can_steal_lock()) {
+            read_volume_label(jcr, dev, Slot);
+         } else if (dev->is_busy() || dev->is_blocked()) {
+            send_dir_busy_message(dir, dev);
+         } else {                     /* device not being used */
+            read_volume_label(jcr, dev, Slot);
+         }
+         dev->dunlock();
+         free_dcr(dcr);
+         jcr->dcr = NULL;
       } else {
-         bnet_fsend(dir, _("3999 Device %s not found\n"), dname);
+         bnet_fsend(dir, _("3999 Device \"%s\" not found or could not be opened.\n"), devname.c_str());
       }
    } else {
-      pm_strcpy(&jcr->errmsg, dir->msg);
+      pm_strcpy(jcr->errmsg, dir->msg);
       bnet_fsend(dir, _("3909 Error scanning readlabel command: %s\n"), jcr->errmsg);
    }
-   free_memory(dname);
-   bnet_sig(dir, BNET_EOD);
-   return 1;
+   dir->signal(BNET_EOD);
+   return true;
 }
 
-/* 
+
+/*
  * Read the tape label
  *
  *  Enter with the mutex set
@@ -828,41 +1042,82 @@ static int readlabel_cmd(JCR *jcr)
 static void read_volume_label(JCR *jcr, DEVICE *dev, int Slot)
 {
    BSOCK *dir = jcr->dir_bsock;
-   DEV_BLOCK *block;
    bsteal_lock_t hold;
-   
+   DCR *dcr = jcr->dcr;
+
+   dcr->dev = dev;
    steal_device_lock(dev, &hold, BST_WRITING_LABEL);
-   block = new_block(dev);
-   
-   jcr->VolumeName[0] = 0;
-   jcr->VolCatInfo.Slot = Slot;
-   if (autoload_device(jcr, dev, 0, dir) < 0) {    /* autoload if possible */
-      goto bail_out;
-   }
 
-   /* Ensure that the device is open -- autoload_device() closes it */
-   for ( ; !dev_state(dev, ST_OPENED); ) {
-      if (open_dev(dev, jcr->VolumeName, OPEN_READ_WRITE) < 0) {
-         bnet_fsend(dir, _("3910 Unable to open device \"%s\". ERR=%s\n"), 
-           dev_name(dev), strerror_dev(dev));
-        goto bail_out;
-      }
+   if (!try_autoload_device(jcr, Slot, "")) {
+      goto bail_out;                  /* error */
    }
 
-   dev->state &= ~ST_LABEL;          /* force read of label */
-   switch (read_dev_volume_label(jcr, dev, block)) {               
+   dev->clear_labeled();              /* force read of label */
+   switch (read_dev_volume_label(dcr)) {
    case VOL_OK:
-      bnet_fsend(dir, _("3001 Volume=\"%s\" Slot=%d\n"), dev->VolHdr.VolName, Slot);
-      Dmsg1(100, "Volume: %s\n", dev->VolHdr.VolName);
+      /* 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.VolumeName, Slot);
+      Dmsg1(100, "Volume: %s\n", dev->VolHdr.VolumeName);
       break;
    default:
-      bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device \"%s\" because:\n%s"),
-                dev_name(dev), jcr->errmsg);
+      bnet_fsend(dir, _("3902 Cannot mount Volume on Storage Device %s because:\n%s"),
+                 dev->print_name(), jcr->errmsg);
       break;
    }
 
 bail_out:
-   free_block(block);
    give_back_device_lock(dev, &hold);
    return;
 }
+
+static bool try_autoload_device(JCR *jcr, int slot, const char *VolName)
+{
+   DCR *dcr = jcr->dcr;
+   BSOCK *dir = jcr->dir_bsock;
+
+   bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName));
+   dcr->VolCatInfo.Slot = slot;
+   dcr->VolCatInfo.InChanger = slot > 0;
+   if (autoload_device(dcr, 0, dir) < 0) {    /* autoload if possible */
+      return false;
+   }
+   return true;
+}
+
+static void send_dir_busy_message(BSOCK *dir, DEVICE *dev)
+{
+   if (dev->is_blocked()) {
+      switch (dev->blocked()) {
+      case BST_UNMOUNTED:
+         bnet_fsend(dir, _("3931 Device %s is BLOCKED. user unmounted.\n"),
+            dev->print_name());
+         break;
+      case BST_UNMOUNTED_WAITING_FOR_SYSOP:
+         bnet_fsend(dir, _("3932 Device %s is BLOCKED. user unmounted during wait for media/mount.\n"),
+             dev->print_name());
+         break;
+      case BST_WAITING_FOR_SYSOP:
+         bnet_fsend(dir, _("3933 Device %s is BLOCKED waiting for media.\n"),
+            dev->print_name());
+         break;
+      case BST_DOING_ACQUIRE:
+         bnet_fsend(dir, _("3934 Device %s is being initialized.\n"),
+            dev->print_name());
+         break;
+      case BST_WRITING_LABEL:
+         bnet_fsend(dir, _("3935 Device %s is blocked labeling a Volume.\n"),
+            dev->print_name());
+         break;
+      default:
+         bnet_fsend(dir, _("3935 Device %s is blocked for unknown reason.\n"),
+            dev->print_name());
+         break;
+      }
+   } else if (dev->can_read()) {
+       bnet_fsend(dir, _("3936 Device %s is busy reading.\n"),
+                   dev->print_name());;
+   } else {
+       bnet_fsend(dir, _("3937 Device %s is busy with %d writer(s).\n"),
+          dev->print_name(), dev->num_writers);
+   }
+}