From 7d2f414476a3da2c5a5a3da804b08b45f5b60b4a Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Tue, 18 Aug 2015 19:13:16 +0200
Subject: [PATCH] universal_address: make size dependent on FIB size
---
sys/include/universal_address.h | 1 +
sys/universal_address/universal_address.c | 18 +++++++++++++++++-
tests/unittests/tests-fib/Makefile.include | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/sys/include/universal_address.h b/sys/include/universal_address.h
index ebc600fa3b..a7be5337b8 100644
--- a/sys/include/universal_address.h
+++ b/sys/include/universal_address.h
@@ -27,6 +27,7 @@ extern "C" {
#include <stdint.h>
#include <stdlib.h>
+#include "net/ipv6/addr.h"
#define UNIVERSAL_ADDRESS_SIZE (16) /**< size of the used addresses in bytes */
diff --git a/sys/universal_address/universal_address.c b/sys/universal_address/universal_address.c
index 6e08081691..ef0e0cf179 100644
--- a/sys/universal_address/universal_address.c
+++ b/sys/universal_address/universal_address.c
@@ -19,6 +19,12 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#ifdef MODULE_FIB
+#include "net/fib.h"
+#ifdef MODULE_GNRC_IPV6
+#include "net/gnrc/ipv6.h"
+#endif
+#endif
#include "mutex.h"
#define ENABLE_DEBUG (0)
@@ -28,7 +34,17 @@
/**
* @brief Maximum number of entries handled
*/
-#define UNIVERSAL_ADDRESS_MAX_ENTRIES (40)
+/* determine the maximum numer of entries */
+#ifndef UNIVERSAL_ADDRESS_MAX_ENTRIES
+/* all potential users of universal addresses have to add their requirements here */
+# if defined(MODULE_FIB) && defined(MODULE_GNRC_IPV6)
+# define UA_ADD0 (2 * GNRC_IPV6_FIB_TABLE_SIZE)
+# else
+# define UA_ADD0 (0)
+# endif
+
+# define UNIVERSAL_ADDRESS_MAX_ENTRIES (UA_ADD0)
+#endif
/**
* @brief counter indicating the number of entries allocated
diff --git a/tests/unittests/tests-fib/Makefile.include b/tests/unittests/tests-fib/Makefile.include
index 2c46289f2f..75e2535a55 100644
--- a/tests/unittests/tests-fib/Makefile.include
+++ b/tests/unittests/tests-fib/Makefile.include
@@ -1,3 +1,3 @@
-CFLAGS += -DFIB_DEVEL_HELPER
+CFLAGS += -DFIB_DEVEL_HELPER -DUNIVERSAL_ADDRESS_SIZE=16 -DUNIVERSAL_ADDRESS_MAX_ENTRIES=40
USEMODULE += fib
--
GitLab