Merge Meno's IPv6-1 code

[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 ee2f15847d55fbdfb0f62c327ed948d3d4988b0a..a91f48b07b36fadc85b1776eed2a1532acfa2a54 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -6,7 +6,7 @@
  *    Version $Id$
  */
 /*
-   Copyright (C) 2000-2003 2002 Kern Sibbald and John Walker
+   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
@@ -42,38 +42,40 @@ enum {
    R_MSGS,
    R_COUNTER,
    R_CONSOLE,
-   R_JOBDEFS
+   R_JOBDEFS,
+   R_FIRST = R_DIRECTOR,
+   R_LAST  = R_JOBDEFS                /* keep this updated */
 };
 
-#define R_FIRST  R_DIRECTOR
-#define R_LAST   R_JOBDEFS    
 
 /*
  * Some resource attributes
  */
-#define R_NAME                1020
-#define R_ADDRESS             1021
-#define R_PASSWORD            1022
-#define R_TYPE                1023
-#define R_BACKUP              1024
+enum {
+   R_NAME = 1020,
+   R_ADDRESS,
+   R_PASSWORD,
+   R_TYPE,
+   R_BACKUP
+};
 
 
 /* Used for certain KeyWord tables */
 struct s_kw {       
-   char *name;
+   const char *name;
    int token;   
 };
 
 /* Job Level keyword structure */
 struct s_jl {
-   char *level_name;                  /* level keyword */
+   const char *level_name;                  /* level keyword */
    int  level;                        /* level */
    int  job_type;                     /* JobType permitting this level */
 };
 
 /* Job Type keyword structure */
 struct s_jt {
-   char *type_name;
+   const char *type_name;
    int job_type;
 };
 
@@ -91,8 +93,7 @@ struct RUN;
  */
 struct DIRRES {
    RES   hdr;
-   int   DIRport;                     /* where we listen -- UA port server port */
-   char *DIRaddr;                     /* bind address */
+   dlist *DIRaddrs;
    char *password;                    /* Password for UA access */
    int enable_ssl;                    /* Use SSL for UA */
    char *query_file;                  /* SQL query file */
@@ -216,6 +217,7 @@ struct JOB {
    int PruneFiles;                    /* Force pruning of Files */
    int PruneVolumes;                  /* Force pruning of Volumes */
    int SpoolAttributes;               /* Set to spool attributes in SD */
+   int spool_data;                    /* Set to spool data in SD */
    uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
    int RescheduleOnError;             /* Set to reschedule on error */
    int RescheduleTimes;               /* Number of times to reschedule job */
@@ -228,18 +230,23 @@ struct JOB {
    FILESET   *fileset;                /* What to backup -- Fileset */
    STORE     *storage;                /* Where is device -- Storage daemon */
    POOL      *pool;                   /* Where is media -- Media Pool */
+   POOL      *full_pool;              /* Pool for Full backups */
+   POOL      *inc_pool;               /* Pool for Incremental backups */
+   POOL      *dif_pool;               /* Pool for Differental backups */
    JOB       *verify_job;             /* Job name to verify */
    JOB       *jobdefs;                /* Job defaults */
    uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
 };
 
+#undef  MAX_FOPTS
 #define MAX_FOPTS 30
 
 /* File options structure */
 struct FOPTS {
    char opts[MAX_FOPTS];              /* options string */
-   alist match;                       /* match string(s) */
-   alist base_list;                   /* list of base names */
+   alist regex;                       /* regex string(s) */
+   alist wild;                        /* wild card strings */
+   alist base;                        /* list of base names */
 };
 
 
@@ -258,12 +265,12 @@ struct INCEXE {
 struct FILESET {
    RES   hdr;
 
-   int new_include;                   /* Set if new include used */
+   bool new_include;                  /* Set if new include used */
    INCEXE **include_items;            /* array of incexe structures */
    int num_includes;                  /* number in array */
    INCEXE **exclude_items;
    int num_excludes;
-   int have_MD5;                      /* set if MD5 initialized */
+   bool have_MD5;                     /* set if MD5 initialized */
    struct MD5Context md5c;            /* MD5 of include/exclude */
    char MD5[30];                      /* base 64 representation of MD5 */
 };
@@ -347,7 +354,12 @@ struct RUN {
    int level;                         /* level override */
    int Priority;                      /* priority override */
    int job_type;  
+   bool spool_data;                   /* Data spooling override */
+   bool spool_data_set;               /* Data spooling override given */
    POOL *pool;                        /* Pool override */
+   POOL *full_pool;                   /* Pool override */
+   POOL *inc_pool;                    /* Pool override */
+   POOL *dif_pool;                    /* Pool override */
    STORE *storage;                    /* Storage override */
    MSGS *msgs;                        /* Messages override */
    char *since;