babeld: use MTYPE_STATIC

Signed-off-by: David Lamparter <[email protected]>
Manengono · Jun 21, 2019 · 8b7454e · 8b7454e
1 parent c1344b5
commit 8b7454e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 66 deletions.
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
@@ -39,9 +39,10 @@ THE SOFTWARE.
 #include "neighbour.h"
 #include "route.h"
 #include "xroute.h"
-#include "babel_memory.h"
 #include "babel_errors.h"
 
+DEFINE_MTYPE_STATIC(BABELD, BABEL_IF, "Babel Interface")
+
 #define IS_ENABLE(ifp) (babel_enable_if_lookup(ifp->name) >= 0)
 
 static int babel_enable_if_lookup (const char *ifname);

diff --git a/babeld/babel_memory.c b/babeld/babel_memory.c
diff --git a/babeld/babel_memory.h b/babeld/babel_memory.h
diff --git a/babeld/babeld.c b/babeld/babeld.c
@@ -43,9 +43,11 @@ THE SOFTWARE.
 #include "resend.h"
 #include "babel_filter.h"
 #include "babel_zebra.h"
-#include "babel_memory.h"
 #include "babel_errors.h"
 
+DEFINE_MGROUP(BABELD, "babeld")
+DEFINE_MTYPE_STATIC(BABELD, BABEL, "Babel Structure")
+
 static int babel_init_routing_process(struct thread *thread);
 static void babel_get_myid(void);
 static void babel_initial_noise(void);

diff --git a/babeld/subdir.am b/babeld/subdir.am
@@ -17,7 +17,6 @@ babeld_libbabel_a_SOURCES = \
 	babeld/babel_errors.c \
 	babeld/babel_filter.c \
 	babeld/babel_interface.c \
-	babeld/babel_memory.c \
 	babeld/babel_zebra.c \
 	babeld/babeld.c \
 	babeld/kernel.c \
@@ -36,7 +35,6 @@ noinst_HEADERS += \
 	babeld/babel_filter.h \
 	babeld/babel_interface.h \
 	babeld/babel_main.h \
-	babeld/babel_memory.h \
 	babeld/babel_zebra.h \
 	babeld/babeld.h \
 	babeld/kernel.h \

diff --git a/babeld/util.h b/babeld/util.h
@@ -27,6 +27,9 @@ THE SOFTWARE.
 #include "babeld.h"
 #include "babel_main.h"
 #include "log.h"
+#include "memory.h"
+
+DECLARE_MGROUP(BABELD)
 
 #if defined(i386) || defined(__mc68020__) || defined(__x86_64__)
 #define DO_NTOHS(_d, _s) do{ _d = ntohs(*(const unsigned short*)(_s)); }while(0)