added WSACleanup(), corrected WSA_Init() (removed #ifdef)

[bacula/bacula] / bacula / src / stored / stored_conf.h

diff --git a/bacula/src/stored/stored_conf.h b/bacula/src/stored/stored_conf.h
index 65438b93bd475fed189d46d47dd175b56e0b5c8b..16f793e97a053ca159904276a2166f43d01af231 100644 (file)
--- a/bacula/src/stored/stored_conf.h
+++ b/bacula/src/stored/stored_conf.h
@@ -23,21 +23,22 @@
 
  */
 
-#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 */
+};
 
-#define R_NAME                       3020
-#define R_ADDRESS                    3021
-#define R_PASSWORD                   3022
-#define R_TYPE                       3023
-#define R_BACKUP                     3024
+enum {
+   R_NAME = 3020,
+   R_ADDRESS,
+   R_PASSWORD,
+   R_TYPE,
+   R_BACKUP
+};
 
 /* Definition of the contents of each Resource */
 struct DIRRES {
@@ -75,6 +76,8 @@ struct DEVRES {
    char *device_name;                /* Archive device name */
    char *changer_name;               /* Changer device name */
    char *changer_command;            /* Changer 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 */
@@ -83,11 +86,14 @@ struct DEVRES {
    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 */
 };