X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fserver_util.h;h=656e43af56918d551fd805326169ccb258b5f662;hb=c6f0a88c567f8536c498f554285aed1f8150da18;hp=92beadea4a0389196718bde61268cfa47fd1e74b;hpb=d3b2175e084f88c8736ad7073eacbf4670147aec;p=debian%2Famanda

diff --git a/server-src/server_util.h b/server-src/server_util.h
index 92beade..656e43a 100644
--- a/server-src/server_util.h
+++ b/server-src/server_util.h
@@ -32,6 +32,7 @@
 
 #include "util.h"
 #include "diskfile.h"
+#include "infofile.h"
 
 #define MAX_ARGS 32
 
@@ -45,32 +46,58 @@ enum {
     START, FILE_DUMP, PORT_DUMP, CONTINUE, ABORT,	/* dumper cmds */
     FAILED, TRYAGAIN, NO_ROOM, RQ_MORE_DISK,		/* dumper results */
     ABORT_FINISHED, BAD_COMMAND,			/* dumper results */
-    START_TAPER, FILE_WRITE, PORT_WRITE,		/* taper cmds */
-    PORT, TAPE_ERROR, TAPER_OK,	SPLIT_NEEDNEXT,         /* taper results */
-    SPLIT_CONTINUE,
-    LAST_TOK
+    START_TAPER, FILE_WRITE, NEW_TAPE, NO_NEW_TAPE,     /* taper... */
+    PARTDONE, PORT_WRITE, DUMPER_STATUS,                /* ... cmds */
+    PORT, TAPE_ERROR, TAPER_OK,				/* taper results */
+    REQUEST_NEW_TAPE, DIRECTTCP_PORT, TAKE_SCRIBE_FROM,
+    START_SCAN, CLOSE_VOLUME, LAST_TOK
 };
 extern const char *cmdstr[];
 
 struct cmdargs {
+    cmd_t cmd;
     int argc;
-    char *argv[MAX_ARGS + 1];
+    char **argv;
 };
 
-cmd_t getcmd(struct cmdargs *cmdargs);
-cmd_t getresult(int fd, int show, int *result_argc, char **result_argv, int max_arg);
-void putresult(cmd_t result, const char *, ...)
-     __attribute__ ((format (printf, 2, 3)));
+struct cmdargs *getcmd(void);
+struct cmdargs *get_pending_cmd(void);
+void free_cmdargs(struct cmdargs *cmdargs);
+void putresult(cmd_t result, const char *, ...) G_GNUC_PRINTF(2, 3);
 int taper_cmd(cmd_t cmd, void *ptr, char *destname, int level, char *datestamp);
 
 struct disk_s;
 struct chunker_s;
-int chunker_cmd(struct chunker_s *chunker, cmd_t cmd, struct disk_s *dp);
+int chunker_cmd(struct chunker_s *chunker, cmd_t cmd, struct disk_s *dp,
+		char *mesg);
 
 struct dumper_s;
-int dumper_cmd(struct dumper_s *dumper, cmd_t cmd, struct disk_s *dp);
+int dumper_cmd(struct dumper_s *dumper, cmd_t cmd, struct disk_s *dp,
+	       char *mesg);
 
 char *amhost_get_security_conf(char *string, void *arg);
 int check_infofile(char *infodir, disklist_t *dl, char **errmsg);
 
+void run_server_script(pp_script_t  *pp_script,
+		       execute_on_t  execute_on,
+		       char         *config,
+		       disk_t       *dp,
+		       int           level);
+void run_server_dle_scripts(execute_on_t  execute_on,
+			    char         *config,
+			    disk_t       *dp,
+		            int           level);
+void run_server_host_scripts(execute_on_t  execute_on,
+			     char         *config,
+			     am_host_t    *hostp);
+void run_server_global_scripts(execute_on_t  execute_on,
+			       char         *config);
+
+void run_amcleanup(char *config_name);
+char *get_master_process(char *logfile);
+
+gint64 internal_server_estimate(disk_t *dp, info_t *info,
+                                int level, int *stats);
+int server_can_do_estimate(disk_t *dp, info_t *info, int level);
+
 #endif	/* SERVER_UTIL_H */