new devel_bacula + fixes to conio/console

[bacula/bacula] / bacula / src / filed / filed_conf.h

diff --git a/bacula/src/filed/filed_conf.h b/bacula/src/filed/filed_conf.h
index 377c8c0a987b73e89ddbe837fb553f279b4ea942..08f00351338cb8de4cb55abc3358b87ddbe8fcce 100644 (file)
--- a/bacula/src/filed/filed_conf.h
+++ b/bacula/src/filed/filed_conf.h
@@ -46,15 +46,14 @@
 
 
 /* Definition of the contents of each Resource */
-struct s_res_dir {
+struct DIRRES {
    RES   hdr;
    char *password;                    /* Director password */
    char *address;                     /* Director address or zero */
    int enable_ssl;                    /* Use SSL for this Director */
 };
-typedef struct s_res_dir DIRRES;
 
-struct s_res_client {
+struct CLIENT {
    RES   hdr;
    int   FDport;                      /* where we listen for Directors */ 
    char *FDaddr;                      /* bind address */
@@ -62,22 +61,20 @@ struct s_res_client {
    char *pid_directory;
    char *subsys_directory;
    int require_ssl;                   /* Require SSL on all connections */
-   struct s_res_msgs *messages;       /* daemon message handler */
+   MSGS *messages;                    /* daemon message handler */
    int MaxConcurrentJobs;
    utime_t heartbeat_interval;        /* Interval to send heartbeats to Dir */
+   utime_t SDConnectTimeout;          /* timeout in seconds */
 };
-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;