Backport from Bacula Enterprise

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

diff --git a/bacula/src/filed/protos.h b/bacula/src/filed/protos.h
index ac9863a9d670d1ed5ff82f469cf44a57adb07306..96a836c95ad30b5a2c98612e598d61065733b344 100644 (file)
--- a/bacula/src/filed/protos.h
+++ b/bacula/src/filed/protos.h
@@ -1,17 +1,21 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  * Written by Kern Sibbald, MM
@@ -21,10 +25,21 @@
 extern bool blast_data_to_storage_daemon(JCR *jcr, char *addr);
 extern void do_verify_volume(JCR *jcr);
 extern void do_restore(JCR *jcr);
-extern int authenticate_director(JCR *jcr);
-extern int authenticate_storagedaemon(JCR *jcr);
 extern int make_estimate(JCR *jcr);
 
+/* From authenticate.c */
+bool authenticate_director(JCR *jcr);
+bool authenticate_storagedaemon(JCR *jcr);
+
+/* From hello.c */
+bool validate_dir_hello(JCR *jcr);
+bool send_hello_ok(BSOCK *bs);
+bool send_sorry(BSOCK *bs);
+bool send_hello_sd(JCR *jcr, char *Job);
+void *handle_storage_connection(BSOCK *sd);
+bool send_fdcaps(JCR *jcr);
+bool recv_sdcaps(JCR *jcr);
+
 /* From verify.c */
 int digest_file(JCR *jcr, FF_PKT *ff_pkt, DIGEST *digest);
 void do_verify(JCR *jcr);
@@ -36,8 +51,9 @@ void start_dir_heartbeat(JCR *jcr);
 void stop_dir_heartbeat(JCR *jcr);
 
 /* From acl.c */
-bacl_exit_code build_acl_streams(JCR *jcr, FF_PKT *ff_pkt);
-bacl_exit_code parse_acl_streams(JCR *jcr, int stream, char *content, uint32_t content_length);
+bool backup_acl_streams(JCR *jcr, FF_PKT *ff_pkt);
+bacl_rtn_code restore_acl_streams(JCR *jcr, int stream, char *content, 
+   uint32_t content_length);
 
 /* from accurate.c */
 bool accurate_finish(JCR *jcr);
@@ -46,13 +62,13 @@ bool accurate_mark_file_as_seen(JCR *jcr, char *fname);
 void accurate_free(JCR *jcr);
 
 /* from backup.c */
-bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream);
 void strip_path(FF_PKT *ff_pkt);
 void unstrip_path(FF_PKT *ff_pkt);
 
 /* from xattr.c */
-bxattr_exit_code build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt);
-bxattr_exit_code parse_xattr_streams(JCR *jcr, int stream, char *content, uint32_t content_length);
+bool backup_xattr_streams(JCR *jcr, FF_PKT *ff_pkt);
+bxattr_rtn_code restore_xattr_streams(JCR *jcr, int stream, 
+   char *content, uint32_t content_length);
 
 /* from job.c */
 findINCEXE *new_exclude(JCR *jcr);
@@ -65,3 +81,6 @@ int add_options_to_fileset(JCR *jcr, const char *item);
 int add_wild_to_fileset(JCR *jcr, const char *item, int type);
 int add_regex_to_fileset(JCR *jcr, const char *item, int type);
 findINCEXE *new_include(JCR *jcr);
+
+/* from snapshot.c */
+int snapshot_cmd(JCR *jcr);