X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fstored%2Fstored_conf.h;h=2c4bc74bc756c4e8511880f9955c40148c9e69ae;hb=043d4236db58b727d21b634bdc774ab2caa7bea2;hp=65438b93bd475fed189d46d47dd175b56e0b5c8b;hpb=0a9df1396b3b144f5593c39cc14534bcb7827fac;p=bacula%2Fbacula

diff --git a/bacula/src/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index 65438b93bd..2c4bc74bc7 100644
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -23,72 +23,79 @@
 
  */
 
-#define R_FIRST 		      3001
-
-#define R_DIRECTOR		      3001
-#define R_STORAGE		      3002
-#define R_DEVICE		      3003
-#define R_MSGS			      3004
-
-#define R_LAST			      R_MSGS
+enum {
+   R_DIRECTOR = 3001,
+   R_STORAGE,
+   R_DEVICE,
+   R_MSGS,
+   R_FIRST = R_DIRECTOR,
+   R_LAST  = R_MSGS                   /* keep this updated */
+};
 
+enum {
+   R_NAME = 3020,
+   R_ADDRESS,
+   R_PASSWORD,
+   R_TYPE,
+   R_BACKUP
+};
 
-#define R_NAME			      3020
-#define R_ADDRESS		      3021
-#define R_PASSWORD		      3022
-#define R_TYPE			      3023
-#define R_BACKUP		      3024
 
 /* Definition of the contents of each Resource */
 struct DIRRES {
-   RES	 hdr;
+   RES   hdr;
 
-   char *password;		      /* Director password */
-   char *address;		      /* Director IP address or zero */
-   int enable_ssl;		      /* Use SSL with this Director */
+   char *password;                    /* Director password */
+   char *address;                     /* Director IP address or zero */
+   int enable_ssl;                    /* Use SSL with this Director */
+   int monitor;                       /* Have only access to status and .status functions */
 };
 
 
 /* Storage daemon "global" definitions */
 struct s_res_store {
-   RES	 hdr;
+   RES   hdr;
 
-   char *address;		      /* deprecated */
-   char *SDaddr;		      /* bind address */
-   int	 SDport;		      /* Where we listen for Directors */
-   int   SDDport;                     /* "Data" port where we listen for File daemons */
-   char *working_directory;	      /* working directory for checkpoints */
+   dlist *sdaddrs;
+   dlist *sddaddrs;
+   char *working_directory;           /* working directory for checkpoints */
    char *pid_directory;
    char *subsys_directory;
-   int require_ssl;		      /* Require SSL on all connections */
+   int require_ssl;                   /* Require SSL on all connections */
    uint32_t max_concurrent_jobs;      /* maximum concurrent jobs to run */
-   MSGS *messages;		      /* Daemon message handler */
-   utime_t heartbeat_interval;	      /* Interval to send hb to FD */
+   MSGS *messages;                    /* Daemon message handler */
+   utime_t heartbeat_interval;        /* Interval to send hb to FD */
 };
 typedef struct s_res_store STORES;
 
 /* Device specific definitions */
 struct DEVRES {
-   RES	 hdr;
-
-   char *media_type;		      /* User assigned media type */
-   char *device_name;		      /* Archive device name */
-   char *changer_name;		      /* Changer device name */
-   char *changer_command;	      /* Changer command  -- external program */
-   uint32_t cap_bits;		      /* Capabilities of this device */
-   uint32_t max_changer_wait;	      /* Changer timeout */
-   uint32_t max_rewind_wait;	      /* maximum secs to wait for rewind */
-   uint32_t max_open_wait;	      /* maximum secs to wait for open */
-   uint32_t max_open_vols;	      /* maximum simultaneous open volumes */
-   uint32_t min_block_size;	      /* min block size */
-   uint32_t max_block_size;	      /* max block size */
-   uint32_t max_volume_jobs;	      /* max jobs to put on one volume */
-   utime_t  vol_poll_interval;	      /* interval between polling volume during mount */
-   int64_t max_volume_files;	      /* max files to put on one volume */
-   int64_t max_volume_size;	      /* max bytes to put on one volume */
-   int64_t max_file_size;	      /* max file size in bytes */
-   int64_t volume_capacity;	      /* advisory capacity */
-   DEVICE *dev; 		      /* Pointer to phyical dev -- set at runtime */
+   RES   hdr;
+
+   char *media_type;                  /* User assigned media type */
+   char *device_name;                 /* Archive device name */
+   char *changer_name;                /* Changer device name */
+   char *changer_command;             /* Changer command  -- external program */
+   char *alert_command;               /* Alert command -- external program */
+   char *spool_directory;             /* Spool file directory */
+   uint32_t drive_index;              /* Autochanger drive index */
+   uint32_t cap_bits;                 /* Capabilities of this device */
+   uint32_t max_changer_wait;         /* Changer timeout */
+   uint32_t max_rewind_wait;          /* maximum secs to wait for rewind */
+   uint32_t max_open_wait;            /* maximum secs to wait for open */
+   uint32_t max_open_vols;            /* maximum simultaneous open volumes */
+   uint32_t min_block_size;           /* min block size */
+   uint32_t max_block_size;           /* max block size */
+   uint32_t max_volume_jobs;          /* max jobs to put on one volume */
+   uint32_t max_network_buffer_size;  /* max network buf size */
+   utime_t  vol_poll_interval;        /* interval between polling volume during mount */
+   int64_t max_volume_files;          /* max files to put on one volume */
+   int64_t max_volume_size;           /* max bytes to put on one volume */
+   int64_t max_file_size;             /* max file size in bytes */
+   int64_t volume_capacity;           /* advisory capacity */
+   int64_t max_spool_size;            /* Max spool size for all jobs */
+   int64_t max_job_spool_size;        /* Max spool size for any single job */
+   DEVICE *dev;                       /* Pointer to phyical dev -- set at runtime */
 };
 
 union URES {
@@ -96,5 +103,5 @@ union URES {
    STORES res_store;
    DEVRES res_dev;
    MSGS   res_msgs;
-   RES	  hdr;
+   RES    hdr;
 };