X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Famxml.h;h=04d45ed25195d7b1edd798c4943864e63debc7d1;hb=HEAD;hp=82dc0105e8cfe20996dbbdba97f33584d7854dff;hpb=afaa71b3866b46b082b6c895772e15b36d8865fe;p=debian%2Famanda

diff --git a/common-src/amxml.h b/common-src/amxml.h
index 82dc010..04d45ed 100644
--- a/common-src/amxml.h
+++ b/common-src/amxml.h
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -40,23 +41,29 @@ typedef struct script_s {
     execute_on_t                   execute_on;
     int                            execute_where;
     proplist_t                     property;
+    char                          *client_name;
     struct client_script_result_s *result;
 } script_t;
 
 typedef GSList *scriptlist_t;
 
+typedef struct level_s {
+    int level;
+    int server;			/* if server can do the estimate */
+} am_level_t;
+typedef GSList *levellist_t;	/* A list where each element is a (am_level_t *) */
+
 typedef struct a_dle_s {
     char   *disk;
     char   *device;
     int     program_is_application_api;
     char   *program;
-    int     calcsize;
-    estimate_t     estimate;
+    estimatelist_t estimatelist;
     int     spindle;
     int     compress;
     int     encrypt;
     int     kencrypt;
-    GSList *level;
+    levellist_t levellist;
     int     nb_level;
     char   *dumpdate;
     char   *compprog;
@@ -67,19 +74,25 @@ typedef struct a_dle_s {
     int     record;
     int     create_index;
     char   *auth;
-    sl_t   *exclude_file;
-    sl_t   *exclude_list;
-    sl_t   *include_file;
-    sl_t   *include_list;
+    am_sl_t   *exclude_file;
+    am_sl_t   *exclude_list;
+    am_sl_t   *include_file;
+    am_sl_t   *include_list;
     int     exclude_optional;
     int     include_optional;
+    proplist_t property;
     proplist_t application_property;
+    char        *application_client_name;
     scriptlist_t scriptlist;
+    data_path_t  data_path;
+    GSList      *directtcp_list;
     struct a_dle_s *next;
 } dle_t;
 
 dle_t *alloc_dle(void);
 void   init_dle(dle_t *dle);
+void   free_dle(dle_t *dle);
+void   free_script_data(script_t *script);
 dle_t *amxml_parse_node_CHAR(char *txt, char **errmsg);
 dle_t *amxml_parse_node_FILE(FILE *file, char **errmsg);
 char  *amxml_format_tag(char *tag, char *value);