Implement selecting another Volume if busy + cleanup spool messages

[bacula/bacula] / bacula / src / dird / ua.h

diff --git a/bacula/src/dird/ua.h b/bacula/src/dird/ua.h
index f46992802be9aeb8a90879bebb9ec230d59050cc..d2ded609b44d59e11a1e754e5c6811375e75f8db 100644 (file)
--- a/bacula/src/dird/ua.h
+++ b/bacula/src/dird/ua.h
@@ -28,13 +28,13 @@
 #ifndef __UA_H_
 #define __UA_H_ 1
 
-
 struct UAContext {
    BSOCK *UA_sock;
    BSOCK *sd;
    JCR *jcr;
    B_DB *db;
    CAT *catalog;
+   CONRES *cons;                      /* console resource */
    POOLMEM *cmd;                      /* return command/name buffer */
    POOLMEM *args;                     /* command line arguments */
    char *argk[MAX_CMD_ARGS];          /* argument keywords */
@@ -43,13 +43,22 @@ struct UAContext {
    char **prompt;                     /* list of prompts */
    int max_prompts;                   /* max size of list */
    int num_prompts;                   /* current number in list */
-   int auto_display_messages;         /* if set, display messages */
-   int user_notified_msg_pending;     /* set when user notified */
-   int automount;                     /* if set, mount after label */
-   int quit;                          /* if set, quit */
-   int verbose;                       /* set for normal UA verbosity */
+   bool auto_display_messages;        /* if set, display messages */
+   bool user_notified_msg_pending;    /* set when user notified */
+   bool automount;                    /* if set, mount after label */
+   bool quit;                         /* if set, quit */
+   bool verbose;                      /* set for normal UA verbosity */
    uint32_t pint32_val;               /* positive integer */
    int32_t  int32_val;                /* positive/negative */
 };          
 
+/* Context for insert_tree_handler() */
+struct TREE_CTX {
+   TREE_ROOT *root;                   /* root */
+   TREE_NODE *node;                   /* current node */
+   TREE_NODE *avail_node;             /* unused node last insert */
+   int cnt;                           /* count for user feedback */
+   UAContext *ua;
+};
+
 #endif