jcr: separate file for ProtocolTypes

core/src/dird/backup.cc

@@ -48,6 +48,7 @@
 #include "dird/sd_cmds.h"
 #include "ndmp/smc.h"
 #include "dird/storage.h"
+#include "include/protocol_types.h"
 
 #include "cats/sql.h"
 #include "lib/bnet.h"

core/src/dird/dird_conf.cc

@@ -52,6 +52,7 @@
 #include "dird/inc_conf.h"
 #include "dird/dird_globals.h"
 #include "dird/jcr_private.h"
+#include "include/protocol_types.h"
 #include "lib/berrno.h"
 #include "lib/breg.h"
 #include "lib/tls_conf.h"

core/src/dird/job.cc

@@ -70,6 +70,7 @@
 #include "lib/util.h"
 #include "lib/watchdog.h"
 #include "include/make_unique.h"
+#include "include/protocol_types.h"
 
 namespace directordaemon {
 

core/src/dird/ndmp_fhdb_helpers.cc

@@ -29,6 +29,7 @@
 
 #include "include/bareos.h"
 #include "dird.h"
+#include "include/protocol_types.h"
 
 #if HAVE_NDMP
 

core/src/dird/restore.cc

@@ -52,6 +52,7 @@
 #include "dird/restore.h"
 #include "dird/sd_cmds.h"
 #include "dird/storage.h"
+#include "include/protocol_types.h"
 #include "lib/edit.h"
 #include "lib/util.h"
 

core/src/dird/ua_restore.cc

@@ -49,6 +49,7 @@
 #include "lib/parse_conf.h"
 #include "lib/tree.h"
 #include "include/make_unique.h"
+#include "include/protocol_types.h"
 
 namespace directordaemon {
 

core/src/include/jcr.h

@@ -51,16 +51,6 @@ typedef struct s_tree_root TREE_ROOT;
 
 class dlist;
 
-/**
- * Protocol types
- */
-enum
-{
-  PT_NATIVE = 0,
-  PT_NDMP_BAREOS, /* alias for PT_NDMP */
-  PT_NDMP_NATIVE
-};
-
 /**
  * Authentication Protocol types
  */

core/src/include/protocol_types.h

@@ -0,0 +1,34 @@
+/*
+   BAREOS® - Backup Archiving REcovery Open Sourced
+
+   Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
+   Copyright (C) 2011-2012 Planets Communications B.V.
+   Copyright (C) 2013-2019 Bareos GmbH & Co. KG
+
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+*/
+
+#ifndef BAREOS_SRC_INCLUDE_PROTOCOL_TYPES_H_
+#define BAREOS_SRC_INCLUDE_PROTOCOL_TYPES_H_
+
+enum ProtocolTypes
+{
+  PT_NATIVE = 0,
+  PT_NDMP_BAREOS, /* alias for PT_NDMP */
+  PT_NDMP_NATIVE
+};
+
+#endif  // BAREOS_SRC_INCLUDE_PROTOCOL_TYPES_H_

core/src/stored/dir_cmd.cc

@@ -61,6 +61,7 @@
 #include "stored/job.h"
 #include "stored/mac.h"
 #include "include/make_unique.h"
+#include "include/protocol_types.h"
 #include "lib/berrno.h"
 #include "lib/bnet.h"
 #include "lib/bsock.h"

core/src/stored/job.cc

@@ -42,6 +42,7 @@
 #include "lib/parse_bsr.h"
 #include "lib/util.h"
 #include "include/jcr.h"
+#include "include/protocol_types.h"
 
 namespace storagedaemon {