Add new files

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

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 62531405afcbc01badfd810d629289c6ad9a0697..869343b245bd8bf6da8ccc15c5d9387dc5d2a21b 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -30,31 +30,31 @@
 /*
  * Resource codes -- they must be sequential for indexing   
  */
-#define R_FIRST                       1001
-
-#define R_DIRECTOR                    1001
-#define R_CLIENT                      1002
-#define R_JOB                         1003
-#define R_STORAGE                     1004
-#define R_CATALOG                     1005
-#define R_SCHEDULE                    1006
-#define R_FILESET                     1007
-#define R_GROUP                       1008
-#define R_POOL                        1009
-#define R_MSGS                        1010
-#define R_COUNTER                     1011
-#define R_CONSOLE                     1012
-
-#define R_LAST                        R_CONSOLE
+#define R_FIRST               1001
+
+#define R_DIRECTOR            1001
+#define R_CLIENT              1002
+#define R_JOB                 1003
+#define R_STORAGE             1004
+#define R_CATALOG             1005
+#define R_SCHEDULE            1006
+#define R_FILESET             1007
+#define R_GROUP               1008
+#define R_POOL                1009
+#define R_MSGS                1010
+#define R_COUNTER             1011
+#define R_CONSOLE             1012
+
+#define R_LAST                R_CONSOLE
 
 /*
  * Some resource attributes
  */
-#define R_NAME                        1020
-#define R_ADDRESS                     1021
-#define R_PASSWORD                    1022
-#define R_TYPE                        1023
-#define R_BACKUP                      1024
+#define R_NAME                1020
+#define R_ADDRESS             1021
+#define R_PASSWORD            1022
+#define R_TYPE                1023
+#define R_BACKUP              1024
 
 
 /* Used for certain KeyWord tables */
@@ -99,7 +99,7 @@ struct DIRRES {
    char *pid_directory;               /* PidDirectory */
    char *subsys_directory;            /* SubsysDirectory */
    int require_ssl;                   /* Require SSL for all connections */
-   struct s_res_msgs *messages;       /* Daemon message handler */
+   MSGS *messages;                    /* Daemon message handler */
    uint32_t MaxConcurrentJobs;        /* Max concurrent jobs for whole director */
    utime_t FDConnectTimeout;          /* timeout for connect in seconds */
    utime_t SDConnectTimeout;          /* timeout in seconds */
@@ -194,6 +194,9 @@ struct JOB {
    int PruneVolumes;                  /* Force pruning of Volumes */
    int SpoolAttributes;               /* Set to spool attributes in SD */
    uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
+   int RescheduleOnError;             /* Set to reschedule on error */
+   int RescheduleTimes;               /* Number of times to reschedule job */
+   utime_t RescheduleInterval;        /* Reschedule interval */
   
    MSGS                *messages;     /* How and where to send messages */
    SCHED               *schedule;     /* When -- Automatic schedule */
@@ -271,8 +274,10 @@ struct COUNTER {
 
    int32_t MinValue;                  /* Minimum value */
    int32_t MaxValue;                  /* Maximum value */
-   int     Global;                    /* global/local */
-   char  *WrapCounter;                /* Wrap counter name */
+   int32_t CurrentValue;              /* Current value */
+   CAT   *WrapCounter;                /* Wrap counter name */
+   CAT   *Catalog;                    /* Where to store */
+   bool    created;                   /* Created in DB */
 };
 
 /*
@@ -282,7 +287,6 @@ struct COUNTER {
 struct POOL {
    RES   hdr;
 
-   COUNTER counter;                   /* Counter resources */
    char *pool_type;                   /* Pool type */
    char *label_format;                /* Label format string */
    char *cleaning_prefix;             /* Cleaning label prefix */
@@ -306,19 +310,19 @@ struct POOL {
  * resource structure definitions.
  */
 union URES {
-   DIRRES               res_dir;
-   CONRES               res_con;
-   CLIENT               res_client;
-   STORE                res_store;
-   CAT                  res_cat;
-   JOB                  res_job;
-   FILESET              res_fs;
-   SCHED                res_sch;
-   GROUP                res_group;
-   POOL                 res_pool;
-   MSGS                 res_msgs;
-   COUNTER              res_counter;
-   RES hdr;
+   DIRRES     res_dir;
+   CONRES     res_con;
+   CLIENT     res_client;
+   STORE      res_store;
+   CAT        res_cat;
+   JOB        res_job;
+   FILESET    res_fs;
+   SCHED      res_sch;
+   GROUP      res_group;
+   POOL       res_pool;
+   MSGS       res_msgs;
+   COUNTER    res_counter;
+   RES        hdr;
 };