lib, mgmtd: move common header to lib

The common header included from lib and other daemons should be located
in lib, not in mgmt directory.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

11 files changed, 9 insertions, 36 deletions

diff --git a/lib/mgmt_be_client.h b/lib/mgmt_be_client.h
index 051c908a37..3af87a73cd 100644
--- a/lib/mgmt_be_client.h
+++ b/lib/mgmt_be_client.h
@@ -14,7 +14,7 @@ extern "C" {
 
 #include "northbound.h"
 #include "mgmt_pb.h"
-#include "mgmtd/mgmt_defines.h"
+#include "mgmt_defines.h"
 
 /***************************************************************
  * Constants
diff --git a/mgmtd/mgmt_defines.h b/lib/mgmt_defines.h
index 40fa67075d..3b7f8f1ef6 100644
--- a/mgmtd/mgmt_defines.h
+++ b/lib/mgmt_defines.h
@@ -32,27 +32,4 @@ enum mgmt_result {
 	MGMTD_UNKNOWN_FAILURE
 };
 
-enum mgmt_fe_event {
-	MGMTD_FE_SERVER = 1,
-	MGMTD_FE_CONN_READ,
-	MGMTD_FE_CONN_WRITE,
-	MGMTD_FE_PROC_MSG
-};
-
-enum mgmt_be_event {
-	MGMTD_BE_SERVER = 1,
-	MGMTD_BE_CONN_INIT,
-	MGMTD_BE_CONN_READ,
-	MGMTD_BE_CONN_WRITE,
-	MGMTD_BE_PROC_MSG,
-	MGMTD_BE_SCHED_CFG_PREPARE,
-	MGMTD_BE_RESCHED_CFG_PREPARE,
-	MGMTD_BE_SCHED_CFG_APPLY,
-	MGMTD_BE_RESCHED_CFG_APPLY,
-};
-
-#define MGMTD_TXN_ID_NONE 0
-
-#define MGMTD_TXN_BATCH_ID_NONE 0
-
 #endif /* _FRR_MGMTD_DEFINES_H */
diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h
index 349b7e4cf4..d770748f23 100644
--- a/lib/mgmt_fe_client.h
+++ b/lib/mgmt_fe_client.h
@@ -14,7 +14,7 @@ extern "C" {
 
 #include "mgmt_pb.h"
 #include "frrevent.h"
-#include "mgmtd/mgmt_defines.h"
+#include "mgmt_defines.h"
 
 /***************************************************************
  * Macros
diff --git a/lib/subdir.am b/lib/subdir.am
index 0c718d12aa..c4ddb87c1f 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -253,6 +253,7 @@ pkginclude_HEADERS += \
 	lib/memory.h \
 	lib/mgmt.pb-c.h \
 	lib/mgmt_be_client.h \
+	lib/mgmt_defines.h \
 	lib/mgmt_fe_client.h \
 	lib/mgmt_msg.h \
 	lib/mgmt_pb.h \
diff --git a/mgmtd/mgmt.h b/mgmtd/mgmt.h
index d89d76f5d5..019465980d 100644
--- a/mgmtd/mgmt.h
+++ b/mgmtd/mgmt.h
@@ -13,9 +13,9 @@
 #include "vrf.h"
 #include "defaults.h"
 #include "stream.h"
+#include "mgmt_defines.h"
 
 #include "mgmtd/mgmt_memory.h"
-#include "mgmtd/mgmt_defines.h"
 #include "mgmtd/mgmt_history.h"
 #include "mgmtd/mgmt_txn.h"
 #include "mgmtd/mgmt_ds.h"
diff --git a/mgmtd/mgmt_be_adapter.h b/mgmtd/mgmt_be_adapter.h
index c4ec06093d..c7041a7940 100644
--- a/mgmtd/mgmt_be_adapter.h
+++ b/mgmtd/mgmt_be_adapter.h
@@ -12,7 +12,7 @@
 
 #include "mgmt_be_client.h"
 #include "mgmt_msg.h"
-#include "mgmtd/mgmt_defines.h"
+#include "mgmt_defines.h"
 #include "mgmtd/mgmt_ds.h"
 
 #define MGMTD_BE_CONN_INIT_DELAY_MSEC 50
diff --git a/mgmtd/mgmt_ds.h b/mgmtd/mgmt_ds.h
index 1cf4816027..ca08e37dac 100644
--- a/mgmtd/mgmt_ds.h
+++ b/mgmtd/mgmt_ds.h
@@ -11,8 +11,8 @@
 
 #include "mgmt_fe_client.h"
 #include "northbound.h"
+#include "mgmt_defines.h"
 
-#include "mgmtd/mgmt_defines.h"
 #include "mgmtd/mgmt_be_adapter.h"
 #include "mgmtd/mgmt_fe_adapter.h"
 
diff --git a/mgmtd/mgmt_fe_adapter.h b/mgmtd/mgmt_fe_adapter.h
index d2991ec1db..1560916c85 100644
--- a/mgmtd/mgmt_fe_adapter.h
+++ b/mgmtd/mgmt_fe_adapter.h
@@ -12,7 +12,7 @@
 
 #include "mgmt_fe_client.h"
 #include "mgmt_msg.h"
-#include "mgmtd/mgmt_defines.h"
+#include "mgmt_defines.h"
 
 struct mgmt_fe_client_adapter;
 struct mgmt_master;
diff --git a/mgmtd/mgmt_txn.h b/mgmtd/mgmt_txn.h
index 8ca7e70cab..982ab7c333 100644
--- a/mgmtd/mgmt_txn.h
+++ b/mgmtd/mgmt_txn.h
@@ -26,6 +26,8 @@
 #define MGMTD_TXN_CLEANUP_DELAY_MSEC 100
 #define MGMTD_TXN_CLEANUP_DELAY_USEC 10
 
+#define MGMTD_TXN_ID_NONE 0
+
 /*
  * The following definition enables local validation of config
  * on the MGMTD process by loading client-defined NB callbacks
diff --git a/mgmtd/subdir.am b/mgmtd/subdir.am
index 67b45d5bd9..89a6596f49 100644
--- a/mgmtd/subdir.am
+++ b/mgmtd/subdir.am
@@ -33,11 +33,6 @@ mgmtd_libmgmtd_a_SOURCES = \
 	mgmtd/mgmt_vty.c \
 	# end
 
-mgmtdheaderdir = $(pkgincludedir)/mgmtd
-mgmtdheader_HEADERS = \
-	mgmtd/mgmt_defines.h \
-	# end
-
 noinst_HEADERS += \
 	mgmtd/mgmt.h \
 	mgmtd/mgmt_be_adapter.h \
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 9351283b10..63fde7dd6a 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -779,8 +779,6 @@ sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons
 %{_libdir}/lib*.so
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
-%dir %{_includedir}/%{name}/mgmtd
-%{_includedir}/%{name}/mgmtd/*.h
 %dir %{_includedir}/%{name}/ospfd
 %{_includedir}/%{name}/ospfd/*.h
 %if %{with_bfdd}