X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Ffiled_conf.h;h=4abd87f1acacbdb0baa8a3cfc28fe2c94abfb2c1;hb=1107141f6e05c9473ace82dfc397cba6b9506dee;hp=956070999b2f7cdf734b3a453088c43dcef10ec0;hpb=6addd2c0541a270fc5ea2fa1b7c9900aea4cde8a;p=bacula%2Fbacula

diff --git a/bacula/src/filed/filed_conf.h b/bacula/src/filed/filed_conf.h
index 956070999b..4abd87f1ac 100644
--- a/bacula/src/filed/filed_conf.h
+++ b/bacula/src/filed/filed_conf.h
@@ -26,55 +26,56 @@
  */
 
 /*
- * Resource codes -- they must be sequential for indexing   
+ * Resource codes -- they must be sequential for indexing
  */
-#define R_FIRST 		      1001
+#define R_FIRST                       1001
 
-#define R_DIRECTOR		      1001
-#define R_CLIENT		      1002
-#define R_MSGS			      1003
+#define R_DIRECTOR                    1001
+#define R_CLIENT                      1002
+#define R_MSGS                        1003
 
-#define R_LAST			      R_MSGS
+#define R_LAST                        R_MSGS
 
 /*
  * Some resource attributes
  */
-#define R_NAME			      1020
-#define R_ADDRESS		      1021
-#define R_PASSWORD		      1022
-#define R_TYPE			      1023
+#define R_NAME                        1020
+#define R_ADDRESS                     1021
+#define R_PASSWORD                    1022
+#define R_TYPE                        1023
 
 
 /* Definition of the contents of each Resource */
-struct s_res_dir {
-   RES	 hdr;
-   char *password;		      /* Director password */
-   char *address;		      /* Director address or zero */
+struct DIRRES {
+   RES   hdr;
+   char *password;                    /* Director password */
+   char *address;                     /* Director address or zero */
+   int enable_ssl;                    /* Use SSL for this Director */
+   int monitor;                       /* Have only access to status and .status functions */
 };
-typedef struct s_res_dir DIRRES;
 
-struct s_res_client {
-   RES	 hdr;
-   int	 FDport;		      /* where we listen for Directors */ 
-   char *FDaddr;		      /* bind address */
+struct CLIENT {
+   RES   hdr;
+   dlist *FDaddrs;
    char *working_directory;
    char *pid_directory;
    char *subsys_directory;
-   struct s_res_msgs *messages;       /* daemon message handler */
+   int require_ssl;                   /* Require SSL on all connections */
+   MSGS *messages;                    /* daemon message handler */
    int MaxConcurrentJobs;
+   utime_t heartbeat_interval;        /* Interval to send heartbeats to Dir */
+   utime_t SDConnectTimeout;          /* timeout in seconds */
+   uint32_t max_network_buffer_size;  /* max network buf size */
 };
-typedef struct s_res_client CLIENT;
 
 
 
 /* Define the Union of all the above
  * resource structure definitions.
  */
-union u_res {
-   struct s_res_dir	res_dir;
-   struct s_res_client	res_client;
-   struct s_res_msgs	res_msgs;
-   RES hdr;
+union URES {
+   DIRRES res_dir;
+   CLIENT res_client;
+   MSGS   res_msgs;
+   RES    hdr;
 };
-
-typedef union u_res URES;