Merge pull request #14815 from idryzhov/lib-mgmt-deps

Remove lib dependency on mgmtd

14 files changed, 15 insertions, 48 deletions

diff --git a/lib/event.c b/lib/event.c
index 6e55310b65..823894eecb 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -1848,12 +1848,6 @@ struct event *event_fetch(struct event_loop *m, struct event *fetch)
 	return fetch;
 }
 
-static unsigned long timeval_elapsed(struct timeval a, struct timeval b)
-{
-	return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
-		+ (a.tv_usec - b.tv_usec));
-}
-
 unsigned long event_consumed_time(RUSAGE_T *now, RUSAGE_T *start,
 				  unsigned long *cputime)
 {
diff --git a/lib/frrevent.h b/lib/frrevent.h
index 616fe131af..998727f079 100644
--- a/lib/frrevent.h
+++ b/lib/frrevent.h
@@ -155,6 +155,12 @@ struct cpu_event_history {
 /* Struct timeval's tv_usec one second value.  */
 #define TIMER_SECOND_MICRO 1000000L
 
+static inline unsigned long timeval_elapsed(struct timeval a, struct timeval b)
+{
+	return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
+		+ (a.tv_usec - b.tv_usec));
+}
+
 /* Event yield time.  */
 #define EVENT_YIELD_TIME_SLOT 10 * 1000L /* 10ms */
 
diff --git a/lib/mgmt_be_client.c b/lib/mgmt_be_client.c
index a66b6290e6..ef77be1f18 100644
--- a/lib/mgmt_be_client.c
+++ b/lib/mgmt_be_client.c
@@ -9,7 +9,6 @@
 #include "debug.h"
 #include "compiler.h"
 #include "libfrr.h"
-#include "mgmtd/mgmt.h"
 #include "mgmt_be_client.h"
 #include "mgmt_msg.h"
 #include "mgmt_pb.h"
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..d46b1341ec 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"
@@ -70,11 +70,6 @@ struct mgmt_master {
 extern struct mgmt_master *mm;
 
 /* Inline functions */
-static inline unsigned long timeval_elapsed(struct timeval a, struct timeval b)
-{
-	return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
-		+ (a.tv_usec - b.tv_usec));
-}
 
 /*
  * Remove trailing separator from a string.
diff --git a/mgmtd/mgmt_be_adapter.h b/mgmtd/mgmt_be_adapter.h
index 292ee35635..a818d658a9 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 eec56b7f49..a89d5fb939 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}